From b2a29434a8e35884651e1e55d999b56145da942c Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Mon, 16 Aug 2004 11:12:22 +0000
Subject: [PATCH] 2004-08-16  Tim Waugh  <twaugh@redhat.com>         *
 gramps.spec.in, gramps-mdk.spec.in: Fixed.

svn: r3404
---
 gramps2/ChangeLog          |  1 +
 gramps2/gramps-mdk.spec.in | 16 ++++++++++++----
 gramps2/gramps.spec.in     | 17 ++++++++++++-----
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 3d0fbe79e..ee02397bf 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,4 +1,5 @@
 2004-08-16  Tim Waugh  <twaugh@redhat.com>
+	* gramps.spec.in, gramps-mdk.spec.in: Fixed.
 	* src/data/gramps.desktop: Fixed.
 	* src/data/Makefile.am: Fix 'distcheck' as much as possible.
 
diff --git a/gramps2/gramps-mdk.spec.in b/gramps2/gramps-mdk.spec.in
index ccaaed934..7adb1766f 100644
--- a/gramps2/gramps-mdk.spec.in
+++ b/gramps2/gramps-mdk.spec.in
@@ -55,14 +55,16 @@ CFLAGS="$RPM_OPT_FLAGS" make
 rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
-mkdir $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor gramps --delete-original \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications  \
 	--add-category Application                     \
 	--add-category Utility                         \
-	$RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications/gramps.desktop
+	src/data/gramps.desktop
 %find_lang gramps
 rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper/
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/mime/application
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/mime/{globs,magic,XMLnamespaces}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,13 +78,19 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/bin/gramps
 
 %{_datadir}/applications/*
-%{_datadir}/pixmaps/gramps.png
 
-%{_libdir}/gramps
 %{_datadir}/gramps
 %{_datadir}/omf/gramps
+%{_datadir}/mime-info/*
+%{_datadir}/icons/gnome/48x48/mimetypes/*
+%{_sysconfdir}/gconf/schemas/gramps.schemas
+%{_datadir}/application-registry/gramps.applications
+%{_datadir}/mime/packages/gramps.xml
 
 %post
+GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+  gconftool-2 --makefile-install-rule \
+	%{_sysconfdir}/gconf/schemas/gramps.schemas > /dev/null
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %postun
diff --git a/gramps2/gramps.spec.in b/gramps2/gramps.spec.in
index 688fbe421..cac9334a9 100644
--- a/gramps2/gramps.spec.in
+++ b/gramps2/gramps.spec.in
@@ -34,7 +34,7 @@ BuildRequires: desktop-file-utils >= 0.2.92
 
 %description
 gramps (Genealogical Research and Analysis Management Programming
-dlSystem) is a GNOME based genealogy program supporting a Python
+System) is a GNOME based genealogy program supporting a Python
 based plugin system.
 
 %prep
@@ -56,14 +56,15 @@ CFLAGS="$RPM_OPT_FLAGS" make
 rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
-mkdir $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor gramps --delete-original \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications  \
 	--add-category Application                     \
 	--add-category Utility                         \
-	$RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications/gramps.desktop
+	src/data/gramps.desktop
 %find_lang gramps
 rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper/
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/mime/{globs,magic,XMLnamespaces}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,13 +78,19 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/bin/gramps
 
 %{_datadir}/applications/*
-%{_datadir}/pixmaps/gramps.png
 
-%{_libdir}/gramps
 %{_datadir}/gramps
 %{_datadir}/omf/gramps
+%{_datadir}/mime-info/*
+%{_datadir}/icons/gnome/48x48/mimetypes/*
+%{_sysconfdir}/gconf/schemas/gramps.schemas
+%{_datadir}/application-registry/gramps.applications
+%{_datadir}/mime/packages/gramps.xml
 
 %post
+GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+  gconftool-2 --makefile-install-rule \
+	%{_sysconfdir}/gconf/schemas/gramps.schemas > /dev/null
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %postun