rpms/qtiplot/F-12 qtiplot.spec,1.15,1.16

frankb frankb at fedoraproject.org
Sat Feb 6 17:01:53 UTC 2010


Author: frankb

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

Modified Files:
	qtiplot.spec 
Log Message:
take the correct spec file



Index: qtiplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtiplot/F-12/qtiplot.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- qtiplot.spec	27 Jul 2009 02:37:32 -0000	1.15
+++ qtiplot.spec	6 Feb 2010 17:01:53 -0000	1.16
@@ -1,41 +1,56 @@
 Name:		qtiplot
 Summary:	Data Analysis and Scientific Plotting
-Version:	0.9.7.4
-Release:	10%{?dist}
-#>4.2 is needed for qtiplot
-BuildRequires:	qt4-devel >= 4.2 
-BuildRequires:	qwt-devel
-BuildRequires:	qwtplot3d-qt4-devel
-BuildRequires:	gsl-devel
+Version:	0.9.7.11
+Release:	4%{?dist}
+BuildRequires:	qt4-devel
+BuildRequires:	liborigin2-devel
+BuildRequires:	QTeXEngine-devel
 BuildRequires:	muParser-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	dos2unix
-%if 0%{?rhel} > 4
-%define withPython 0
-%define epel5mode 1
-%else
-%define withPython 1
-%define epel5mode 0
-%endif
-
-%if %{withPython}
+BuildRequires:	gsl-devel
+BuildRequires:	boost-devel
+#use local copy till upstream catches up
+#BuildRequires:	qwt-devel
+#BuildRequires:	qwtplot3d-qt4-devel
+#BuildRequires:	libxls-devel
+BuildRequires:	quazip-devel
+BuildRequires:	libpng-devel
 #python-devel comes with sip-devel
 #BuildRequires:	python-devel
 BuildRequires:	PyQt4-devel 
 #sip-devel comes with PyQt4-devel
 #BuildRequires:	sip-devel
-%endif
+BuildRequires:	docbook-utils
+BuildRequires:	docbook-style-xsl
+BuildRequires:	dblatex
+BuildRequires:	desktop-file-utils
+BuildRequires:	dos2unix
 
 URL:		http://soft.proindependent.com/qtiplot.html
 License:	GPLv2+
 Group:		Applications/Publishing
-Source0:	http://soft.proindependent.com/src/%{name}-%{version}.tar.bz2
-#Source0:	http://soft.proindependent.com/src/%{name}-0.9.7.4.tar.bz2
+Source0:	http://download.berlios.de/qtiplot/%{name}-%{version}.tar.bz2
 Source1:	http://soft.proindependent.com/misc/colormaps.tgz
 Source2:	%{name}.desktop
-Patch0:		qtiplot-path.patch
-#Patch1:		qtiplot-includes.patch
+Source3:	%{name}.xml
+#fix build.conf to use system-wide libs and enable CustomInstall
+Patch0:		0-build.conf.patch
+#fix manual building
+Patch1:		1-manual.patch
+#fix build warning of Note.cpp
+Patch2:		2-nonvoid-return.patch
+#fix installation paths of fitPlugins
+Patch3:		3-fitPlugins.patch
+#fix installation paths and enable building of translation files
+Patch4:		4-install-path.patch
+#fix origin.pri to use system-wide liborigin2
+Patch5:		5-liborigin2.patch
+#fix qtiplot.pro to use system-wide QTeXEngine
+Patch6:		6-QTeXEngine.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires(post):		shared-mime-info
+Requires(post):		desktop-file-utils 
+Requires(postun):	shared-mime-info
+Requires(postun):	desktop-file-utils
 
 %description
 Scientists often need to use data analysis and plotting software.
@@ -44,164 +59,129 @@ called Origin, which is not free, of cou
 project is to develop a free (open source), platform independent
 alternative to Origin.
 
+%package doc
+
+Summary:		Documentation for %{name}
+Group:			Documentation
+Requires:		%{name} = %{version}-%{release}
+BuildArch:		noarch 
+
+%description doc
+The %{name}-doc package contains documentation for the %{name}.
+
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-%if %{withPython}
-echo "Build with Python"
-%else
-echo "Build without Python"
-sed -i "s/SCRIPTING_LANGS\ =+\ Python/#/1" qtiplot/qtiplot.pro
-%endif
-sed -i "s\MUPARSERINC\ %{_includedir}/\1" qtiplot/qtiplot.pro
-sed -i "s\QWTPLOT3DINC\ %{_includedir}/qwtplot3d\1" qtiplot/qtiplot.pro
-sed -i "s\QWTINC\ %{_includedir}/qwt\1" qtiplot/qtiplot.pro
-#sed -i "s\LIBORGININC\ %{_includedir}/liborigin\1" qtiplot/qtiplot.pro
-sed -i "s\GSLINC\ %{_includedir}/gls\1" qtiplot/qtiplot.pro
-sed -i "s\ZLIBINC\ %{_includedir}/\1" qtiplot/qtiplot.pro
-sed -i "s\DOCDIR\ $RPM_BUILD_ROOT/%{_docdir}/%{name}/\1" qtiplot/qtiplot.pro
-sed -i "s\BINDIR\ $RPM_BUILD_ROOT/%{_bindir}\1" qtiplot/qtiplot.pro
-sed -i "s\TARGETPATH\ $RPM_BUILD_ROOT/%{_libdir}/%{name}/\1" fitPlugins/fitRational1/fitRational1.pro 
-sed -i "s\TARGETPATH\ $RPM_BUILD_ROOT/%{_libdir}/%{name}/\1" fitPlugins/fitRational0/fitRational0.pro
-#fix default path for the Plug-Ins
-sed -i "s\/usr/lib/qtiplot/plugins\%{_libdir}/%{name}\g" qtiplot/src/core/ApplicationWindow.cpp
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+
+#use system-wide libs of liborigin2 and QTeXEngine
+rm -rf 3rdparty/liborigin 3rdparty/QTeXEngine
+#fix docbook to adapt different versions of fedora
+sed -i "s/VER-REL/`rpm -q docbook-dtds|sed "s/^[^0-9]*//;s/\.noarch//;\
+s/\./\\\./g"`/" manual/docbook-en/index.docbook 
+#fix default path for fitPlugins
+sed -i "s\/usr/lib/qtiplot/plugins\%{_libdir}/%{name}/plugins\g" \
+	qtiplot/src/core/ApplicationWindow.cpp
 #fix source files for debug package
-dos2unix qtiplot/src/analysis/*.h
-dos2unix qtiplot/src/analysis/dialogs/*.h
-dos2unix qtiplot/src/core/*.h
-dos2unix qtiplot/src/matrix/*
-dos2unix qtiplot/src/origin/*.h
-dos2unix qtiplot/src/plot2D/*.h
-dos2unix qtiplot/src/plot2D/dialogs/*.h
-dos2unix qtiplot/src/plot3D/*.h
-dos2unix qtiplot/src/scripting/*.h
-dos2unix qtiplot/src/table/*.h
-chmod 0644 qtiplot/src/*
-chmod 0644 fitPlugins/fitRational0/*
-chmod 0644 fitPlugins/fitRational1/*
-chmod 0644 3rdparty/zlib123/*.c
-chmod 0644 3rdparty/zlib123/include/*
-chmod 0644 3rdparty/liborigin/*
-
+find %{_builddir}/%{name}-%{version} -name '*.h' -exec dos2unix {} \;
+find %{_builddir}/%{name}-%{version} -name '*.hh' -exec dos2unix {} \;
+find %{_builddir}/%{name}-%{version} -name '*.hpp' -exec dos2unix {} \;
+find %{_builddir}/%{name}-%{version} -name '*.c' -exec dos2unix {} \;
+find %{_builddir}/%{name}-%{version} -name '*.cc' -exec dos2unix {} \;
+find %{_builddir}/%{name}-%{version} -name '*.cpp' -exec dos2unix {} \;
+find %{_builddir}/%{name}-%{version} -type d -exec chmod 0755 {} \;
+find %{_builddir}/%{name}-%{version} -type f -exec chmod 0644 {} \;
 
 %build
-%if %{epel5mode}
-%{_libdir}/qt4/bin/qmake
-%else
-qmake-qt4
-%endif
-make %{?_smp_mflags}
-lrelease-qt4 qtiplot/translations/*.ts
+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
+#fix file encoding files 
+#dos2unix gpl_licence.txt
+sed -i 's/\r//' gpl_licence.txt
+dos2unix qtiplot/qti_wordlist.txt
+dos2unix qtiplot/qtiplotrc.py
+dos2unix qtiplot/qtiUtil.py
+dos2unix manual/html/qtiplot*
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf %{buildroot}
+make INSTALL="install -p" INSTALL_ROOT=%{buildroot} install
+#remove local copy qwt
+rm -rf %{buildroot}%{_prefix}/local
 desktop-file-install --vendor="fedora" \
-			--dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2}
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/qt4/translations
-cp -p qtiplot/translations/*.qm $RPM_BUILD_ROOT/%{_datadir}/qt4/translations/
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
-tar -xf %{SOURCE1} -C $RPM_BUILD_ROOT/%{_datadir}/%{name}
-#fix permission of the doc files
-chmod 0644 $RPM_BUILD_ROOT/%{_docdir}/%{name}/README.html
-chmod 0644 $RPM_BUILD_ROOT/%{_docdir}/%{name}/gpl_licence.txt
-#fix file encoding files
-dos2unix $RPM_BUILD_ROOT/%{_docdir}/%{name}/gpl_licence.txt 
+			--dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
+mkdir -p %{buildroot}%{_datadir}/%{name}
+tar -xf %{SOURCE1} -C %{buildroot}%{_datadir}/%{name}
 
 #remove symlinks
-rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/libfitRational0.so
-rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/libfitRational0.so.1
-rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/libfitRational0.so.1.0
-rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/libfitRational1.so
-rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/libfitRational1.so.1
-rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/libfitRational1.so.1.0
+find %{buildroot}%{_libdir}/%{name} -type l -exec rm {} \;
 
 #for the icon
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
-install -m 0644 -p qtiplot_logo.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/qtiplot_logo.png
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+install -m 0644 -p qtiplot_logo.png %{buildroot}%{_datadir}/pixmaps/qtiplot.png
 
-post -p /sbin/ldconfig
-postun -p /sbin/ldconfig
+#add mime-info
+mkdir -p %{buildroot}%{_datadir}/mime/packages
+install -m 0644 -p %{SOURCE3} %{buildroot}%{_datadir}/mime/packages/%{name}.xml
+
+%post
+umask 022
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null ||:
+/sbin/ldconfig
+
+%postun
+umask 022
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null ||:
+/sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
-%{_docdir}/%{name}
-%{_libdir}/%{name}
-%{_bindir}/qtiplot
+%defattr(-,root,root,-)
+%dir %{_datadir}/%{name}
+%dir %{_libdir}/%{name}
+%dir %{_docdir}/%{name}-%{version}
+%{_libdir}/%{name}/*
+%{_datadir}/%{name}/*
+%{_docdir}/%{name}-%{version}/README.html
+%{_docdir}/%{name}-%{version}/gpl_licence.txt
+%{_bindir}/%{name}
 %{_datadir}/applications/*
-%{_datadir}/qt4/translations/*
 %{_datadir}/pixmaps/*
-%{_datadir}/%{name}
+%{_datadir}/mime/packages/*
+%{_mandir}/man1/%{name}.1*
+
+%files doc
+%defattr(-,root,root,-)
+%dir %{_docdir}/%{name}-%{version}/manual
+%{_docdir}/%{name}-%{version}/manual/*
 
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7.4-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Feb  3 2010 Chen Lei <supercyper at 163.com> - 0.9.7.11-4
+ - enable importing of ODF spreadsheet files
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7.4-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Fri Jan 29 2010 Chen Lei <supercyper at 163.com> - 0.9.7.11-3
+ - fixed desktop mime field
 
-* Sat Jan 10 2009 Frank Büttner <frank-buettner at gmx.net> - 0.9.7.4-8
- - fix dos2unix
-
-* Sat Jan 10 2009 Frank Büttner <frank-buettner at gmx.net> - 0.9.7.4-7
- - fix dos2unix
+* Fri Jan 29 2010 Chen Lei <supercyper at 163.com> - 0.9.7.11-2
+ - add mime-info
 
-* Sat Jan 10 2009 Frank Büttner <frank-buettner at gmx.net> - 0.9.7.4-6
- - fix dos2unix
+* Sat Jan 23 2010 Chen Lei <supercyper at 163.com> - 0.9.7.11-1
+ - upstream to 0.9.7.11
 
-* Sat Jan 10 2009 Frank Büttner <frank-buettner at gmx.net> - 0.9.7.4-5
+* Sat Jan 10 2009 Frank Büttner <frank-buettner at gmx.net> - 0.9.7.4-8
  - fix dos2unix
 
-* Sat Jan 10 2009 Frank Büttner <frank-buettner at gmx.net> - 0.9.7.4-4
- - fix sed
-
-* Sat Jan 10 2009 Frank Büttner <frank-buettner at gmx.net> - 0.9.7.4-3
- - fix the patch files
-
-* Sat Jan 10 2009 Frank Büttner <frank-buettner at gmx.net> - 0.9.7.4-2
- - dummy for koji
-
-* Sat Jan 10 2009 Frank Büttner <frank-buettner at gmx.net> - 0.9.7.4-1
-  - update to 0.9.7.4
-
-* Thu Jan 23 2008 Frank Büttner <frank-buettner at gmx.net> - 0.9.3rc2-1
- - update to 0.9.3rc2
-
-* Sat Nov 17 2007 Frank Büttner <frank-buettner at gmx.net> - 0.9.1-1
- - update to 0.9.1
- - disable Python support on EPEL because Qt Python support is broken
-
-* Sat Oct 20 2007 Frank Büttner <frank-buettner at gmx.net> - 0.9-8
- - fix encoding of the source files for debug package
- - fix permission of the source files for debug package
- - add icon for the menue entry
-* Sun Oct 06 2007 Frank Büttner <frank-buettner at gmx.net> - 0.9-7
- - enable build for epel
- - push the plug-ins to an extra directory
-* Sun Oct 06 2007 Frank Büttner <frank-buettner at gmx.net> - 0.9-6
- - enable parllel build
- - set vendor_id at the desktop file 
- - remove redundant BuildRequires
- - clean build root before call install
- - fix permission of the doc files
- - fix file encoding of the licence file
- - fix spec file(use only tabs as seperator)
- - fix patch to link the libfitRational1 correct
- - remove unneeded symlinks
- - remove unneeded ldconfig
-* Sat Oct 06 2007 Frank Büttner <frank-buettner at gmx.net> - 0.9-5
- - adapt it to the qwtplot3d package
- - fix the path patch for 0.9 final
-* Sun Sep 30 2007 Frank Büttner <frank-buettner at gmx.net> - 0.9-4
- - update to the final 0.9
- - enable Python support
- - fix spec file
-* Sat Jun 09 2007 Frank Büttner <frank-buettner at gmx.net> - 0.9_rc1-3%{?dist}
- - split to doc part to an extra package
-* Mon May 21 2007 Frank Büttner <frank-buettner at gmx.net> - 0.9_rc1-2%{?dist}
- - split doc package as noarch rpm
-* Wed May 16 2007 Frank Büttner <frank-buettner at gmx.net> - 0.9_rc1-1%{?dist}
- - start



More information about the scm-commits mailing list