rpms/gramps/devel gramps.spec,1.18,1.19

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/extras/rpms/gramps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29931

Modified Files:
	gramps.spec 
Log Message:
* Sat Mar 11 2006 Brian Pepple <bdpepple at ameritech.net> - 2.0.10-3
- Remove Utility category from desktop file.
- Update scriptlets.



Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gramps.spec	28 Feb 2006 18:56:34 -0000	1.18
+++ gramps.spec	11 Mar 2006 20:23:56 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           gramps
 Version:        2.0.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -31,12 +31,14 @@
 Requires:       rcs
 Requires:	python-reportlab >= 1.20
 Requires:	graphviz
-Requires(post): shared-mime-info
-Requires(post):   scrollkeeper
-Requires(post):   GConf2
-Requires(postun): shared-mime-info
+Requires(pre): 	GConf2
+Requires(post): desktop-file-utils
+Requires(post): scrollkeeper
+Requires(post): GConf2
+Requires(preun):  GConf2
+Requires(postun): desktop-file-utils
 Requires(postun): scrollkeeper
-Requires(postun): GConf2
+
 
 %description
 gramps (Genealogical Research and Analysis Management Programming
@@ -69,7 +71,6 @@
 desktop-file-install --vendor fedora --delete-original  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
   --add-category X-Fedora                               \
-  --add-category Utility                                \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 
@@ -77,21 +78,35 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 
+%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
+
+
 %post
-GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`	\
-	gconftool-2 --makefile-install-rule 		\
-	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 update-desktop-database &> /dev/null ||:
 update-mime-database %{_datadir}/mime &> /dev/null || :
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+
+
+%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
 
 
 %postun
 scrollkeeper-update -q || :
-if [ "$1" = "0" ]; then
-  update-desktop-database &> /dev/null ||:
-  update-mime-database %{_datadir}/mime &> /dev/null || :
-fi
+update-desktop-database &> /dev/null ||:
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %files -f %{name}.lang
@@ -111,6 +126,10 @@
 
 
 %changelog
+* Sat Mar 11 2006 Brian Pepple <bdpepple at ameritech.net> - 2.0.10-3
+- Remove Utility category from desktop file.
+- Update scriptlets.
+
 * Tue Feb 28 2006 Brian Pepple <bdpepple at ameritech.net> - 2.0.10-2
 - Update to 2.0.10.