[icc_examin] Avoid xdg-menu usage at packaging time

Nicolas Chauvet kwizart at fedoraproject.org
Tue Jul 26 18:28:43 UTC 2011


commit ef4af68df385f91810575ac5ec7cdbc1c72d4b77
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Tue Jul 26 20:28:12 2011 +0200

    Avoid xdg-menu usage at packaging time

 icc_examin-0.49-xdg.patch |   20 ++++++++++++++++++++
 icc_examin.spec           |    3 +++
 2 files changed, 23 insertions(+), 0 deletions(-)
---
diff --git a/icc_examin-0.49-xdg.patch b/icc_examin-0.49-xdg.patch
new file mode 100644
index 0000000..f1c7cb4
--- /dev/null
+++ b/icc_examin-0.49-xdg.patch
@@ -0,0 +1,20 @@
+diff -up icc_examin-0.49/makefile.in.xdg icc_examin-0.49/makefile.in
+--- icc_examin-0.49/makefile.in.xdg	2011-07-26 20:24:01.347330943 +0200
++++ icc_examin-0.49/makefile.in	2011-07-26 20:25:54.413200931 +0200
+@@ -587,14 +587,14 @@ install_global:
+ 	mkdir -p $(DESTDIR)$(desktopdir)
+ 	$(COPY) icc_examin.desktop iccexamin.desktop
+ 	$(INSTALL) -m 644 iccexamin.desktop $(DESTDIR)$(desktopdir)/iccexamin.desktop
+-	-xdg-desktop-menu install --novendor iccexamin.desktop
++	#-xdg-desktop-menu install --novendor iccexamin.desktop
+ 	mkdir -p $(DESTDIR)$(datadir)/mime/packages/
+ 	mkdir -p $(DESTDIR)$(pixmapdir)/hicolor/scalable/
+ 	#$(INSTALL) -m 644 icc_examin.png $(DESTDIR)$(pixmapdir)/iccexamin.png
+ 	$(COPY) icc_examin.png iccexamin.png
+ 	$(INSTALL) -m 644 iccexamin.png $(DESTDIR)$(pixmapdir)/iccexamin.png
+ 	$(INSTALL) -m 644 icc_examin.svg $(DESTDIR)$(pixmapdir)/hicolor/scalable/iccexamin.svg
+-	-xdg-icon-resource install --size 128 --novendor iccexamin.png
++	#-xdg-icon-resource install --size 128 --novendor iccexamin.png
+ 	echo  Linguas ...
+ 	for ling in $(LINGUAS); do \
+ 	  echo "Installing po/$${ling}.gmo ..."; \
diff --git a/icc_examin.spec b/icc_examin.spec
index 6ac005d..c469621 100644
--- a/icc_examin.spec
+++ b/icc_examin.spec
@@ -7,6 +7,7 @@ Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.behrmann.name
 Source0:        http://downloads.sourceforge.net/oyranos/icc_examin-%{version}.tar.gz
+Patch0:         icc_examin-0.49-xdg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -39,6 +40,7 @@ visualizations (vrml), video card gamma tables.
 
 %prep
 %setup -q
+%patch0 -p1 -b .xdg
 
 
 %build
@@ -94,6 +96,7 @@ update-desktop-database &> /dev/null  || :
 %changelog
 * Tue Jul 26 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.49-1
 - Update to 0.49
+- Avoid xdg-menu usage
 
 * Fri May 27 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.47-4
 - Rebuilt for fltk


More information about the scm-commits mailing list