rpms/scidavis/F-10 scidavis-0.2.0-pro.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 scidavis.spec, 1.7, 1.8 sources, 1.4, 1.5

Sat Apr 11 09:52:20 UTC 2009

Author: tanguy

Update of /cvs/extras/rpms/scidavis/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7448

Modified Files:
	.cvsignore scidavis.spec sources 
Added Files:
	scidavis-0.2.0-pro.patch 
Log Message:


scidavis-0.2.0-pro.patch:

--- NEW FILE scidavis-0.2.0-pro.patch ---
--- scidavis-0.2.0/scidavis/scidavis.pro	2008-09-07 14:22:38.000000000 +0200
+++ scidavis-0.2.0/scidavis/scidavis.pro.new	2009-02-15 20:44:16.000000000 +0100
@@ -13,7 +13,7 @@
 
 ### what to install
 INSTALLS        += target       # this is the program itself
-INSTALLS        += documentation     # README, INSTALL.html, manual (if present in the manual subfolder), etc.
+#INSTALLS        += documentation     # README, INSTALL.html, manual (if present in the manual subfolder), etc.
 ### Comment out the next line if you do not want automatic compilation and installation of the translations
 INSTALLS        += translationfiles
 
@@ -42,7 +42,7 @@
 win32: documentation.path = "$$INSTALLBASE"                        # ... on Winodws
 ### 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.2.0
 ### 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.
@@ -83,34 +83,34 @@
 ### are compiled against Qt4), dynamically against everything else.
 #############################################################################
 
-unix:INCLUDEPATH  += ../3rdparty/qwtplot3d/include
-unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+#unix:INCLUDEPATH  += ../3rdparty/qwtplot3d/include
+#unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
 
-unix:INCLUDEPATH  += ../3rdparty/qwt/src
-unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
+#unix:INCLUDEPATH  += ../3rdparty/qwt/src
+#unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
 
-unix:LIBS         += -L/usr/lib$${libsuff}
-unix:LIBS         += -lgsl -lgslcblas -lz
+#unix:LIBS         += -L/usr/lib$${libsuff}
+#unix:LIBS         += -lgsl -lgslcblas -lz
 ### muparser 1.30 does not compile as a shared lib on Linux
-unix:LIBS         += -L/usr/local/lib$${libsuff}
-unix:LIBS         += /usr/local/lib/libmuparser.a
-unix:INCLUDEPATH  += /usr/local/include
+#unix:LIBS         += -L/usr/local/lib$${libsuff}
+#unix:LIBS         += /usr/local/lib/libmuparser.a
+#unix:INCLUDEPATH  += /usr/local/include
 
 #############################################################################
 ### Link everything dynamically
 #############################################################################
 
-#unix:INCLUDEPATH  += /usr/include/qwt5
-#unix:LIBS         += -L/usr/lib$${libsuff}
+unix:INCLUDEPATH  += /usr/include/qwt
+unix:LIBS         += -L/usr/lib$${libsuff}
 ## dynamically link against Qwt(3D) installed system-wide
 ## WARNING: make sure they are compiled against >= Qt4.2
 ## Mixing Qt 4.2 and Qt >= 4.3 compiled stuff may also 
 ## cause problems.
-#unix:INCLUDEPATH  += /usr/include/qwtplot3d
-#unix:LIBS         += -lqwtplot3d
-#unix:LIBS         += -lqwt
+unix:INCLUDEPATH  += /usr/include/qwtplot3d
+unix:LIBS         += -lqwtplot3d-qt4
+unix:LIBS         += -lqwt
 ##dynamically link against GSL and zlib installed system-wide
-#unix:LIBS         += -lgsl -lgslcblas -lz -lmuparser
+unix:LIBS         += -lgsl -lgslcblas -lz -lmuparser
 
 #############################################################################
 ### Default settings for Windows


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Feb 2009 21:41:27 -0000	1.4
+++ .cvsignore	11 Apr 2009 09:51:48 -0000	1.5
@@ -1,3 +1,2 @@
-scidavis-0.1.4.tar.bz2
-scidavis-0.1.4-pro.patch
+scidavis-0.2.1.tar.bz2
 scidavis-manual-0.1_2008-02-28.tar.bz2


Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-10/scidavis.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scidavis.spec	13 Feb 2009 21:41:28 -0000	1.7
+++ scidavis.spec	11 Apr 2009 09:51:48 -0000	1.8
@@ -1,10 +1,10 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
-Version:	0.1.4
+Version:	0.2.1
 Release: 	1%{?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.4-pro.patch
+Patch0:		scidavis-0.2.0-pro.patch
 URL:		http://scidavis.sourceforge.net/
 License:	GPLv2
 Group: 		Applications/Engineering
@@ -33,10 +33,12 @@
 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
@@ -47,7 +49,7 @@
 rm %{buildroot}/%{_datadir}/applications/scidavis.desktop
 
 install -d %{buildroot}%{_datadir}/%{name}/translations
-install -D -pm 644 scidavis/translations/*.qm %{buildroot}%{_datadir}/%{name}/translations/
+install -D -pm 644 translations/*.qm %{buildroot}%{_datadir}/%{name}/translations/
 
 mkdir %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/
 mkdir %{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/
@@ -81,7 +83,7 @@
 %exclude %{_sysconfdir}/scidavisrc.pyo
 %exclude %{_sysconfdir}/scidavisrc.pyc
 %{_bindir}/scidavis
-%{_libdir}/scidavis/
+#%{_libdir}/scidavis/
 %{_datadir}/applications/*
 %{_datadir}/mime/packages/scidavis.xml
 %{_datadir}/mimelnk/application/x-sciprj.desktop
@@ -96,6 +98,13 @@
 %doc manual/*
 
 %changelog
+
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Feb 2009 21:41:28 -0000	1.4
+++ sources	11 Apr 2009 09:51:49 -0000	1.5
@@ -1,3 +1,2 @@
-18d884adbd33d0c63cddc7a4c6f2a08e  scidavis-0.1.4.tar.bz2
-ebc9a90674c0fd5304b36ee2700e7bf3  scidavis-0.1.4-pro.patch
+5b4d766571163529fa15247b53a66889  scidavis-0.2.1.tar.bz2
 3527477cb0685da3ddfb0ee398ba6303  scidavis-manual-0.1_2008-02-28.tar.bz2


