rpms/scidavis/F-12 .cvsignore, 1.7, 1.8 scidavis.spec, 1.27, 1.28 sources, 1.7, 1.8 scidavis-0.2.3-manual.patch, 1.1, NONE scidavis-0.2.3-pro.patch, 1.1, NONE scidavis-0.2.3-sip49.patch, 1.1, NONE

[supercyper]

Author: supercyper

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

Modified Files:
	.cvsignore scidavis.spec sources 
Removed Files:
	scidavis-0.2.3-manual.patch scidavis-0.2.3-pro.patch 
	scidavis-0.2.3-sip49.patch 
Log Message:
sync with devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scidavis/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	5 Jul 2009 18:17:44 -0000	1.7
+++ .cvsignore	14 Mar 2010 06:23:07 -0000	1.8
@@ -1,2 +1,4 @@
 scidavis-0.2.3.tar.bz2
 scidavis-manual-0.1_2008-02-28.tar.bz2
+scidavis-0.2.4.tar.bz2
+scidavis-manual-0.2_2010-03-13.tar.bz2


Index: scidavis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scidavis/F-12/scidavis.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- scidavis.spec	24 Feb 2010 02:29:21 -0000	1.27
+++ scidavis.spec	14 Mar 2010 06:23:08 -0000	1.28
@@ -1,23 +1,38 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
-Version:	0.2.3
-Release: 	14%{?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
+Version:	0.2.4
+Release:	1%{?dist}
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+#  svn export -r 1293 https://scidavis.svn.sourceforge.net/svnroot/manual/0.2/ manual
+#  tar -cjvf scidavis-manual-0.2_`date --iso`.tar.bz2 manual
+Source1:	%{name}-manual-0.2_2010-03-13.tar.bz2
+Patch0:		%{name}-pro.patch
+#fix installation paths of fitPlugins
+Patch1:		%{name}-fitPlugins.patch
+#fix manual building
+Patch2:		%{name}-manual.patch
 URL:		http://scidavis.sourceforge.net/
-License:	GPLv2
-Group: 		Applications/Engineering
+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 PyQt4-devel dos2unix
-Requires: hicolor-icon-theme
-
-BuildRequires: sip-devel >= 4.9.1
-%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
-
-Patch2: scidavis-0.2.3-sip49.patch
+BuildRequires:	gsl-devel
+BuildRequires:	muParser-devel
+BuildRequires:	qt4-devel
+BuildRequires:	qt-assistant-adp-devel
+BuildRequires:	qwt-devel
+BuildRequires:	qwtplot3d-qt4-devel
+#python-devel comes with sip-devel
+#BuildRequires:	python-devel
+BuildRequires:	PyQt4-devel 
+#sip-devel comes with PyQt4-devel
+#BuildRequires:	sip-devel
+BuildRequires:	docbook-utils
+BuildRequires:	docbook-style-xsl
+BuildRequires:	dblatex
+BuildRequires:	desktop-file-utils
+Requires:	PyQt4
+Requires:	hicolor-icon-theme
+Requires:	kde-filesystem
 
 %description
 SciDAVis is a user-friendly data analysis and visualization program primarily
@@ -25,97 +40,115 @@ aimed at high-quality plotting of scient
 intuitive, easy-to-use graphical user interface with powerful features such
 as Python scriptability.
 
-%package manual
-Summary:	Additional manual for SciDAVis
+%package doc
+Summary:	Documentation for SciDAVis
 Group:		Documentation
-Requires: scidavis = %{version}-%{release}
-
+Requires:	%{name} = %{version}-%{release}
+BuildArch:	noarch 
+Provides:	%{name}-manual = %{version}-%{release}
+Obsoletes:	%{name}-manual < 0.2.4
 
-%description manual
-This package contains the manual for SciDAVis.
+%description doc
+The %{name}-doc package contains documentation for the %{name}.
 
 %prep
 %setup -q -a 1
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1 -b .sip49
-
-sed -i -e 's/50/100/' scidavis/scidavis.xml
-sed -i -e 's/Science;Physics;Math;Graphics;/Education;Science;DataVisualization;/' scidavis/scidavis.desktop
-
-touch manual/scidavis.adp
+%patch2 -p0
+#fix spurious-executable-perm
+find . -type f -exec chmod 0644 {} \;
+#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/%{name}/plugins\%{_libdir}/%{name}/plugins\g" \
+	%{name}/src/ApplicationWindow.cpp
+sed -i -e 's/Science;Physics;Math;Graphics;/Education;Science;DataVisualization;/' %{name}/%{name}.desktop
 
 %build
-cd scidavis
-qmake-qt4 scidavis.pro
+export PATH=%{_qt4_bindir}:$PATH
+%_qt4_qmake LIB=%{_libdir} SCIDOCDIR=%{_docdir}/%{name}-%{version}
 make %{?_smp_mflags}
+pushd manual
+make ||:
+popd
+pushd man
+docbook2man manpage.sgml
+echo ".so man1/SciDAVis.1" > %{name}.1
+popd
 
 %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
-
+#fix wrong manual path(important!!!)
+mv %{buildroot}%{_docdir}/%{name}-%{version}/html %{buildroot}%{_docdir}/%{name}-%{version}/manual
+install -d %{buildroot}%{_mandir}/man1
+install -D -pm 644  man/*.1 %{buildroot}%{_mandir}/man1/
 install -d %{buildroot}%{_datadir}/%{name}/translations
-install -D -pm 644 translations/*.qm %{buildroot}%{_datadir}/%{name}/translations/
+install -D -pm 644 %{name}/translations/*.qm %{buildroot}%{_datadir}/%{name}/translations/
+#remove symlinks
+find %{buildroot}%{_libdir}/%{name} -type l -exec rm {} \;
 
+desktop-file-install --vendor "" \
+	--dir %{buildroot}%{_datadir}/applications \
+	%{buildroot}/%{_datadir}/applications/%{name}.desktop
+#add mime-type icons
 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
+install -cpm 644 %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png \
+	%{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-sciprj.png
+install -cpm 644 %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png \
+	%{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/application-x-sciprj.png
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %postun
-if [ $1 -eq 0 ] ; then
-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 || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 %posttrans
-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 || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/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
+%exclude %{_sysconfdir}/*.pyo
+%exclude %{_sysconfdir}/*.pyc
+%exclude %{_docdir}/%{name}-%{version}/manual
+%config %{_sysconfdir}/*.py
+%{_bindir}/*
+%{_libdir}/%{name}
+%{_datadir}/%{name}
+%{_docdir}/%{name}-%{version}
+%{_mandir}/man1/*.1*
 %{_datadir}/applications/*
-%{_datadir}/mime/packages/scidavis.xml
+%{_datadir}/mime/packages/*.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
+%files doc
 %defattr(-,root,root,-)
-%doc manual/*
+%{_docdir}/%{name}-%{version}/manual
 
 %changelog
-* Wed Feb 24 2010 Chen Lei <supercyper at 163.com> - 0.2.3-14 
-- rebuild against new muParser
+* Sat Mar 13 2010 Chen Lei <supercyper at 163.com> - 0.2.4-1 
+- Update to 0.2.4
+
+* Sat Mar 13 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.3-14
+- BR qt-assistant-adp-devel
 
 * Thu Jan 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.2.3-13 
 - rebuild (sip)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scidavis/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	5 Jul 2009 18:17:44 -0000	1.7
+++ sources	14 Mar 2010 06:23:08 -0000	1.8
@@ -1,2 +1,2 @@
-30d3f7c4e3702cec0bce8e34ea6112e7  scidavis-0.2.3.tar.bz2
-3527477cb0685da3ddfb0ee398ba6303  scidavis-manual-0.1_2008-02-28.tar.bz2
+c5650475c5e0b22f9ee5dc49630a0e89  scidavis-0.2.4.tar.bz2
+3179f5424dacd01146ef3368b0007429  scidavis-manual-0.2_2010-03-13.tar.bz2


--- scidavis-0.2.3-manual.patch DELETED ---


--- scidavis-0.2.3-pro.patch DELETED ---


--- scidavis-0.2.3-sip49.patch DELETED ---