rpms/gramps/devel gramps.spec,1.5,1.6

[Brian Pepple (bpepple)]

Author: bpepple

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

Modified Files:
	gramps.spec 
Log Message:
Update to 2.0.0


Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gramps.spec	6 Apr 2005 22:11:39 -0000	1.5
+++ gramps.spec	22 May 2005 20:27:17 -0000	1.6
@@ -1,13 +1,13 @@
 Name:           gramps
-Version:        1.0.10
-Release:        2
+Version:        2.0.0
+Release:        1
 
 Summary:        Genealogical Research and Analysis Management Programming System.
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://gramps.sourceforge.net/
-Source0:        http://download.sourceforge.net/gramps/gramps-1.0.10.tar.gz
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -21,6 +21,7 @@
 BuildRequires:  pygtk2-libglade
 BuildRequires:  python-devel >= 2.2
 BuildRequires:  scrollkeeper
+BuildRequires:	GConf2
 
 Requires:       gnome-python2-canvas
 Requires:       gnome-python2-gconf
@@ -32,7 +33,9 @@
 Requires:       python >= 2.2
 Requires:       rcs
 Requires(post):   scrollkeeper
+Requires(post):   GConf2
 Requires(postun): scrollkeeper
+Requires(postun): GConf2
 
 %description
 gramps (Genealogical Research and Analysis Management Programming
@@ -45,7 +48,7 @@
 
 
 %build
-%configure --disable-schemas-install
+%configure
 make
 
 
@@ -56,6 +59,10 @@
 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/{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/
 %find_lang %{name}
 
 desktop-file-install --vendor fedora --delete-original  \
@@ -70,11 +77,21 @@
 
 
 %post
-scrollkeeper-update -q ||:
+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
 
 
 %postun
-scrollkeeper-update -q ||:
+if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
+if [ "$1" = "0" ]; then
+  update-desktop-database %{_datadir}/applications &> /dev/null
+  update-mime-database %{_datadir}/mime &> /dev/null
+fi
 
 
 %files -f %{name}.lang
@@ -82,14 +99,23 @@
 %doc AUTHORS COPYING COPYING-DOCS ChangeLog FAQ INSTALL NEWS README TODO
 %{_bindir}/*
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/gramps/
-%{_datadir}/omf/gramps/
-%{_datadir}/pixmaps/*
-%{_libdir}/gramps/
+%{_datadir}/application-registry/%{name}.applications
+%{_datadir}/%{name}/
+%{_datadir}/omf/%{name}/
+%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/mime-info/*
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/gnome/48x48/mimetypes/*.png
+%{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_mandir}/man1/*
-%exclude %{_datadir}/%{name}.desktop
+
 
 %changelog
+* Sat May 21 2005 Brian Pepple <bdpepple at ameritech.net> - 2.0.0-1
+- Update to 2.0.0.
+- Add mime info.
+- Use more macros.
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt