rpms/PolicyKit-gnome/devel .cvsignore, 1.7, 1.8 PolicyKit-gnome.spec, 1.21, 1.22 sources, 1.7, 1.8 PolicyKit-gnome-0.8-fix-i18n.patch, 1.1, NONE

[David Zeuthen (davidz)]

Author: davidz

Update of /cvs/pkgs/rpms/PolicyKit-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23884

Modified Files:
	.cvsignore PolicyKit-gnome.spec sources 
Removed Files:
	PolicyKit-gnome-0.8-fix-i18n.patch 
Log Message:
* Tue Jul 22 2008 David Zeuthen <davidz at redhat.com> - 0.9-1%{?dist}
- Update to upstream release 0.9
- Drop patches that are upstream
- Update license field




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit-gnome/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Apr 2008 02:27:09 -0000	1.7
+++ .cvsignore	22 Jul 2008 18:40:00 -0000	1.8
@@ -4,3 +4,4 @@
 PolicyKit-gnome-0.6.tar.bz2
 PolicyKit-gnome-0.7.tar.bz2
 PolicyKit-gnome-0.8.tar.bz2
+PolicyKit-gnome-0.9.tar.bz2


Index: PolicyKit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit-gnome/devel/PolicyKit-gnome.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- PolicyKit-gnome.spec	2 May 2008 03:56:09 -0000	1.21
+++ PolicyKit-gnome.spec	22 Jul 2008 18:40:00 -0000	1.22
@@ -9,9 +9,9 @@
 
 Summary: PolicyKit integration for the GNOME desktop
 Name: PolicyKit-gnome
-Version: 0.8
-Release: 5%{?dist}
-License: GPLv2+
+Version: 0.9
+Release: 1%{?dist}
+License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/PolicyKit-gnome.git;a=summary
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.bz2
@@ -27,15 +27,17 @@
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
+BuildRequires: GConf2-devel
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: gtk2 >= %{gtk2_version}
 Requires: gnome-vfs2 >= %{gnome_vfs2_version}
 Requires: PolicyKit >= %{polkit_version}
 Requires: libsexy >= %{libsexy_version}
+Requires(post): GConf2 >= 2.14
+Requires(preun): GConf2 >= 2.14
 
-Patch0: PolicyKit-gnome-0.8-fix-i18n.patch
-Patch1: PolicyKit-gnome-0.8-dont-spawn-when-running-under-gdm.patch
+Patch0: PolicyKit-gnome-0.8-dont-spawn-when-running-under-gdm.patch
 
 %description 
 PolicyKit-gnome provides a GNOME integration library and tools for
@@ -78,8 +80,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix-i18n
-%patch1 -p1 -b .no-spawning-under-gdm
+%patch0 -p1 -b .no-spawning-under-gdm
 
 %build
 %configure
@@ -103,6 +104,21 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/polkit-gnome.schemas > /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/polkit-gnome.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/polkit-gnome.schemas > /dev/null || :
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -116,6 +132,7 @@
 
 %{_bindir}/polkit-gnome-authorization
 %{_datadir}/applications/polkit-gnome-authorization.desktop
+%{_sysconfdir}/gconf/schemas/polkit-gnome.schemas
 
 %files libs
 
@@ -133,9 +150,14 @@
 %files demo
 %defattr(-,root,root,-)
 %{_bindir}/polkit-gnome-example
-%{_datadir}/PolicyKit/policy/polkit-gnome-example.policy
+%{_datadir}/PolicyKit/policy/*.policy
 
 %changelog
+* Tue Jul 22 2008 David Zeuthen <davidz at redhat.com> - 0.9-1%{?dist}
+- Update to upstream release 0.9
+- Drop patches that are upstream
+- Update license field
+
 * Thu May  1 2008 David Zeuthen <davidz at redhat.com> - 0.8-5%{?dist}
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit-gnome/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Apr 2008 02:27:09 -0000	1.7
+++ sources	22 Jul 2008 18:40:00 -0000	1.8
@@ -1 +1 @@
-e8119034a8b63c80749177cebf035aac  PolicyKit-gnome-0.8.tar.bz2
+68374b04289ce99d95a9df19d6217344  PolicyKit-gnome-0.9.tar.bz2


--- PolicyKit-gnome-0.8-fix-i18n.patch DELETED ---