rpms/scidavis/devel scidavis-0.1.3-python26.patch, NONE, 1.1 scidavis.spec, 1.5, 1.6

[Eric Tanguy]

Author: tanguy

Update of /cvs/extras/rpms/scidavis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17196

Modified Files:
	scidavis.spec 
Added Files:
	scidavis-0.1.3-python26.patch 
Log Message:


scidavis-0.1.3-python26.patch:

--- NEW FILE scidavis-0.1.3-python26.patch ---
--- scidavis-0.1.3/scidavis/python.pri	2008-02-25 20:32:02.000000000 +0100
+++ scidavis-0.1.3/scidavis/python.pri.new	2009-01-05 17:42:39.000000000 +0100
@@ -15,8 +15,8 @@
   SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
 
   unix {
-    INCLUDEPATH += $$system(python python-includepath.py)
-    LIBS        += $$system(python -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
+    INCLUDEPATH += /usr/include/python2.6
+    LIBS        += -lpython2.6
     LIBS        += -lm
     system(mkdir -p $${SIP_DIR})
     system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/scidavis.sip)


Index: scidavis.spec
===================================================================
RCS file: /cvs/extras/rpms/scidavis/devel/scidavis.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scidavis.spec	1 Dec 2008 05:03:52 -0000	1.5
+++ scidavis.spec	5 Jan 2009 16:48:40 -0000	1.6
@@ -5,6 +5,7 @@
 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.1.3-pro.patch
+Patch1:		scidavis-0.1.3-pyton26.patch
 URL:		http://scidavis.sourceforge.net/
 License:	GPLv2
 Group: 		Applications/Engineering
@@ -29,6 +30,7 @@
 %prep
 %setup -q -a 1
 %patch0 -p1
+%patch1 -p1
 
 sed -i -e 's/x-sciprj/x-sciprj;/' scidavis/scidavis.desktop
 sed -i -e 's/50/100/' scidavis/scidavis.xml