rpms/scidavis/F-9 application-x-scidavis-128x128.png, NONE, 1.1 application-x-scidavis-32x32.png, NONE, 1.1 application-x-scidavis-48x48.png, NONE, 1.1 application-x-scidavis.svg, NONE, 1.1 scidavis-0.1.2-manual.patch, NONE, 1.1 scidavis-0.1.2-pro.patch, NONE, 1.1 scidavis-0.1.2-translations.patch, NONE, 1.1 scidavis.desktop, NONE, 1.1 scidavis.spec, NONE, 1.1 scidavis.xml, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Eric Tanguy (tanguy)
fedora-extras-commits at redhat.com
Tue Apr 22 20:40:32 UTC 2008
- Previous message (by thread): rpms/scidavis/F-8 application-x-scidavis-128x128.png, NONE, 1.1 application-x-scidavis-32x32.png, NONE, 1.1 application-x-scidavis-48x48.png, NONE, 1.1 application-x-scidavis.svg, NONE, 1.1 scidavis-0.1.2-manual.patch, NONE, 1.1 scidavis-0.1.2-pro.patch, NONE, 1.1 scidavis-0.1.2-translations.patch, NONE, 1.1 scidavis.desktop, NONE, 1.1 scidavis.spec, NONE, 1.1 scidavis.xml, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): [pkgdb] munin (Fedora EPEL, 5) updated by kevin
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tanguy
Update of /cvs/extras/rpms/scidavis/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30901/F-9
Modified Files:
.cvsignore sources
Added Files:
application-x-scidavis-128x128.png
application-x-scidavis-32x32.png
application-x-scidavis-48x48.png application-x-scidavis.svg
scidavis-0.1.2-manual.patch scidavis-0.1.2-pro.patch
scidavis-0.1.2-translations.patch scidavis.desktop
scidavis.spec scidavis.xml
Log Message:
--- NEW FILE application-x-scidavis.svg ---
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="32"
height="32"
id="svg4732"
sodipodi:version="0.32"
inkscape:version="0.45.1"
version="1.0"
sodipodi:docbase="/home/knut/scidavis/trunk/scidavis/icons"
sodipodi:docname="scidavis-icon.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
inkscape:export-filename="/home/knut/scidavis/trunk/scidavis/icons/scidavis-icon.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4734">
<linearGradient
id="linearGradient5758">
<stop
style="stop-color:#ffd0d0;stop-opacity:1;"
offset="0"
id="stop5760" />
<stop
style="stop-color:#c50000;stop-opacity:1;"
offset="1"
id="stop5762" />
</linearGradient>
<linearGradient
id="linearGradient5750">
<stop
style="stop-color:#a4bced;stop-opacity:1;"
offset="0"
id="stop5752" />
<stop
style="stop-color:#204ba0;stop-opacity:1;"
offset="1"
id="stop5754" />
</linearGradient>
<linearGradient
id="linearGradient5740">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop5742" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="1"
id="stop5744" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient5758"
id="radialGradient5764"
cx="17.128807"
cy="15.980353"
fx="17.128807"
fy="15.980353"
r="5.2678132"
gradientTransform="matrix(1,0,0,0.9253732,0,1.2791078)"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="16.8125"
inkscape:cx="16"
inkscape:cy="16"
inkscape:document-units="px"
inkscape:current-layer="layer1"
width="32px"
height="32px"
inkscape:window-width="1280"
inkscape:window-height="754"
inkscape:window-x="0"
inkscape:window-y="0" />
<metadata
id="metadata4737">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 32,5.0000001 C 23.114583,5.0000001 18.1875,10.03125 14.1875,14.28125 C 10.1875,18.53125 7.1145831,22 -5.5511151e-17,22 L -5.5511151e-17,27 C 8.8854168,27 13.8125,21.96875 17.8125,17.71875 C 21.8125,13.46875 24.885417,10 32,10 L 32,5.0000001 z "
id="path5766" />
<path
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 32,5 C 23.114583,5 18.1875,10.03125 14.1875,14.28125 C 10.1875,18.53125 7.1145833,22 0,22 L 0,27 C 8.8854167,27 13.8125,21.96875 17.8125,17.71875 C 21.8125,13.46875 24.885417,10 32,10 L 32,5 z "
id="path4763" />
<path
style="fill:#275ac0;fill-opacity:1;fill-rule:evenodd;stroke:#a5bdee;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 8.7424241,0.5 C 8.7424241,2.114583 8.7424241,3.729167 8.7424241,5.34375 C 10.355219,5.34375 11.968013,5.34375 13.580808,5.34375 C 13.580808,12.447916 13.580808,19.552085 13.580808,26.65625 C 11.968013,26.65625 10.355219,26.65625 8.7424241,26.65625 C 8.7424241,28.270835 8.7424241,29.885416 8.7424241,31.5 C 13.580808,31.5 18.419192,31.5 23.257576,31.5 C 23.257576,29.885416 23.257576,28.270835 23.257576,26.65625 C 21.644781,26.65625 20.031987,26.65625 18.419192,26.65625 C 18.419192,19.552085 18.419192,12.447916 18.419192,5.34375 C 20.031987,5.34375 21.644781,5.34375 23.257576,5.34375 C 23.257576,3.729167 23.257576,2.114583 23.257576,0.5 C 18.419192,0.5 13.580808,0.5 8.7424241,0.5 z "
id="path4740" />
<path
sodipodi:type="arc"
style="opacity:1;fill:url(#radialGradient5764);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path4769"
sodipodi:cx="15.80344"
sodipodi:cy="17.140049"
sodipodi:rx="5.2678132"
sodipodi:ry="4.8746929"
d="M 21.071253 17.140049 A 5.2678132 4.8746929 0 1 1 10.535627,17.140049 A 5.2678132 4.8746929 0 1 1 21.071253 17.140049 z"
transform="matrix(0.9491605,0,0,1.0257056,0.9999991,-1.580644)" />
</g>
</svg>
scidavis-0.1.2-manual.patch:
--- NEW FILE scidavis-0.1.2-manual.patch ---
--- scidavis-0.1.2/scidavis/src/ApplicationWindow.cpp (révision 814)
+++ scidavis-0.1.2/scidavis/src/ApplicationWindow.cpp (révision 815)
@@ -4155,16 +4155,28 @@
if (help_file_setting.isValid())
helpFilePath = help_file_setting.toString();
else {
+ QFileInfo help_file_info;
+ QString help_dir_base = QString("/usr/share/doc/scidavis-%1.%2.%3")
+ .arg((scidavis_version & 0xff0000) >> 16)
+ .arg((scidavis_version & 0x00ff00) >> 8)
+ .arg(scidavis_version & 0x0000ff);
+ help_file_info.setFile(help_dir_base);
+ if (!help_file_info.exists())
+ help_dir_base = "/usr/share/doc/scidavis";
+ QStringList help_dir_suffixes;
QString locale = QLocale().name(); // language_country according to ISO 639 and 3166, respectively
- QStringList help_dir_suffixes;
- help_dir_suffixes << locale << locale.section('_',0,0) << appLanguage << "en";
- QFileInfo help_file_info;
+ help_dir_suffixes
+ << QString("-") + locale
+ << QString("-") + locale.section('_',0,0)
+ << QString("-") + appLanguage
+ << "-en"
+ << "";
foreach (QString suffix, help_dir_suffixes) {
- help_file_info.setFile(QString("/usr/share/doc/scidavis/manual-%1/index.html").arg(suffix));
+ help_file_info.setFile(help_dir_base + QString("/manual%1/index.html").arg(suffix));
if (help_file_info.exists())
break;
}
- // intentionally defaults to .../manual-en/index.html even if it doesn't exist
+ // intentionally defaults to /usr/share/doc/scidavis/manual/index.html even if it doesn't exist
helpFilePath = help_file_info.absoluteFilePath();
}
fitPluginsPath = settings.value("/FitPlugins", "/usr/lib/scidavis/plugins").toString();
scidavis-0.1.2-pro.patch:
--- NEW FILE scidavis-0.1.2-pro.patch ---
--- scidavis-0.1.2/scidavis/scidavis.pro 2007-08-04 23:54:46.000000000 +0200
+++ scidavis-0.1.2/scidavis/scidavis.pro.new 2008-04-20 10:57:38.000000000 +0200
@@ -10,7 +10,7 @@
### what to install and where
INSTALLS += target
-INSTALLS += documentation
+#INSTALLS += documentation
unix: INSTALLBASE = /usr
win32: INSTALLBASE = c:/scidavis
@@ -23,7 +23,7 @@
### building without muParser does not work yet (but will in a future version)
include( muparser.pri )
### remove the comment char "#" from the following line to activate Python scripting support
-#include( python.pri )
+include( python.pri )
linux-g++-64: libsuff = 64
@@ -41,29 +41,30 @@
### are compiled against Qt4), dynamically against everything else.
#############################################################################
-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:LIBS += -L /usr/lib$${libsuff}
-unix:LIBS += -lgsl -lgslcblas -lz -lmuparser
+#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: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}
-## 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
-##dynamically link against GSL and zlib installed system-wide
-#unix:LIBS += -lgsl -lgslcblas -lz -lmuparser
+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-qt4
+unix:LIBS += -lqwt
+#dynamically link against GSL and zlib installed system-wide
+unix:LIBS += -lgsl -lgslcblas -lz -lmuparser
#############################################################################
### Default settings for Windows
scidavis-0.1.2-translations.patch:
--- NEW FILE scidavis-0.1.2-translations.patch ---
--- scidavis-0.1.2/scidavis/src/ApplicationWindow.cpp 2007-08-04 22:54:18.000000000 +0200
+++ scidavis-0.1.2/scidavis/src/ApplicationWindow.cpp.new 2007-08-07 17:58:36.000000000 +0200
@@ -12403,7 +12403,7 @@
qApp->installTranslator(appTranslator);
qApp->installTranslator(qtTranslator);
- QString qmPath = qApp->applicationDirPath() + "/translations";
+ QString qmPath = "/usr/share/scidavis/translations";
QDir dir(qmPath);
QStringList fileNames = dir.entryList("scidavis_*.qm");
for (int i=0; i < (int)fileNames.size(); i++)
@@ -12448,7 +12448,7 @@
}
else
{
- QString qmPath = qApp->applicationDirPath() + "/translations";
+ QString qmPath = "/usr/share/scidavis/translations";
appTranslator->load("scidavis_" + locale, qmPath);
qtTranslator->load("qt_" + locale, qmPath+"/qt");
}
--- NEW FILE scidavis.desktop ---
[Desktop Entry]
Name=SciDAVis
Comment=Scientific Data Analysis and Visualization
Comment[de]=Visualisierungs- und Datenanalyseprogramm
Comment[fr]=Outil d'analyse scientifique de données
Icon=scidavis
Exec=scidavis %f
Terminal=false
Type=Application
Categories=Science;Graphics;
MimeType=application/x-scidavis;
--- NEW FILE scidavis.spec ---
Summary: Scientific Data Analysis and Visualization
Name: scidavis
Version: 0.1.2
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
URL: http://scidavis.sourceforge.net/
License: GPLv2
Group: Applications/Engineering
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
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
%description
SciDAVis is a user-friendly data analysis and visualization program primarily
aimed at high-quality plotting of scientific data. It strives to combine an
intuitive, easy-to-use graphical user interface with powerful features such
as Python scriptability.
%package manual
Summary: Additional manual for SciDAVis
Group: Documentation
%description manual
This package contains the manual for SciDAVis.
%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
%build
qmake-qt4 scidavis.pro
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make INSTALL_ROOT="%{buildroot}" install
install -d %{buildroot}%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE3}
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
%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc CHANGES README gpl.txt
%exclude %{_sysconfdir}/scidavisrc.pyo
%exclude %{_sysconfdir}/scidavisrc.pyc
%{_bindir}/scidavis
%{_libdir}/scidavis/
%{_datadir}/applications/*
%{_datadir}/mime/packages/scidavis.xml
%{_datadir}/icons/hicolor/*/mimetypes/application-x-scidavis*
%{_datadir}/pixmaps/*
%{_datadir}/scidavis
%{_sysconfdir}/scidavisrc.py
%files manual
%defattr(-,root,root,-)
%doc manual/*
%changelog
* Mon Feb 25 2008 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.1.2-1
- Initial build
--- NEW FILE scidavis.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type type="application/x-scidavis">
<comment>Scidavis project</comment>
<comment xml:lang="fr">Projet Scidavis</comment>
<glob pattern="*.sciprj"/>
<magic priority="100">
<match type="string" value="SciDAVis" offset="0"/>
</magic>
</mime-type>
</mime-info>
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Apr 2008 17:13:19 -0000 1.1
+++ .cvsignore 22 Apr 2008 20:39:55 -0000 1.2
@@ -0,0 +1,3 @@
+scidavis-0.1.2.tar.bz2
+scidavis-0.1.2_translations_2008-02-03.tar.bz2
+scidavis-manual-0.1_2008-02-28.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scidavis/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Apr 2008 17:13:19 -0000 1.1
+++ sources 22 Apr 2008 20:39:55 -0000 1.2
@@ -0,0 +1,3 @@
+07403d334d57ece4267ff554220a1868 scidavis-0.1.2.tar.bz2
+28463a1b621ac54d7340195b6fcca49a scidavis-0.1.2_translations_2008-02-03.tar.bz2
+3527477cb0685da3ddfb0ee398ba6303 scidavis-manual-0.1_2008-02-28.tar.bz2
- Previous message (by thread): rpms/scidavis/F-8 application-x-scidavis-128x128.png, NONE, 1.1 application-x-scidavis-32x32.png, NONE, 1.1 application-x-scidavis-48x48.png, NONE, 1.1 application-x-scidavis.svg, NONE, 1.1 scidavis-0.1.2-manual.patch, NONE, 1.1 scidavis-0.1.2-pro.patch, NONE, 1.1 scidavis-0.1.2-translations.patch, NONE, 1.1 scidavis.desktop, NONE, 1.1 scidavis.spec, NONE, 1.1 scidavis.xml, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): [pkgdb] munin (Fedora EPEL, 5) updated by kevin
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list