[icc_examin] Update to 0.47

[Nicolas Chauvet]

commit cfbceec9e6865ba513fe843edc7fbdbe21113729
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Sun Aug 22 19:02:07 2010 +0200

    Update to 0.47

 .gitignore                    |    1 +
 icc_examin-0.46-default.patch |   30 ----------------------------
 icc_examin-0.46-fixes.patch   |   26 ------------------------
 icc_examin-0.47-fixes.patch   |   12 +++++++++++
 icc_examin.spec               |   43 +++++++++++++++++++---------------------
 sources                       |    2 +-
 6 files changed, 34 insertions(+), 80 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aaf906e..b54da84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 icc_examin-0.46.tar.gz
+/icc_examin-0.47.tar.gz
diff --git a/icc_examin-0.47-fixes.patch b/icc_examin-0.47-fixes.patch
new file mode 100644
index 0000000..fa30c40
--- /dev/null
+++ b/icc_examin-0.47-fixes.patch
@@ -0,0 +1,12 @@
+diff -up icc_examin-0.47/icc_examin.desktop.fixes icc_examin-0.47/icc_examin.desktop
+--- icc_examin-0.47/icc_examin.desktop.fixes	2010-06-16 21:45:34.000000000 +0200
++++ icc_examin-0.47/icc_examin.desktop	2010-08-22 16:11:53.000000000 +0200
+@@ -2,7 +2,7 @@
+ [Desktop Entry]
+ Version=1.0
+ Type=Application
+-Categories=Graphics;RasterGraphics;Viewer;
++Categories=Graphics;2DGraphics;RasterGraphics;Viewer;
+ Comment=Look at the internals of ICC profiles
+ Comment[de]=ICC Farbprofilebetrachter
+ Comment[fr]=Examiner un profil ICC
diff --git a/icc_examin.spec b/icc_examin.spec
index 2f97331..13171bf 100644
--- a/icc_examin.spec
+++ b/icc_examin.spec
@@ -1,14 +1,13 @@
 Name:           icc_examin
-Version:        0.46
-Release:        3%{?dist}
+Version:        0.47
+Release:        1%{?dist}
 Summary:        ICC profile viewer and color visualization
 
 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.46-default.patch
-Patch1:         icc_examin-0.46-fixes.patch
+Patch0:         icc_examin-0.47-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -23,14 +22,12 @@ BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libxml2-devel
-BuildRequires:  oyranos-devel >= 0.1.9
+BuildRequires:  oyranos-devel >= 0.1.10
 
 BuildRequires:  libXpm-devel
 
-Requires:       oyranos
-%if 0%{?fedora} > 10
+Requires:       oyranos >= 0.1.10
 Requires:       dejavu-sans-fonts
-%endif
 
 
 
@@ -43,18 +40,13 @@ visualizations (vrml), video card gamma tables.
 
 %prep
 %setup -q
-%patch0 -p1 -b .default
-%patch1 -p1 -b .fixes
+%patch0 -p1 -b .fixes
 
-# Fix encoding
-cp -pr BUGS BUGS.not-utf8
-iconv -f ISO_8859-1 -t UTF8 BUGS.not-utf8 > BUGS
-touch -r BUGS.not-utf8 BUGS
-rm BUGS.not-utf8
 
 %build
 %configure
-make %{?_smp_mflags}
+make 
+#{?_smp_mflags}
 
 
 %install
@@ -64,9 +56,13 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 #Remove bundled fonts
 rm -rf $RPM_BUILD_ROOT%{_datadir}/fonts/FreeSans.ttf
 
-#Remove deprecated desktop files
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/x-cgats.desktop
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/x-icc.desktop
+#Missplaced file
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/hicolor/scalable/iccexamin.png \
+ $RPM_BUILD_ROOT%{_datadir}/pixmaps
+
+#This will avoid problem when registering mime type
+mv $RPM_BUILD_ROOT%{_datadir}/applications/iccexamin.desktop \
+ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 desktop-file-install --vendor "" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -82,11 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-update-mime-database %{_datadir}/mime &> /dev/null
 update-desktop-database &> /dev/null  || :
 
 %postun
-update-mime-database %{_datadir}/mime &> /dev/null
 update-desktop-database &> /dev/null  || :
 
 
@@ -94,12 +88,15 @@ update-desktop-database &> /dev/null  || :
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS README TODO
 %{_bindir}/iccexamin
-%{_datadir}/mime/packages/icc.xml
-%{_datadir}/pixmaps/icc_examin.png
+%{_datadir}/pixmaps/iccexamin.png
+%{_datadir}/pixmaps/hicolor/scalable/iccexamin.svg
 %{_datadir}/applications/icc_examin.desktop
 
 
 %changelog
+* Sun Aug 22 2010 Nicolas Chauvet <kwizart at gmail.com> - 0.47-1
+- Update to 0.47
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.46-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 5fd287c..34a4f98 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-01b8a19489601850192476a06393cf47  icc_examin-0.46.tar.gz
+cd451499601310d5e8aeb2c20847a12a  icc_examin-0.47.tar.gz