rpms/scidavis/F-9 scidavis-0.1.3-pro.patch, 1.1, 1.2 scidavis.spec, 1.2, 1.3

[Eric Tanguy (tanguy)]

Author: tanguy

Update of /cvs/extras/rpms/scidavis/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7724

Modified Files:
	scidavis-0.1.3-pro.patch scidavis.spec 
Log Message:


scidavis-0.1.3-pro.patch:

Index: scidavis-0.1.3-pro.patch
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-9/scidavis-0.1.3-pro.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scidavis-0.1.3-pro.patch	23 Apr 2008 21:15:17 -0000	1.1
+++ scidavis-0.1.3-pro.patch	24 Apr 2008 09:05:22 -0000	1.2
@@ -14,7 +14,7 @@
  ### Usually, the manual will be expected in the "manual" subfolder of "documentation.path" (see above).
  ### You can override this, uncomment and adjust the path behind the '=' in the next line.
 -# manual.path = $$INSTALLBASE/share/doc/scidavis/manual
-+manual.path = $$INSTALLBASE/share/doc/scidavis-manual-0.1.3/manual
++manual.path = $$INSTALLBASE/share/doc/scidavis-manual-0.1.3
  ### Important: translationfiles.path will be the directory where scidavis expects
  ### the translation .qm files at runtime. Therefore you need to set it corretly even if 
  ### you do not use this project file to generate the translation files.


Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-9/scidavis.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scidavis.spec	23 Apr 2008 21:15:17 -0000	1.2
+++ scidavis.spec	24 Apr 2008 09:05:22 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
 Version:	0.1.3
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Source0:	http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2
 Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
 Patch0:		scidavis-0.1.3-pro.patch
@@ -45,30 +45,17 @@
 	--dir %{buildroot}%{_datadir}/applications \
 	%{buildroot}/%{_datadir}/applications/scidavis.desktop
 
+rm %{buildroot}/%{_datadir}/applications/scidavis.desktop
+
 install -d %{buildroot}%{_datadir}/%{name}/translations
 install -D -pm 644 scidavis/translations/*.qm %{buildroot}%{_datadir}/%{name}/translations/
 
-mkdir %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes
-mkdir %{buildroot}%{_datadir}/icons/hicolor/16x16/mimetypes
-mkdir %{buildroot}%{_datadir}/icons/hicolor/22x22/mimetypes
-mkdir %{buildroot}%{_datadir}/icons/hicolor/32x32/mimetypes
-mkdir %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes
-mkdir %{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes
-mkdir %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes
-mkdir %{buildroot}%{_datadir}/icons/locolor/32x32/mimetypes
-mkdir %{buildroot}%{_datadir}/icons/locolor/16x16/mimetypes
-mkdir %{buildroot}%{_datadir}/icons/locolor/22x22/mimetypes
-
-mv %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/scidavis.png %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-sciprj.png
-mv %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/scidavis.png %{buildroot}%{_datadir}/icons/hicolor/16x16/mimetypes/application-x-sciprj.png
-mv %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/scidavis.png %{buildroot}%{_datadir}/icons/hicolor/22x22/mimetypes/application-x-sciprj.png
-mv %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/scidavis.png %{buildroot}%{_datadir}/icons/hicolor/32x32/mimetypes/application-x-sciprj.png
-mv %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/scidavis.png %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-sciprj.png
-mv %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/scidavis.png %{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/application-x-sciprj.png
-mv %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/scidavis.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/application-x-sciprj.svg
-mv %{buildroot}%{_datadir}/icons/locolor/32x32/apps/scidavis.png %{buildroot}%{_datadir}/icons/locolor/32x32/mimetypes/application-x-sciprj.png
-mv %{buildroot}%{_datadir}/icons/locolor/16x16/apps/scidavis.png %{buildroot}%{_datadir}/icons/locolor/16x16/mimetypes/application-x-sciprj.png
-mv %{buildroot}%{_datadir}/icons/locolor/22x22/apps/scidavis.png %{buildroot}%{_datadir}/icons/locolor/22x22/mimetypes/application-x-sciprj.png
+mkdir %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/
+mkdir %{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/
+cp %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/scidavis.png %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/.
+cp %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/scidavis.png %{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/.
+mv %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/scidavis.png %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-sciprj.png
+mv %{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/scidavis.png %{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/application-x-sciprj.png
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -94,14 +81,14 @@
 %doc CHANGES README gpl.txt
 %exclude %{_sysconfdir}/scidavisrc.pyo
 %exclude %{_sysconfdir}/scidavisrc.pyc
-%exclude %{_datadir}/icons/hicolor/scalable/mimetypes/application-x-sciprj.svg
 %{_bindir}/scidavis
 %{_libdir}/scidavis/
 %{_datadir}/applications/*
 %{_datadir}/mime/packages/scidavis.xml
 %{_datadir}/mimelnk/application/x-sciprj.desktop
 %{_datadir}/icons/hicolor/*/mimetypes/application-x-sciprj*
-%{_datadir}/icons/locolor/*/mimetypes/application-x-sciprj*
+%{_datadir}/icons/hicolor/*/apps/scidavis.*
+%{_datadir}/icons/locolor/*/apps/scidavis.*
 %{_datadir}/scidavis
 %{_sysconfdir}/scidavisrc.py
 
@@ -110,6 +97,9 @@
 %doc manual/*
 
 %changelog
+* Wed Apr 23 2008 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-2
+- Handle correctly the icons
+
 * Wed Apr 23 2008 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-1
 - Update to 0.1.3