packages: scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2 (NEW), scidavis/s...
blues
blues at pld-linux.org
Mon Oct 5 15:16:47 CEST 2009
Author: blues Date: Mon Oct 5 13:16:47 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- raw from FC
---- Files affected:
packages/scidavis:
scidavis-manual-0.1_2008-02-28.tar.bz2 (NONE -> 1.1) (NEW), scidavis-manual.patch (NONE -> 1.1) (NEW), scidavis-pro.patch (NONE -> 1.1) (NEW), scidavis.spec (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/scidavis/scidavis-manual-0.1_2008-02-28.tar.bz2
<<Binary file>>
================================================================
Index: packages/scidavis/scidavis-manual.patch
diff -u /dev/null packages/scidavis/scidavis-manual.patch:1.1
--- /dev/null Mon Oct 5 15:16:47 2009
+++ packages/scidavis/scidavis-manual.patch Mon Oct 5 15:16:40 2009
@@ -0,0 +1,182 @@
+Index: scidavis/src/ApplicationWindow.h
+===================================================================
+--- scidavis-0.2.3/scidavis/src/ApplicationWindow.h (révision 1180)
++++ scidavis-0.2.3/scidavis/src/ApplicationWindow.h (révision 1181)
+@@ -638,6 +638,7 @@
+ void showHelp();
+ static void showStandAloneHelp();
+ void chooseHelpFolder();
++ QString guessHelpFolder();
+ void showPlotWizard();
+ void showFitPolynomDialog();
+ void showIntegrationDialog();
+@@ -1057,7 +1058,10 @@
+ QAction *actionShowExpDecayDialog, *actionShowTwoExpDecayDialog, *actionShowExpDecay3Dialog;
+ QAction *actionFitExpGrowth, *actionFitSigmoidal, *actionFitGauss, *actionFitLorentz, *actionShowFitDialog;
+ QAction *actionShowAxisDialog, *actionShowTitleDialog;
+- QAction *actionAbout, *actionShowHelp, *actionChooseHelpFolder;
++ QAction *actionAbout, *actionShowHelp;
++#ifdef DYNAMIC_MANUAL_PATH
++ QAction *actionChooseHelpFolder;
++#endif
+ QAction *actionRename, *actionCloseWindow, *actionConvertTable;
+ QAction *actionAddColToTable, *actionDeleteLayer, *actionInterpolate;
+ QAction *actionResizeActiveWindow, *actionHideActiveWindow;
+Index: scidavis/src/ApplicationWindow.cpp
+===================================================================
+--- scidavis-0.2.3/scidavis/src/ApplicationWindow.cpp (révision 1180)
++++ scidavis-0.2.3/scidavis/src/ApplicationWindow.cpp (révision 1181)
+@@ -915,7 +915,9 @@
+ help->setFont(appFont);
+
+ help->addAction(actionShowHelp);
++#ifdef DYNAMIC_MANUAL_PATH
+ help->addAction(actionChooseHelpFolder);
++#endif
+ help->addSeparator();
+ help->addAction(actionHomePage);
+ help->addAction(actionCheckUpdates);
+@@ -4183,42 +4185,27 @@
+ settings.beginGroup("/Paths");
+ workingDir = settings.value("/WorkingDir", qApp->applicationDirPath()).toString();
+
++#ifdef DYNAMIC_MANUAL_PATH
+ #ifdef MANUAL_PATH
+ helpFilePath = settings.value("/HelpFile", MANUAL_PATH "/index.html").toString();
+ #elif defined(DOC_PATH)
+ helpFilePath = settings.value("/HelpFile", DOC_PATH "/manual/index.html").toString();
+-#elif defined(Q_OS_WIN)
+- helpFilePath = settings.value("/HelpFile", qApp->applicationDirPath()+"/manual/index.html").toString();
+ #else
+ QVariant help_file_setting = settings.value("/HelpFile");
+ 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
+- help_dir_suffixes
+- << QString("-") + locale
+- << QString("-") + locale.section('_',0,0)
+- << QString("-") + appLanguage
+- << "-en"
+- << "";
+- foreach (QString suffix, help_dir_suffixes) {
+- help_file_info.setFile(help_dir_base + QString("/manual%1/index.html").arg(suffix));
+- if (help_file_info.exists())
+- break;
+- }
+- // intentionally defaults to /usr/share/doc/scidavis/manual/index.html even if it doesn't exist
+- helpFilePath = help_file_info.absoluteFilePath();
+- }
++ else
++ helpFilePath = guessHelpFolder();
+ #endif
++#else // ifdef DYNAMIC_MANUAL_PATH
++#ifdef MANUAL_PATH
++ helpFilePath = MANUAL_PATH "/index.html";
++#elif defined(DOC_PATH)
++ helpFilePath = DOC_PATH "/manual/index.html";
++#else
++ helpFilePath = guessHelpFolder();
++#endif
++#endif
+
+ #ifdef Q_OS_WIN
+ fitPluginsPath = settings.value("/FitPlugins", "fitPlugins").toString();
+@@ -8237,13 +8224,8 @@
+ tr("Please indicate the location of the help file!")+"<br>"+
+ tr("The manual can be downloaded from the following internet address:")+
+ "<p><a href = http://sourceforge.net/project/showfiles.php?group_id=199120>http://sourceforge.net/project/showfiles.php?group_id=199120</a></p>");
+- QString fn = QFileDialog::getOpenFileName(QDir::currentDirPath(), "*.html", this );
+- if (!fn.isEmpty())
+- {
+- QFileInfo fi(fn);
+- helpFilePath=fi.absFilePath();
+- saveSettings();
+- }
++ chooseHelpFolder();
++ saveSettings();
+ }
+
+ QFileInfo fi(helpFilePath);
+@@ -10721,8 +10703,10 @@
+ actionShowHelp->setShortcut( tr("Ctrl+H") );
+ connect(actionShowHelp, SIGNAL(activated()), this, SLOT(showHelp()));
+
++#ifdef DYNAMIC_MANUAL_PATH
+ actionChooseHelpFolder = new QAction(tr("&Choose Help Folder..."), this);
+ connect(actionChooseHelpFolder, SIGNAL(activated()), this, SLOT(chooseHelpFolder()));
++#endif
+
+ actionRename = new QAction(tr("&Rename Window"), this);
+ connect(actionRename, SIGNAL(activated()), this, SLOT(renameActiveWindow()));
+@@ -11187,7 +11171,10 @@
+ actionShowHelp->setMenuText(tr("&Help"));
+ actionShowHelp->setShortcut(tr("Ctrl+H"));
+
++#ifdef DYNAMIC_MANUAL_PATH
+ actionChooseHelpFolder->setMenuText(tr("&Choose Help Folder..."));
++#endif
++
+ actionRename->setMenuText(tr("&Rename Window"));
+
+ actionCloseWindow->setMenuText(tr("Close &Window"));
+@@ -13695,3 +13682,34 @@
+ result.append(aspect->name());
+ return result;
+ }
++
++QString ApplicationWindow::guessHelpFolder()
++{
++#if defined(Q_OS_WIN)
++ return qApp->applicationDirPath()+"/manual/index.html";
++#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
++ help_dir_suffixes
++ << QString("-") + locale
++ << QString("-") + locale.section('_',0,0)
++ << QString("-") + appLanguage
++ << "-en"
++ << "";
++ foreach (QString suffix, help_dir_suffixes) {
++ help_file_info.setFile(help_dir_base + QString("/manual%1/index.html").arg(suffix));
++ if (help_file_info.exists())
++ break;
++ }
++ // intentionally defaults to /usr/share/doc/scidavis/manual/index.html even if it doesn't exist
++ return help_file_info.absoluteFilePath();
++#endif
++}
+Index: scidavis/scidavis.pro
+===================================================================
+--- scidavis-0.2.3/scidavis/scidavis.pro (révision 1180)
++++ scidavis-0.2.3/scidavis/scidavis.pro (révision 1181)
+@@ -42,6 +42,11 @@
+ ### 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
++### Enables choosing of help folder at runtime, instead of relying on the above path only.
++### The downside is that the help folder will be remembered as a configuration option, so a binary
++### package cannot easily update the path for its users.
++### Dynamic selection of the manual path was the only available option up until SciDAVis 0.2.3.
++DEFINES += DYNAMIC_MANUAL_PATH
+ ### 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: packages/scidavis/scidavis-pro.patch
diff -u /dev/null packages/scidavis/scidavis-pro.patch:1.1
--- /dev/null Mon Oct 5 15:16:47 2009
+++ packages/scidavis/scidavis-pro.patch Mon Oct 5 15:16:40 2009
@@ -0,0 +1,76 @@
+--- scidavis-0.2.3/scidavis/scidavis.pro 2009-07-17 15:02:39.842755567 +0200
++++ scidavis-0.2.3/scidavis/scidavis.pro.new 2009-07-17 15:06:10.504756138 +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
+
+@@ -41,12 +41,12 @@
+ 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.3
+ ### Enables choosing of help folder at runtime, instead of relying on the above path only.
+ ### The downside is that the help folder will be remembered as a configuration option, so a binary
+ ### package cannot easily update the path for its users.
+ ### Dynamic selection of the manual path was the only available option up until SciDAVis 0.2.3.
+-DEFINES += DYNAMIC_MANUAL_PATH
++#DEFINES += DYNAMIC_MANUAL_PATH
+ ### 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.
+@@ -87,34 +87,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: packages/scidavis/scidavis.spec
diff -u /dev/null packages/scidavis/scidavis.spec:1.1
--- /dev/null Mon Oct 5 15:16:47 2009
+++ packages/scidavis/scidavis.spec Mon Oct 5 15:16:40 2009
@@ -0,0 +1,152 @@
+Summary: Scientific Data Analysis and Visualization
+Name: scidavis
+Version: 0.2.3
+Release: 5%{?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.2.3-manual.patch
+Patch1: scidavis-0.2.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
+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
+%patch0 -p1
+%patch1 -p1
+
+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 \
+ %{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/
+
+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 || :
+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}/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
+
+%files manual
+%defattr(-,root,root,-)
+%doc manual/*
+
+%changelog
+* Sun Jul 19 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.3-5
+- Rebuild
+
+* Sun Jul 19 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.3-4
+- Rebuild
+
+* Fri Jul 17 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.3-3
+- Patch for manual path
+
+* Mon Jul 13 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.3-2
+- BZ #510968
+
+* 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
================================================================
More information about the pld-cvs-commit
mailing list