rpms/gnome-panel/devel gnome-panel.spec, 1.82, 1.83 redhat-panel-default-setup.entries, 1.10, 1.11 add-gimlet-for-cjk.xsl, 1.1, NONE redhat-panel-default-setup-battstat.entries, 1.4, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Sep 30 11:19:10 UTC 2005
Author: markmc
Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11143
Modified Files:
gnome-panel.spec redhat-panel-default-setup.entries
Removed Files:
add-gimlet-for-cjk.xsl
redhat-panel-default-setup-battstat.entries
Log Message:
* Fri Sep 30 2005 Mark McLoughlin <markmc at redhat.com> 2.12.0-3
- Remove hacks to add battery applet to default panel configuration
where ACPI/APM is available (#169621) and GIMLET in CJK locales (#169430)
Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- gnome-panel.spec 15 Sep 2005 02:20:51 -0000 1.82
+++ gnome-panel.spec 30 Sep 2005 11:19:07 -0000 1.83
@@ -16,13 +16,11 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.12.0
-Release: 2
+Release: 3
URL: http://www.gnome.org
Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
Source1: redhat-panel-default-setup.entries
-Source2: redhat-panel-default-setup-battstat.entries
Source3: redhat-panel-backwards-compat-config.schemas
-Source4: add-gimlet-for-cjk.xsl
License: GPL
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-root
@@ -101,10 +99,6 @@
make
-# Add GIMLET to the default panel in CJK
-mv gnome-panel/panel-general.schemas gnome-panel/panel-general.schemas.tmp
-xsltproc --nonet %{SOURCE4} gnome-panel/panel-general.schemas.tmp > gnome-panel/panel-general.schemas
-
%install
rm -rf $RPM_BUILD_ROOT
@@ -112,9 +106,6 @@
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-## install battstat schemas
-install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup-battstat.entries
-
#
# Create pager and tasklist schemas for compatibility with older
# configurations which reference the old schema names
@@ -137,26 +128,6 @@
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
fi
-#
-# The applet needs apmd which is only build on ix86
-#
-pm_available=false
-%ifarch %{ix86} ppc
-if [ -f /proc/acpi/event ] ; then
- for battery in /proc/acpi/battery/*/state; do
- if grep 'present: *yes' $battery >/dev/null 2>&1; then
- pm_available=true
- fi
- done
-elif [ -f /proc/apm ]; then
- # Battery present if top bits are unset
- flag=$(cat /proc/apm | cut -d ' ' -f 6 | sed 's/0x\([0-9a-f]\)[0-9a-f]/\1/')
- if [ "$flag" == "0" ]; then
- pm_available=true
- fi
-fi
-%endif
-
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
#
@@ -179,11 +150,6 @@
gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup.entries > /dev/null
gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null
-if [ "$pm_available" = "true" ]; then
- gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup-battstat.entries > /dev/null
- gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup-battstat.entries /apps/panel/applets/battstat_applet > /dev/null
-fi
-
/sbin/ldconfig
%postun
@@ -221,6 +187,10 @@
%{_datadir}/gtk-doc
%changelog
+* Fri Sep 30 2005 Mark McLoughlin <markmc at redhat.com> 2.12.0-3
+- Remove hacks to add battery applet to default panel configuration
+ where ACPI/APM is available (#169621) and GIMLET in CJK locales (#169430)
+
* Wed Sep 14 2005 Jeremy Katz <katzj at redhat.com> - 2.12.0-2
- we have mozilla (and e-d-s) on ppc64 now
Index: redhat-panel-default-setup.entries
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/redhat-panel-default-setup.entries,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- redhat-panel-default-setup.entries 2 May 2005 13:18:24 -0000 1.10
+++ redhat-panel-default-setup.entries 30 Sep 2005 11:19:07 -0000 1.11
@@ -53,11 +53,28 @@
<entry>
<key>general/applet_id_list</key>
<schema_key>/schemas/apps/panel/general/applet_id_list</schema_key>
-
- <!-- We pull the value from the schema default so that we can
- add gimlet in certain locales
- See add-gimlet-for-cjk.xsl -->
-
+ <value>
+ <list type="string">
+ <value>
+ <string>mixer</string>
+ </value>
+ <value>
+ <string>clock</string>
+ </value>
+ <value>
+ <string>systray</string>
+ </value>
+ <value>
+ <string>show_desktop_button</string>
+ </value>
+ <value>
+ <string>window_list</string>
+ </value>
+ <value>
+ <string>workspace_switcher</string>
+ </value>
+ </list>
+ </value>
</entry>
<!-- Top Panel -->
@@ -644,60 +661,6 @@
<entry><key>applets/systray/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
<entry><key>applets/systray/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
- <!-- GIMLET -->
-
- <entry>
- <key>applets/gimlet/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>bonobo-applet</string>
- </value>
- </entry>
- <entry>
- <key>applets/gimlet/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>top_panel</string>
- </value>
- </entry>
- <entry>
- <key>applets/gimlet/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>3</int>
- </value>
- </entry>
- <entry>
- <key>applets/gimlet/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/gimlet/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/gimlet/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
- <string>OAFIID:GNOME_imswitcher</string>
- </value>
- </entry>
-
- <entry><key>applets/gimlet/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
- <entry><key>applets/gimlet/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
- <entry><key>applets/gimlet/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
- <entry><key>applets/gimlet/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
- <entry><key>applets/gimlet/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
- <entry><key>applets/gimlet/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
- <entry><key>applets/gimlet/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
- <entry><key>applets/gimlet/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
<!-- Show Desktop Applet -->
<entry>
--- add-gimlet-for-cjk.xsl DELETED ---
--- redhat-panel-default-setup-battstat.entries DELETED ---
More information about the fedora-cvs-commits
mailing list