rpms/gnome-power-manager/devel .cvsignore, 1.74, 1.75 gnome-power-manager.spec, 1.190, 1.191 sources, 1.77, 1.78

Richard Hughes rhughes at fedoraproject.org
Mon Jun 21 16:02:50 UTC 2010 

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-power-manager/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6752

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
* Wed Jun 21 2010 Richard Hughes  <rhughes at redhat.com> - 2.31.3-1
- New upstream release.
- This release requires new versions of glib2, gtk3 and others.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- .cvsignore	2 Jun 2010 18:17:08 -0000	1.74
+++ .cvsignore	21 Jun 2010 16:02:48 -0000	1.75
@@ -1 +1 @@
-gnome-power-manager-2.31.1.tar.gz
+gnome-power-manager-2.31.3.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- gnome-power-manager.spec	18 Jun 2010 04:48:41 -0000	1.190
+++ gnome-power-manager.spec	21 Jun 2010 16:02:48 -0000	1.191
@@ -1,21 +1,14 @@
-%define dbus_version 0.61
-
 Summary: GNOME power management service
 Name: gnome-power-manager
-Version: 2.31.1
-Release: 3%{?dist}
-#Release: 0.1.%{?alphatag}git%{?dist}
+Version: 2.31.3
+Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
-Source: http://download.gnome.org/sources/gnome-power-manager/2.31/gnome-power-manager-%{version}.tar.gz
-#Source:   http://download.gnome.org/sources/gnome-power-manager/2.31/%{name}-%{version}-%{?alphatag}.tar.gz
+Source: http://download.gnome.org/sources/gnome-power-manager/2.31/gnome-power-manager-%{version}.tar.bz2
 
 URL: http://projects.gnome.org/gnome-power-manager/
 
-BuildRequires: libwnck-devel
-BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: libnotify-devel
-BuildRequires: gnome-panel-devel
+BuildRequires: gnome-panel-devel >= 2.31.2
 BuildRequires: scrollkeeper
 BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: desktop-file-utils
@@ -23,20 +16,18 @@ BuildRequires: gettext
 BuildRequires: libtool
 BuildRequires: cairo-devel
 BuildRequires: libcanberra-devel
-BuildRequires: unique-devel
 BuildRequires: upower-devel >= 0.9.0
 BuildRequires: intltool
-Requires: gtk2 >= 2.10.0
+BuildRequires: glib2-devel >= 2.25.9
+BuildRequires: GConf2-devel >= 2.31.1
+BuildRequires: gtk3-devel >= 2.90.3
+BuildRequires: dbus-glib
 Requires: gnome-icon-theme
-Requires: libnotify >= 0.4.3
 Requires: libcanberra
-Requires: dbus-glib >= %{dbus_version}
-Requires: dbus-x11 >= %{dbus_version}
-Requires: unique >= 0.9.4
+Requires: dbus-x11
 Requires: upower >= 0.9.0
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 
 # obsolete sub-package
 Obsoletes: gnome-power-manager-extra <= 2.30.1
@@ -45,14 +36,14 @@ Provides: gnome-power-manager-extra
 %description
 GNOME Power Manager uses the information and facilities provided by UPower
 displaying icons and handling user callbacks in an interactive GNOME session.
-GNOME Power Preferences allows authorised users to set policy and
-change preferences.
 
 %prep
 %setup -q
 
 %build
-%configure --disable-scrollkeeper
+%configure --disable-scrollkeeper \
+	--disable-schemas-install \
+	--disable-applets
 make AM_LDFLAGS="-Wl,-O1,--as-needed"
 
 # strip unneeded translations from .mo files
@@ -68,9 +59,7 @@ for p in *.po; do
 done
 
 %install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 desktop-file-install --vendor gnome --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart                     \
@@ -92,26 +81,24 @@ for f in $helpdir/C/figures/*.png; do
   done
 done
 
+#rm -f $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/*.a
+#rm -f $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/*.la
+
 %find_lang %name --with-gnome
 
 %post
-%gconf_schema_upgrade gnome-power-manager
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
     gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
-
-%pre
-%gconf_schema_prepare gnome-power-manager
-
-%preun
-%gconf_schema_remove gnome-power-manager
+glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas
 
 %postun
 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
+glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -119,7 +106,8 @@ fi
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/gnome-power-manager.service
-%{_datadir}/gnome-2.0/ui/*.xml
+%{_datadir}/glib-2.0/schemas/*.gschema.xml
+%{_datadir}/GConf/gsettings/*.gschema.migrate
 %{_datadir}/gnome-power-manager/*.ui
 %{_datadir}/gnome-power-manager/icons/hicolor/*/*/*.*
 %{_datadir}/icons/hicolor/*/apps/gnome-brightness-applet.*
@@ -129,14 +117,19 @@ fi
 %{_datadir}/omf/gnome-power-manager
 %{_datadir}/polkit-1/actions/org.gnome.power.policy
 %dir %{_datadir}/gnome-power-manager
-%{_libdir}/bonobo/servers/*.server
-%{_libexecdir}/*
+#%{_datadir}/gnome-2.0/ui/*.xml
+#%{_libdir}/bonobo/servers/*.server
+#%{_libexecdir}/*
+#%{_libdir}/control-center-1/panels/*.so
 %{_mandir}/man1/*.1.gz
 %{_sbindir}/*
-%{_sysconfdir}/gconf/schemas/*.schemas
 %{_sysconfdir}/xdg/autostart/*.desktop
 
 %changelog
+* Wed Jun 21 2010 Richard Hughes  <rhughes at redhat.com> - 2.31.3-1
+- New upstream release.
+- This release requires new versions of glib2, gtk3 and others.
+
 * Fri Jun 18 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.1-3
 - Drop more unneded direct deps
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- sources	2 Jun 2010 18:17:09 -0000	1.77
+++ sources	21 Jun 2010 16:02:49 -0000	1.78
@@ -1 +1 @@
-1c45fc5c37527c2ab5ab87348021fbb0  gnome-power-manager-2.31.1.tar.gz
+c36817aeae13f7d89228b5e1aad24014  gnome-power-manager-2.31.3.tar.bz2

More information about the scm-commits mailing list