rpms/scidavis/EL-5 .cvsignore, 1.2, 1.3 scidavis.spec, 1.1, 1.2 sources, 1.2, 1.3

Thu Jul 9 20:49:59 UTC 2009

Author: tanguy

Update of /cvs/extras/rpms/scidavis/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24527

Modified Files:
	.cvsignore scidavis.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scidavis/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3

--- .cvsignore	22 Apr 2008 20:45:53 -0000	1.2
+++ .cvsignore	9 Jul 2009 20:49:56 -0000	1.3
@@ -1,3 +1,2 @@
-scidavis-0.1.2.tar.bz2
-scidavis-0.1.2_translations_2008-02-03.tar.bz2
+scidavis-0.2.3.tar.bz2
 scidavis-manual-0.1_2008-02-28.tar.bz2


Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/EL-5/scidavis.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- scidavis.spec	22 Apr 2008 20:45:53 -0000	1.1
+++ scidavis.spec	9 Jul 2009 20:49:56 -0000	1.2
@@ -1,23 +1,10 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
-Version:	0.1.2
+Version:	0.2.3
 Release: 	1%{?dist}
 Source0:	http://download.sourceforge.net/sourceforge/scidavis/%{name}-%{version}.tar.bz2
-Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-0.1.2_translations_2008-02-03.tar.bz2
-Source2:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
-Source3:	scidavis.desktop
-Source4:	scidavis.xml
-
-#To be removed next update
-#Icon files are from http://scidavis.svn.sourceforge.net/viewvc/scidavis/branches/current_stable/scidavis/icons/
-
-Source5:	application-x-scidavis.svg
-Source6:	application-x-scidavis-32x32.png
-Source7:	application-x-scidavis-48x48.png
-Source8:	application-x-scidavis-128x128.png
-Patch0:		scidavis-0.1.2-translations.patch
-Patch1:		scidavis-0.1.2-pro.patch
-Patch2:		scidavis-0.1.2-manual.patch
+Source1:	http://download.sourceforge.net/sourceforge/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
+Patch0:		scidavis-0.2.0-pro.patch
 URL:		http://scidavis.sourceforge.net/
 License:	GPLv2
 Group: 		Applications/Engineering
@@ -41,47 +28,35 @@ This package contains the manual for Sci
 
 %prep
 %setup -q -a 1
-%setup -q -D -T -a 2
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
-#To be removed taken into account upstream
-chmod 0644 scidavis/src/*
-chmod 0644 gpl.txt
-chmod 0644 INSTALL.html
-chmod 0644 3rdparty/liborigin/OPJFile.cpp
-chmod 0644 3rdparty/minigzip/minigzip.c
-chmod 0644 3rdparty/liborigin/OPJFile.h
-chmod 0644 fitPlugins/fitRational1/fitRational1.cpp
-chmod 0644 fitPlugins/fitRational0/fitRational0.cpp
-dos2unix gpl.txt
-dos2unix 3rdparty/minigzip/minigzip.c
+sed -i -e 's/50/100/' scidavis/scidavis.xml
 
 %build
+cd scidavis
 qmake-qt4 scidavis.pro
 make %{?_smp_mflags}
 
 %install
+cd scidavis
 rm -rf %{buildroot}
 make INSTALL_ROOT="%{buildroot}" install
 install -d %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor fedora \
 	--dir %{buildroot}%{_datadir}/applications \
-	%{SOURCE3}
+	%{buildroot}/%{_datadir}/applications/scidavis.desktop
+
+rm %{buildroot}/%{_datadir}/applications/scidavis.desktop
 
 install -d %{buildroot}%{_datadir}/%{name}/translations
 install -D -pm 644 translations/*.qm %{buildroot}%{_datadir}/%{name}/translations/
 
-install -D -pm 644 scidavis-logo.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
-install -D -pm 644 %{SOURCE4} %{buildroot}%{_datadir}/mime/packages/scidavis.xml
-install -D -pm 644 %{SOURCE5} %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/application-x-scidavis.svg
-install -D -pm 644 %{SOURCE6} %{buildroot}%{_datadir}/icons/hicolor/32x32/mimetypes/application-x-scidavis.png
-install -D -pm 644 %{SOURCE7} %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/application-x-scidavis.png
-install -D -pm 644 %{SOURCE8} %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-scidavis.png
-
-#rm %{buildroot}%{_sysconfdir}/scidavisrc.pyc
-#rm %{buildroot}%{_sysconfdir}/scidavisrc.pyo
+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 || :
@@ -108,11 +83,13 @@ rm -rf %{buildroot}
 %exclude %{_sysconfdir}/scidavisrc.pyo
 %exclude %{_sysconfdir}/scidavisrc.pyc
 %{_bindir}/scidavis
-%{_libdir}/scidavis/
+#%{_libdir}/scidavis/
 %{_datadir}/applications/*
 %{_datadir}/mime/packages/scidavis.xml
-%{_datadir}/icons/hicolor/*/mimetypes/application-x-scidavis*
-%{_datadir}/pixmaps/*
+%{_datadir}/mimelnk/application/x-sciprj.desktop
+%{_datadir}/icons/hicolor/*/mimetypes/application-x-sciprj*
+%{_datadir}/icons/hicolor/*/apps/scidavis.*
+%{_datadir}/icons/locolor/*/apps/scidavis.*
 %{_datadir}/scidavis
 %{_sysconfdir}/scidavisrc.py
 
@@ -121,5 +98,41 @@ rm -rf %{buildroot}
 %doc manual/*
 
 %changelog
+* Sun Jul 05 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.3-1
+- Update to 0.2.3
+
+* Wed Apr 22 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.2-1
+- Update to 0.2.2
+
+* Sat Apr 10 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.1-1
+- Update to 0.2.1
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 09 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.4-1
+- Update to 0.1.4
+
+* Sun Jan 11 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-7
+- Replace the sip patch by a better one from upstream
+
+* Sun Jan 11 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-6
+- Replace the sip patch by the one from upstream
+
+* Wed Jan 07 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.3-5
+- Rebuild
+
+* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.3-4
+- sip patch (#479118)
+
+* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.1.3-3
+- Rebuild for Python 2.6
+
+* 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
+
 * Mon Feb 25 2008 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.2-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scidavis/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Apr 2008 20:45:53 -0000	1.2
+++ sources	9 Jul 2009 20:49:56 -0000	1.3
@@ -1,3 +1,2 @@
-07403d334d57ece4267ff554220a1868  scidavis-0.1.2.tar.bz2
-28463a1b621ac54d7340195b6fcca49a  scidavis-0.1.2_translations_2008-02-03.tar.bz2
+30d3f7c4e3702cec0bce8e34ea6112e7  scidavis-0.2.3.tar.bz2
 3527477cb0685da3ddfb0ee398ba6303  scidavis-manual-0.1_2008-02-28.tar.bz2


