rpms/avogadro/F-12 avogadro-1.0.0-sip410.patch, NONE, 1.1 avogadro.spec, 1.19, 1.20

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	avogadro.spec 
Added Files:
	avogadro-1.0.0-sip410.patch 
Log Message:
- fix build with sip 4.10

avogadro-1.0.0-sip410.patch:
 PythonDeps.cmake |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE avogadro-1.0.0-sip410.patch ---
diff -ur avogadro-1.0.0/cmake/modules/PythonDeps.cmake avogadro-1.0.0-sip410/cmake/modules/PythonDeps.cmake
--- avogadro-1.0.0/cmake/modules/PythonDeps.cmake	2009-10-23 21:06:32.000000000 +0200
+++ avogadro-1.0.0-sip410/cmake/modules/PythonDeps.cmake	2010-02-10 03:03:12.000000000 +0100
@@ -67,6 +67,10 @@
       message(STATUS "using sip version 4.9...")
       add_definitions( -DSIP_4_8 )
     endif (${SIP_VERSION} MATCHES "4.9")
+    if (${SIP_VERSION} MATCHES "4.10")
+      message(STATUS "using sip version 4.10...")
+      add_definitions( -DSIP_4_8 )
+    endif (${SIP_VERSION} MATCHES "4.10")
   else (EXISTS ${PYTHON_INCLUDE_PATH}/sip.h)
     message(STATUS "sip.h header NOT found - Python support disabled")
   #  message(STATUS "debian/ubuntu: install the python-sip4-dev package.")


Index: avogadro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/F-12/avogadro.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- avogadro.spec	10 Feb 2010 01:25:25 -0000	1.19
+++ avogadro.spec	10 Feb 2010 02:28:33 -0000	1.20
@@ -10,6 +10,8 @@ Group:          Applications/Editors
 License:        GPLv2
 URL:            http://avogadro.openmolecules.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# fix build with sip 4.10
+Patch0:         avogadro-1.0.0-sip410.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake >= 2.6.0
@@ -55,6 +57,7 @@ Avogadros libraries.
 
 %prep
 %setup -q
+%patch0 -p1 -b .sip410
 
 
 %build
@@ -110,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Feb 10 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.0.0-3
 - rebuild for sip 4.10
+- fix build with sip 4.10
 
 * Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-2
 - -libs: Requires: sip-api(%%_sip_api_major) >= %%_sip_api (#538124)