rpms/empathy/F-13 empathy.spec,1.101,1.102

[Brian Pepple]

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26708

Modified Files:
	empathy.spec 
Log Message:
* Sat Apr 24 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.30.0.2-2
- Remove clean section. No longer needed.
- Update spec for new gconf macros.



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-13/empathy.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- empathy.spec	20 Apr 2010 22:37:08 -0000	1.101
+++ empathy.spec	24 Apr 2010 20:39:30 -0000	1.102
@@ -12,7 +12,7 @@
 
 Name:		empathy
 Version:	2.30.0.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -106,6 +106,7 @@ install -m 0644 %{SOURCE1} ./README.Conn
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
@@ -120,33 +121,19 @@ desktop-file-install --vendor fedora --d
 	%{buildroot}%{_datadir}/applications/%{name}-accounts.desktop
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %pre
-if [ "$1" -gt 1 ]; then
-	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
-	gconftool-2 --makefile-uninstall-rule	\
-		%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||:
-fi
+%gconf_schema_prepare %{name}.schemas
 
 
 %post
-export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
-gconftool-2 --makefile-install-rule	\
-	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||:
+%gconf_schema_upgrade %{name}.schemas
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||:
 touch --no-create %{_datadir}/icons/hicolor ||:
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
 
 %preun
-if [ "$1" -eq 0 ]; then
-	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
-	gconftool-2 --makefile-uninstall-rule	\
-		%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||:
-fi
+%gconf_schema_remove %{name}.schemas
 
 
 %postun
@@ -174,6 +161,10 @@ fi
 %{_mandir}/man1/empathy*.1.gz
 
 %changelog
+* Sat Apr 24 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.30.0.2-2
+- Remove clean section. No longer needed.
+- Update spec for new gconf macros.
+
 * Tue Apr 20 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.30.0.2-1
 - Update to 2.30.0.2.