2.91.93

1 files changed, 31 insertions, 95 deletions

diff --git a/gnome-panel.spec b/gnome-panel.spec
index 92bdb42..10079e6 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -8,7 +8,6 @@
 %define libbonoboui_version 2.3.0
 %define orbit_version 2.4.0
 %define libwnck_version 2.91.6
-%define gconf_version 2.14
 %define gnome_menus_version 2.27.92
 %define evolution_data_server_version 1.9.1
 %define cairo_version 1.0.0
@@ -21,7 +20,7 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.91.92
+Version: 2.91.93
 Release: 1%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-panel
@@ -42,10 +41,10 @@ Requires: %{name}-libs = %{version}-%{release}
 # Band aid for "yum upgrade"
 Requires: gnome-shell
 
-Requires(post): GConf2 >= %{gconf_version}
 Requires(post): hicolor-icon-theme
-Requires(pre): GConf2 >= %{gconf_version}
-Requires(preun): GConf2 >= %{gconf_version}
+Requires(post): GConf2
+Requires(pre): GConf2
+Requires(preun): GConf2
 
 BuildRequires: libxml2-python
 BuildRequires: intltool
@@ -63,7 +62,7 @@ BuildRequires: libgnome-devel >= %{libgnome_version}
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
 BuildRequires: pkgconfig(libwnck-3.0) >= %{libwnck_version}
-BuildRequires: GConf2-devel >= %{gconf_version}
+BuildRequires: dconf-devel
 BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
 BuildRequires: cairo-devel >= %{cairo_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
@@ -111,9 +110,6 @@ Summary: Headers and libraries for Panel Applet development
 License: LGPLv2+
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
-Requires: gtk2-devel >= %{gtk2_version}
-Requires: libbonoboui-devel >= %{libbonoboui_version}
-Requires: libgnomeui-devel >= %{libgnomeui_version}
 
 %description devel
 Panel Applet development package. Contains files needed for developing
@@ -148,14 +144,6 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-#
-# Create pager and tasklist schemas for compatibility with older
-# configurations which reference the old schema names
-#
-sed -e 's|/schemas/apps/window_list_applet/prefs/|/schemas/apps/tasklist_applet/prefs/|' $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/window-list.schemas > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/tasklist.schemas
-sed -e 's|/schemas/apps/workspace_switcher_applet/prefs/|/schemas/apps/pager_applet/prefs/|; s|<default>1</default>|<default>2</default>|' $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/pager.schemas
-
-## blow away stuff we don't want
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 find $RPM_BUILD_ROOT -name '*.*a' -delete;
 
@@ -165,95 +153,29 @@ desktop-file-install --delete-original \
 
 %find_lang %{gettext_package} --all-name --with-gnome
 
-%post
-touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
-
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-
-#
-# Clear out the old defaults
-#
-gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --recursive-unset /apps/panel > /dev/null || :
-gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --recursive-unset /schemas/apps/panel > /dev/null || :
-
-#
-# Install the schemas
-#
-gconftool-2 --makefile-install-rule \
-	%{_sysconfdir}/gconf/schemas/clock.schemas \
-	%{_sysconfdir}/gconf/schemas/fish.schemas \
-	%{_sysconfdir}/gconf/schemas/pager.schemas \
-	%{_sysconfdir}/gconf/schemas/panel-compatibility.schemas \
-	%{_sysconfdir}/gconf/schemas/panel-general.schemas \
-	%{_sysconfdir}/gconf/schemas/panel-global.schemas \
-	%{_sysconfdir}/gconf/schemas/panel-object.schemas \
-	%{_sysconfdir}/gconf/schemas/panel-toplevel.schemas \
-	%{_sysconfdir}/gconf/schemas/tasklist.schemas \
-	%{_sysconfdir}/gconf/schemas/window-list.schemas \
-	%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \
-  > /dev/null || :
-
-#
-# Install the default setup into /apps/panel and /apps/panel/default_setup
-#
-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 || :
-
-/sbin/ldconfig
-
 %pre
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule \
-	%{_sysconfdir}/gconf/schemas/clock.schemas \
-	%{_sysconfdir}/gconf/schemas/fish.schemas \
-	%{_sysconfdir}/gconf/schemas/pager.schemas \
-	%{_sysconfdir}/gconf/schemas/panel-compatibility.schemas \
-	%{_sysconfdir}/gconf/schemas/panel-general.schemas \
-	%{_sysconfdir}/gconf/schemas/panel-global.schemas \
-	%{_sysconfdir}/gconf/schemas/panel-object.schemas \
-	%{_sysconfdir}/gconf/schemas/panel-toplevel.schemas \
-	%{_sysconfdir}/gconf/schemas/tasklist.schemas \
-	%{_sysconfdir}/gconf/schemas/window-list.schemas \
-	%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \
-  > /dev/null || :
-  if [ -f %{_sysconfdir}/gconf/schemas/notification_area_applet.schemas ]; then
-    gconftool-2 --makefile-uninstall-rule \
-	%{_sysconfdir}/gconf/schemas/notification_area_applet.schemas > /dev/null || :
-  fi
-fi
+%gconf_schema_prepare clock
 
 %preun
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule \
-	%{_sysconfdir}/gconf/schemas/clock.schemas \
-	%{_sysconfdir}/gconf/schemas/fish.schemas \
-	%{_sysconfdir}/gconf/schemas/pager.schemas \
-	%{_sysconfdir}/gconf/schemas/panel-compatibility.schemas \
-	%{_sysconfdir}/gconf/schemas/panel-general.schemas \
-	%{_sysconfdir}/gconf/schemas/panel-global.schemas \
-	%{_sysconfdir}/gconf/schemas/panel-object.schemas \
-	%{_sysconfdir}/gconf/schemas/panel-toplevel.schemas \
-	%{_sysconfdir}/gconf/schemas/tasklist.schemas \
-	%{_sysconfdir}/gconf/schemas/window-list.schemas \
-	%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \
-  > /dev/null || :
-  if [ -f %{_sysconfdir}/gconf/schemas/notification_area_applet.schemas ]; then
-    gconftool-2 --makefile-uninstall-rule \
-	%{_sysconfdir}/gconf/schemas/notification_area_applet.schemas > /dev/null || :
-  fi
-fi
+%gconf_schema_remove clock
+
+%post
+%gconf_schema_upgrade clock
+touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+/sbin/ldconfig
 
 %postun
 /sbin/ldconfig
 if [ $1 -eq 0 ]; then
   touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas
 fi
 
 %posttrans
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas
+
 
 %files -f %{gettext_package}.lang
 %defattr(-,root,root)
@@ -270,14 +192,25 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
 %{_bindir}/gnome-panel
 %{_bindir}/gnome-desktop-item-edit
 %{_libexecdir}/*
-%{_sysconfdir}/gconf/schemas/*.schemas
-%{_sysconfdir}/gconf/schemas/*.entries
 
 %{_datadir}/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
 %{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
 %{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
 %{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
 
+%{_sysconfdir}/gconf/schemas/clock.schemas
+
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.fish.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.window-list.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.launcher.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.menu-button.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.object.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.toplevel.gschema.xml
+
+
 %files libs
 %{_libdir}/*.so.*
 %{_libdir}/girepository-1.0/PanelApplet-4.0.typelib
@@ -292,6 +225,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
 %{_datadir}/gir-1.0/PanelApplet-4.0.gir
 
 %changelog
+* Tue Mar 29 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.93-1
+- Update to 2.91.93
+
 * Wed Mar 23 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.92-1
 - Update to 2.91.92