rpms/gramps/devel gramps.spec,1.14,1.15

[Brian Pepple (bpepple)]

Author: bpepple

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

Modified Files:
	gramps.spec 
Log Message:
* Sat Jan 28 2006 Brian Pepple <bdpepple at ameritech.net> - 2.0.9-4
- Add require for shared-mime-info.
- Remove mime.cache.
- Use python-abi.



Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gramps.spec	14 Dec 2005 22:08:45 -0000	1.14
+++ gramps.spec	30 Jan 2006 21:37:02 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gramps
 Version:        2.0.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -19,7 +19,7 @@
 BuildRequires:  gnome-vfs2-devel
 BuildRequires:  pygtk2
 BuildRequires:  pygtk2-libglade
-BuildRequires:  python-devel >= 2.3
+BuildRequires:  python-devel
 BuildRequires:  scrollkeeper
 BuildRequires:	GConf2
 
@@ -31,12 +31,14 @@
 Requires:       ImageMagick
 Requires:       pygtk2
 Requires:       pygtk2-libglade
-Requires:       python >= 2.3
+Requires:   	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 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(postun): scrollkeeper
 Requires(postun): GConf2
 
@@ -62,7 +64,7 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 rm -rf ${RPM_BUILD_ROOT}%{_localstatedir}/scrollkeeper
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome/
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/application
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/{application,mime.cache}
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/{globs,magic,XMLnamespaces,aliases,subclasses}
 mkdir ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 cp -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}/%{name}.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
@@ -83,17 +85,16 @@
 GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`	\
 	gconftool-2 --makefile-install-rule 		\
 	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null
-update-desktop-database %{_datadir}/applications &> /dev/null
-update-mime-database %{_datadir}/mime &> /dev/null
-if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
-/usr/bin/pkill gconfd || /bin/true
+update-desktop-database &> /dev/null ||:
+update-mime-database %{_datadir}/mime &> /dev/null || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 
 
 %postun
-if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
+scrollkeeper-update -q || :
 if [ "$1" = "0" ]; then
-  update-desktop-database %{_datadir}/applications &> /dev/null
-  update-mime-database %{_datadir}/mime &> /dev/null
+  update-desktop-database &> /dev/null ||:
+  update-mime-database %{_datadir}/mime &> /dev/null || :
 fi
 
 
@@ -114,6 +115,11 @@
 
 
 %changelog
+* Sat Jan 28 2006 Brian Pepple <bdpepple at ameritech.net> - 2.0.9-4
+- Add require for shared-mime-info.
+- Remove mime.cache.
+- Use python-abi.
+
 * Wed Dec 14 2005 Brian Pepple <bdpepple at ameritech.net> - 2.0.9-3
 - Add requires for gnome-python2-gnomeprint.