rpms/qtiplot/F-13 qtiplot-manualpath.patch, NONE, 1.1 qtiplot-manual.patch, 1.1, 1.2 qtiplot.desktop, 1.2, 1.3 qtiplot.spec, 1.24, 1.25 qtiplot.xml, 1.1, 1.2 sources, 1.7, 1.8

[supercyper]

Author: supercyper

Update of /cvs/pkgs/rpms/qtiplot/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3087

Modified Files:
	qtiplot-manual.patch qtiplot.desktop qtiplot.spec qtiplot.xml 
	sources 
Added Files:
	qtiplot-manualpath.patch 
Log Message:
sync with devel


qtiplot-manualpath.patch:
 ApplicationWindow.cpp |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE qtiplot-manualpath.patch ---
--- qtiplot-0.9.7.13.org/qtiplot/src/core/ApplicationWindow.cpp	2010-03-17 15:32:17.000000000 +0800
+++ qtiplot-0.9.7.13/qtiplot/src/core/ApplicationWindow.cpp	2010-03-18 13:02:36.064460415 +0800
@@ -1427,7 +1427,7 @@
 	menuBar()->addMenu(help);
 
 	help->addAction(actionShowHelp);
-	help->addAction(actionChooseHelpFolder);
+//	help->addAction(actionChooseHelpFolder);
 	help->insertSeparator();
 	help->addAction(actionHomePage);
 	help->addAction(actionCheckUpdates);
@@ -5212,7 +5212,7 @@
 	scriptsDirPath = settings.value("/ScriptsDir", appPath).toString();
 	fitModelsPath = settings.value("/FitModelsDir", "").toString();
 	customActionsDirPath = settings.value("/CustomActionsDir", "").toString();
-	helpFilePath = settings.value("/HelpFile", helpFilePath).toString();
+//	helpFilePath = settings.value("/HelpFile", helpFilePath).toString();
 	d_translations_folder = settings.value("/Translations", d_translations_folder).toString();
 	d_python_config_folder = settings.value("/PythonConfigDir", d_python_config_folder).toString();
 	d_latex_compiler_path = settings.value("/LaTeXCompiler", d_latex_compiler_path).toString();
@@ -13504,8 +13504,8 @@
 	actionShowHelp->setShortcut( tr("Ctrl+H") );
 	connect(actionShowHelp, SIGNAL(activated()), this, SLOT(showHelp()));
 
-	actionChooseHelpFolder = new QAction(tr("&Choose Help Folder..."), this);
-	connect(actionChooseHelpFolder, SIGNAL(activated()), this, SLOT(chooseHelpFolder()));
+//	actionChooseHelpFolder = new QAction(tr("&Choose Help Folder..."), this);
+//	connect(actionChooseHelpFolder, SIGNAL(activated()), this, SLOT(chooseHelpFolder()));
 
 	actionRename = new QAction(tr("&Rename Window"), this);
 	connect(actionRename, SIGNAL(activated()), this, SLOT(rename()));
@@ -14335,7 +14335,7 @@
 	actionShowHelp->setMenuText(tr("&Help"));
 	actionShowHelp->setShortcut(tr("Ctrl+H"));
 
-	actionChooseHelpFolder->setMenuText(tr("&Choose Help Folder..."));
+//	actionChooseHelpFolder->setMenuText(tr("&Choose Help Folder..."));
 	actionRename->setMenuText(tr("&Rename Window"));
 
 	actionCloseWindow->setMenuText(tr("Close &Window"));

qtiplot-manual.patch:
 qtiplot-0.9.7.12/manual/docbook-en/index.docbook |    2 +-
 qtiplot-0.9.7.12/manual/qtiplot.dsl              |    2 +-
 qtiplot-0.9.7.12/manual/qtiplot_html.xsl         |    2 +-
 qtiplot-0.9.7.13/manual/Makefile                 |    3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

Index: qtiplot-manual.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/F-13/qtiplot-manual.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qtiplot-manual.patch	11 Feb 2010 02:02:39 -0000	1.1
+++ qtiplot-manual.patch	18 Mar 2010 05:39:27 -0000	1.2
@@ -8,9 +8,15 @@ diff -urP qtiplot-0.9.7.12.org/manual/do
  
    <!ENTITY appname "QtiPlot">
    <!ENTITY kappname "&appname;">
-diff -urP qtiplot-0.9.7.12.org/manual/Makefile qtiplot-0.9.7.12/manual/Makefile
---- qtiplot-0.9.7.12.org/manual/Makefile	2009-10-19 17:01:27.000000000 +0800
-+++ qtiplot-0.9.7.12/manual/Makefile	2010-02-09 22:54:44.128701362 +0800
+diff -auP qtiplot-0.9.7.13/manual/Makefile qtiplot-0.9.7.13/manual/Makefile
+--- qtiplot-0.9.7.13/manual/Makefile	2009-10-19 17:01:27.000000000 +0800
++++ qtiplot-0.9.7.13/manual/Makefile	2010-03-18 10:37:47.288461638 +0800
+@@ -1,4 +1,4 @@
+-html-pdf: web pdf
++html-pdf: web
+ 
+ # we can't name the target "html", since there is already a folder with that name
+ # and so make thinks this target is already up to date
 @@ -7,3 +7,4 @@
  
  pdf:
@@ -38,3 +44,4 @@ diff -urP qtiplot-0.9.7.12.org/manual/qt
  
  	<!-- html.stylesheet
  	The html.stylesheet parameter is either empty, indicating that no 
+


Index: qtiplot.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/F-13/qtiplot.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qtiplot.desktop	29 Jan 2010 08:17:18 -0000	1.2
+++ qtiplot.desktop	18 Mar 2010 05:39:27 -0000	1.3
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=QtiPlot
-GenericName=QtiPlot - Data Analysis and Scientific Plotting
-Exec=qtiplot
+GenericName=Data Analysis and Scientific Plotting Software
+Icon=qtiplot
+Exec=qtiplot %f
 Terminal=false
 Type=Application
-Categories=Education;
-MimeType=application/x-qtiplot-project;application/x-qtiplot-project-compressed;application/x-qtiplot-project-backup;
-Icon=qtiplot
+Categories=Education;Science;DataVisualization;Qt
+MimeType=application/x-qtiplot-project;


Index: qtiplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/F-13/qtiplot.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- qtiplot.spec	17 Feb 2010 16:07:23 -0000	1.24
+++ qtiplot.spec	18 Mar 2010 05:39:27 -0000	1.25
@@ -1,8 +1,33 @@
 Name:		qtiplot
 Summary:	Data Analysis and Scientific Plotting
-Version:	0.9.7.12
+Version:	0.9.7.13
 Release:	1%{?dist}
-BuildRequires:	qt-devel
+URL:		http://soft.proindependent.com/qtiplot.html
+License:	GPLv2+
+Group:		Applications/Engineering
+Source0:	http://download.berlios.de/qtiplot/%{name}-%{version}.tar.bz2
+Source1:	http://soft.proindependent.com/misc/colormaps.tgz
+Source2:	%{name}.desktop
+Source3:	%{name}.xml
+#fix build.conf to use system-wide libs and enable CustomInstall
+Patch0:		qtiplot-buildconf.patch
+#fix manual building
+Patch1:		qtiplot-manual.patch
+#fix build warning of Note.cpp
+Patch2:		qtiplot-nonvoid-return.patch
+#fix installation paths of fitPlugins
+Patch3:		qtiplot-fitPlugins.patch
+#fix installation paths and enable building of translation files
+Patch4:		qtiplot-install-path.patch
+#fix origin.pri to use system-wide liborigin2
+Patch5:		qtiplot-liborigin2.patch
+#fix qtiplot.pro to use system-wide QTeXEngine
+Patch6:		qtiplot-QTeXEngine.patch
+#disable choosing of help folder at runtime
+Patch7:		qtiplot-manualpath.patch
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	qt4-devel
+BuildRequires:	qt-assistant-adp-devel
 BuildRequires:	liborigin2-devel
 BuildRequires:	QTeXEngine-devel
 BuildRequires:	muParser-devel >= 1.32
@@ -25,29 +50,9 @@ BuildRequires:	dblatex
 BuildRequires:	desktop-file-utils
 BuildRequires:	dos2unix
 Requires:	muParser >= 1.32
+Requires:	hicolor-icon-theme
+Requires:	PyQt4
 
-URL:		http://soft.proindependent.com/qtiplot.html
-License:	GPLv2+
-Group:		Applications/Publishing
-Source0:	http://download.berlios.de/qtiplot/%{name}-%{version}.tar.bz2
-Source1:	http://soft.proindependent.com/misc/colormaps.tgz
-Source2:	%{name}.desktop
-Source3:	%{name}.xml
-#fix build.conf to use system-wide libs and enable CustomInstall
-Patch0:		qtiplot-buildconf.patch
-#fix manual building
-Patch1:		qtiplot-manual.patch
-#fix build warning of Note.cpp
-Patch2:		qtiplot-nonvoid-return.patch
-#fix installation paths of fitPlugins
-Patch3:		qtiplot-fitPlugins.patch
-#fix installation paths and enable building of translation files
-Patch4:		qtiplot-install-path.patch
-#fix origin.pri to use system-wide liborigin2
-Patch5:		qtiplot-liborigin2.patch
-#fix qtiplot.pro to use system-wide QTeXEngine
-Patch6:		qtiplot-QTeXEngine.patch
-Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Scientists often need to use data analysis and plotting software.
@@ -75,6 +80,7 @@ The %{name}-doc package contains documen
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 #use system-wide libs of liborigin2 and QTeXEngine
 rm -rf 3rdparty/liborigin 3rdparty/QTeXEngine
@@ -98,9 +104,7 @@ find %{_builddir}/%{name}-%{version} -ty
 cp -p build.conf.example build.conf
 export PATH=%{_qt4_bindir}:$PATH
 %_qt4_qmake LIB=%{_libdir} QTIDOCDIR=%{_docdir}/%{name}-%{version}
-#do not build in parallel - there are race conditions in 
-#qmake-generated makefiles
-make
+make %{?_smp_mflags}
 #fix file encoding files 
 #dos2unix gpl_licence.txt
 sed -i 's/\r//' gpl_licence.txt
@@ -112,12 +116,15 @@ dos2unix manual/html/qtiplot*
 %install
 rm -rf %{buildroot}
 make INSTALL="install -p" INSTALL_ROOT=%{buildroot} install
+#fix wrong manual path(important!!!)
+mv %{buildroot}%{_docdir}/%{name}-%{version}/manual/html/* %{buildroot}%{_docdir}/%{name}-%{version}/manual
+rmdir %{buildroot}%{_docdir}/%{name}-%{version}/manual/html
 #remove local copy qwt
 rm -rf %{buildroot}%{_prefix}/local
 #remove local copy qwtplot3d
 rm -rf %{buildroot}%{_builddir}
-desktop-file-install --vendor="fedora" \
-			--dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
+desktop-file-install --vendor="" \
+	--dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
 mkdir -p %{buildroot}%{_datadir}/%{name}
 tar -xf %{SOURCE1} -C %{buildroot}%{_datadir}/%{name}
 
@@ -125,50 +132,59 @@ tar -xf %{SOURCE1} -C %{buildroot}%{_dat
 find %{buildroot}%{_libdir}/%{name} -type l -exec rm {} \;
 
 #for the icon
-mkdir -p %{buildroot}%{_datadir}/pixmaps
-install -m 0644 -p qtiplot_logo.png %{buildroot}%{_datadir}/pixmaps/qtiplot.png
-
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes
+install -cpm 0644 qtiplot_logo.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+install -cpm 0644 %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png \
+	%{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-qtiplot-project.png
 #add mime-info
 mkdir -p %{buildroot}%{_datadir}/mime/packages
-install -m 0644 -p %{SOURCE3} %{buildroot}%{_datadir}/mime/packages/%{name}.xml
+install -cpm 0644 %{SOURCE3} %{buildroot}%{_datadir}/mime/packages/%{name}.xml
 
 %post
-umask 022
 update-mime-database %{_datadir}/mime &> /dev/null || :
 update-desktop-database &> /dev/null ||:
-/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-umask 022
 update-mime-database %{_datadir}/mime &> /dev/null || :
 update-desktop-database &> /dev/null ||:
-/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{name}
-%dir %{_libdir}/%{name}
 %dir %{_docdir}/%{name}-%{version}
-%{_libdir}/%{name}/*
-%{_datadir}/%{name}/*
+%{_libdir}/%{name}
+%{_datadir}/%{name}
 %{_docdir}/%{name}-%{version}/README.html
 %{_docdir}/%{name}-%{version}/gpl_licence.txt
 %{_bindir}/%{name}
 %{_datadir}/applications/*
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/mimetypes/*
+%{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/mime/packages/*
 %{_mandir}/man1/%{name}.1*
 
 %files doc
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}/manual
-%{_docdir}/%{name}-%{version}/manual/*
+%{_docdir}/%{name}-%{version}/manual
 
 
 %changelog
+* Thu Mar 18 2010 Chen Lei <supercyper at 163.com> - 0.9.7.13-1
+- upstream to 0.9.7.13
+- remove ldconfig in scripts
+- add mimetype icons
+
 * Tue Feb 09 2010 Chen Lei <supercyper at 163.com> - 0.9.7.12-1
 - upstream to 0.9.7.12
 - rename all patches


Index: qtiplot.xml
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/F-13/qtiplot.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qtiplot.xml	29 Jan 2010 05:04:04 -0000	1.1
+++ qtiplot.xml	18 Mar 2010 05:39:27 -0000	1.2
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-qtiplot-project">
-    <sub-class-of type="text/plain"/>
-    <comment>QtiPlot project file</comment>
-    <glob pattern="*.qti" />
-  </mime-type>
-  <mime-type type="application/x-qtiplot-project-compressed">
-    <comment>Compressed QtiPlot project file</comment>
-    <glob pattern="*.qti.gz" />
-  </mime-type>
-  <mime-type type="application/x-qtiplot-project-backup">
-    <sub-class-of type="text/plain"/>
-    <comment>QtiPlot project file backup</comment>
-    <glob pattern="*.qti~" />
-  </mime-type>
+	<mime-type type="application/x-qtiplot-project">
+		<comment>QtiPlot project file</comment>
+		<magic priority="100">
+                        <match type="string" value="QtiPlot" offset="0"/>
+                </magic>
+		<glob pattern="*.qti" />
+		<glob pattern="*.qti.gz" />
+		<glob pattern="*.qti~" />
+	</mime-type>
 </mime-info>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/F-13/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	9 Feb 2010 14:34:09 -0000	1.7
+++ sources	18 Mar 2010 05:39:27 -0000	1.8
@@ -1,2 +1,2 @@
 14e213a6fbbcce5824340768be528361  colormaps.tgz
-2620bf8a520967d2a58d5f290da745de  qtiplot-0.9.7.12.tar.bz2
+cca071f8160058e5b535776c4e7bede5  qtiplot-0.9.7.13.tar.bz2