rpms/scidavis/F-10 scidavis-0.2.3-sip49.patch, NONE, 1.1 scidavis.spec, 1.13, 1.14

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	scidavis.spec 
Added Files:
	scidavis-0.2.3-sip49.patch 
Log Message:
Sync from devel:

* Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.3-11
- Requires: sip-api(%%_sip_api_major) >= %%_sip_api (#538121)

* Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.3-10
- optimize scriptlets

* Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.3-9
- hackish buildfix for sip-devel >= 4.9 

* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

scidavis-0.2.3-sip49.patch:
 python.pri |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE scidavis-0.2.3-sip49.patch ---
diff -up scidavis-0.2.3/scidavis/python.pri.sip49 scidavis-0.2.3/scidavis/python.pri
--- scidavis-0.2.3/scidavis/python.pri.sip49	2009-05-30 04:35:08.000000000 -0500
+++ scidavis-0.2.3/scidavis/python.pri	2009-11-16 12:37:34.522206345 -0600
@@ -53,7 +53,10 @@
              $${SIP_DIR}/sipscidavisPythonScript.cpp\
              $${SIP_DIR}/sipscidavisPythonScripting.cpp\
              $${SIP_DIR}/sipscidavisFolder.cpp\
-             $${SIP_DIR}/sipscidavisQList.cpp\
+             $${SIP_DIR}/sipscidavisQList0100QDateTime.cpp \
+             $${SIP_DIR}/sipscidavisQList0101Folder.cpp \
+             $${SIP_DIR}/sipscidavisQList0101AbstractAspect.cpp \ 
+             $${SIP_DIR}/sipscidavisQList0101MyWidget.cpp \
              $${SIP_DIR}/sipscidavisFit.cpp \
              $${SIP_DIR}/sipscidavisExponentialFit.cpp \
              $${SIP_DIR}/sipscidavisTwoExpFit.cpp \


Index: scidavis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scidavis/F-10/scidavis.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- scidavis.spec	22 Jul 2009 18:24:05 -0000	1.13
+++ scidavis.spec	17 Nov 2009 20:56:59 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:	Scientific Data Analysis and Visualization
 Name:		scidavis
 Version:	0.2.3
-Release: 	7%{?dist}
+Release: 	11%{?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
@@ -11,9 +11,14 @@ 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
+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
+
 %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
@@ -33,6 +38,7 @@ This package contains the manual for Sci
 %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
@@ -67,14 +73,18 @@ mv %{buildroot}%{_datadir}/icons/hicolor
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
+
+%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 || :
+fi
 
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
+%posttrans
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
@@ -104,6 +114,18 @@ rm -rf %{buildroot}
 %doc manual/*
 
 %changelog
+* Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.3-11
+- Requires: sip-api(%%_sip_api_major) >= %%_sip_api (#538121)
+
+* Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.3-10
+- optimize scriptlets
+
+* Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.3-9
+- hackish buildfix for sip-devel >= 4.9 
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 22 2009 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.2.3-7
 - Requires scidavis for scidavis-manual
 - Change categories in scidavis.desktop