[gnome-power-manager] trivial: Update the reference spec file with the GSettings changes



commit 3a26285e20fa593b1ffce0d683bd94c4d0d075c1
Author: Richard Hughes <richard hughsie com>
Date:   Fri Sep 24 08:44:51 2010 +0100

    trivial: Update the reference spec file with the GSettings changes

 contrib/gnome-power-manager.spec.in |   35 ++++++++++-------------------------
 1 files changed, 10 insertions(+), 25 deletions(-)
---
diff --git a/contrib/gnome-power-manager.spec.in b/contrib/gnome-power-manager.spec.in
index 2d8908f..93c06a4 100644
--- a/contrib/gnome-power-manager.spec.in
+++ b/contrib/gnome-power-manager.spec.in
@@ -21,18 +21,12 @@ BuildRequires: libcanberra-devel
 BuildRequires: libnotify-devel >= 0.5.0
 BuildRequires: upower-devel >= 0.9.0
 BuildRequires: intltool
-BuildRequires: unique-devel >= 1.0.0
 BuildRequires: glib2-devel >= 2.25.9
 BuildRequires: GConf2-devel >= 2.31.1
-BuildRequires: gtk2-devel >= 2.16.0
+BuildRequires: gtk3-devel >= 2.16.0
 BuildRequires: dbus-glib-devel
 BuildRequires: libwnck-devel
 Requires: gnome-icon-theme
-Requires: libcanberra
-Requires: dbus-x11
-Requires: upower >= 0.9.0
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
 
 # obsolete sub-package
 Obsoletes: gnome-power-manager-extra <= 2.30.1
@@ -48,12 +42,16 @@ displaying icons and handling user callbacks in an interactive GNOME session.
 %build
 %configure --disable-scrollkeeper \
 	--disable-schemas-install \
+    --with-gtk=3.0 \
 	--disable-applets
 make
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
+rm $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/libpower.a
+rm $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/libpower.la
+
 desktop-file-install --vendor gnome --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart                     \
   $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/gnome-power-manager.desktop
@@ -61,28 +59,12 @@ desktop-file-install --vendor gnome --delete-original                   \
 %find_lang %name --with-gnome
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-        %{_sysconfdir}/gconf/schemas/gnome-power-manager.schemas >/dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
     gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 update-desktop-database %{_datadir}/applications &> /dev/null || :
-
-%pre
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gnome-power-manager.schemas &> /dev/null || :
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gnome-power-manager.schemas &> /dev/null || :
-fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor
@@ -90,6 +72,7 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
     gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 update-desktop-database %{_datadir}/applications &> /dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -109,10 +92,12 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 #%{_datadir}/gnome-2.0/ui/*.xml
 #%{_libdir}/bonobo/servers/*.server
 #%{_libexecdir}/*
-%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
+%{_datadir}/glib-2.0/schemas/*.gschema.xml
+%{_datadir}/GConf/gsettings/*.gschema.migrate
 %{_mandir}/man1/*.1.gz
 %{_sbindir}/*
 %{_sysconfdir}/xdg/autostart/*.desktop
+%{_libdir}/control-center-1/panels/libpower.so
 
 %changelog
 * #LONGDATE# Richard Hughes <richard hughsie com> #VERSION#-0.#BUILD##ALPHATAG#



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]