- changed icon path

Changed files:
    gramps-icon_path.patch -> 1.1
    gramps.spec -> 1.36

diff --git a/gramps-icon_path.patch b/gramps-icon_path.patch
new file mode 100644 (file)
index 0000000..c463e52
--- /dev/null
+++ b/gramps-icon_path.patch
@@ -0,0 +1,23 @@
+diff -urN gramps-2.0.10.orig/src/data/Makefile.am gramps-2.0.10/src/data/Makefile.am
+--- gramps-2.0.10.orig/src/data/Makefile.am    2005-09-12 01:24:33.000000000 +0200
++++ gramps-2.0.10/src/data/Makefile.am 2006-07-29 16:43:37.596076000 +0200
+@@ -60,8 +60,8 @@
+ install-data-local:
+       $(INSTALL) -d $(DESTDIR)$(prefix)/share/applications
+       $(INSTALL_DATA) $(top_srcdir)/src/data/gramps.desktop $(DESTDIR)$(prefix)/share/applications
+-      $(INSTALL) -d $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/
+-      $(INSTALL_DATA) $(top_srcdir)/src/data/gnome-mime-application-x-*.png $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/
++      $(INSTALL) -d $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/mimetypes/
++      $(INSTALL_DATA) $(top_srcdir)/src/data/gnome-mime-application-x-*.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/mimetypes/
+       $(INSTALL) -d $(DESTDIR)$(prefix)/share/application-registry
+       $(INSTALL_DATA) $(top_srcdir)/src/data/gramps.applications $(DESTDIR)$(prefix)/share/application-registry
+       $(INSTALL) -d $(DESTDIR)$(prefix)/share/mime-info
+@@ -76,7 +76,7 @@
+ 
+ uninstall-local:
+       -rm $(DESTDIR)$(prefix)/share/applications/gramps.desktop
+-      -rm $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-*.png
++      -rm $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-*.png
+       -rm $(DESTDIR)$(prefix)/share/mime-info/gramps.keys
+       -rm $(DESTDIR)$(prefix)/share/mime-info/gramps.mime
+       -rm $(DESTDIR)$(prefix)/share/application-registry/gramps.applications

diff --git a/gramps.spec b/gramps.spec
index cc76cc130a26a18fd054290fc34a86d8b332b773..6c897ef2889afebfd3c2281a2b2b04eb70313666 100644 (file)
--- a/gramps.spec
+++ b/gramps.spec
@@ -9,6 +9,7 @@ Source0:        http://dl.sourceforge.net/gramps/%{name}-%{version}.tar.gz
 # Source0-md5: 2c9c00acce995546af325087622235e5
 Patch0:                %{name}-locale_names.patch
 Patch1:                %{name}-desktop.patch
+Patch2:                %{name}-icon_path.patch
 URL:           http://gramps.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -42,6 +43,7 @@ system wtyczek w Pythonie.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 sed -i -e 's|gramps.py|gramps.pyc|' gramps.sh.in
 rm -f src/po/no.*
@@ -110,7 +112,7 @@ EOF
 %lang(fr) %{_datadir}/gramps/gnome/help/gramps/fr
 
 %{_desktopdir}/*.desktop
-%{_iconsdir}/gnome/48x48/mimetypes/*
+%{_iconsdir}/hicolor/48x48/mimetypes/*
 %{_pixmapsdir}/gramps.png
 
 %{_datadir}/mime/packages/gramps.xml