rpms/scidavis/devel scidavis-0.1.3-pro.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 scidavis.spec, 1.2, 1.3 sources, 1.2, 1.3 application-x-scidavis-128x128.png, 1.1, NONE application-x-scidavis-32x32.png, 1.1, NONE application-x-scidavis-48x48.png, 1.1, NONE application-x-scidavis.svg, 1.1, NONE scidavis-0.1.2-pro.patch, 1.1, NONE scidavis-0.1.2-translations.patch, 1.1, NONE scidavis.desktop, 1.1, NONE scidavis.xml, 1.1, NONE
Eric Tanguy (tanguy)
fedora-extras-commits at redhat.com
Thu Apr 24 07:12:18 UTC 2008
Author: tanguy
Update of /cvs/extras/rpms/scidavis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24764
Modified Files:
.cvsignore scidavis.spec sources
Added Files:
scidavis-0.1.3-pro.patch
Removed Files:
application-x-scidavis-128x128.png
application-x-scidavis-32x32.png
application-x-scidavis-48x48.png application-x-scidavis.svg
scidavis-0.1.2-pro.patch scidavis-0.1.2-translations.patch
scidavis.desktop scidavis.xml
Log Message:
scidavis-0.1.3-pro.patch:
--- NEW FILE scidavis-0.1.3-pro.patch ---
--- scidavis-0.1.3/scidavis/scidavis.pro 2008-02-29 21:52:46.000000000 +0100
+++ scidavis-0.1.3/scidavis/scidavis.pro.new 2008-04-23 17:32:22.000000000 +0200
@@ -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
@@ -35,7 +35,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.1.3/manual
### 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.
@@ -70,29 +70,30 @@
### 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 -lmuparser
+#unix:LIBS += -L/usr/lib$${libsuff}
+#unix:LIBS += -lgsl -lgslcblas -lz -lmuparser
#############################################################################
### Link everything dynamically
#############################################################################
-#unix:INCLUDEPATH += /usr/include/qwt5
-#unix:LIBS += -L/usr/lib$${libsuff}
+unix:INCLUDEPATH += /usr/include/qwt
+unix:INCLUDEPATH += /usr/include/qwtplot3d
+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:LIBS += -lqwtplot3d
-#unix:LIBS += -lqwt
+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/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 22 Apr 2008 20:33:54 -0000 1.2
+++ .cvsignore 24 Apr 2008 07:11:39 -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.1.3.tar.bz2
scidavis-manual-0.1_2008-02-28.tar.bz2
Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/scidavis.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scidavis.spec 23 Apr 2008 15:09:19 -0000 1.2
+++ scidavis.spec 24 Apr 2008 07:11:40 -0000 1.3
@@ -1,28 +1,15 @@
Summary: Scientific Data Analysis and Visualization
Name: scidavis
-Version: 0.1.2
+Version: 0.1.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.1.3-pro.patch
URL: http://scidavis.sourceforge.net/
License: GPLv2
Group: Applications/Engineering
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils openssl-devel
+BuildRequires: desktop-file-utils
BuildRequires: gsl-devel python-devel muParser-devel qwt-devel qwtplot3d-qt4-devel qt4-devel sip-devel PyQt4-devel dos2unix
Requires: hicolor-icon-theme
@@ -41,22 +28,10 @@
%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/x-sciprj/x-sciprj;/' scidavis/scidavis.desktop
+sed -i -e 's/50/100/' scidavis/scidavis.xml
%build
qmake-qt4 scidavis.pro
@@ -68,20 +43,32 @@
install -d %{buildroot}%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir %{buildroot}%{_datadir}/applications \
- %{SOURCE3}
+ %{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/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/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
%post
touch --no-create %{_datadir}/icons/hicolor || :
@@ -107,12 +94,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}/icons/hicolor/*/mimetypes/application-x-scidavis*
-%{_datadir}/pixmaps/*
+%{_datadir}/mimelnk/application/x-sciprj.desktop
+%{_datadir}/icons/hicolor/*/mimetypes/application-x-sciprj*
+%{_datadir}/icons/locolor/*/mimetypes/application-x-sciprj*
%{_datadir}/scidavis
%{_sysconfdir}/scidavisrc.py
@@ -121,5 +110,8 @@
%doc manual/*
%changelog
+* 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/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 22 Apr 2008 20:33:54 -0000 1.2
+++ sources 24 Apr 2008 07:11:40 -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
+4aac6ab3a06c6df66fd3a7b91bdccc94 scidavis-0.1.3.tar.bz2
3527477cb0685da3ddfb0ee398ba6303 scidavis-manual-0.1_2008-02-28.tar.bz2
--- application-x-scidavis.svg DELETED ---
--- scidavis-0.1.2-pro.patch DELETED ---
--- scidavis-0.1.2-translations.patch DELETED ---
--- scidavis.desktop DELETED ---
--- scidavis.xml DELETED ---
More information about the fedora-extras-commits
mailing list