rpms/avogadro/devel avogadro-1.0.0-sip410.patch, NONE, 1.1 avogadro.spec, 1.23, 1.24

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/avogadro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30334/devel

Modified Files:
	avogadro.spec 
Added Files:
	avogadro-1.0.0-sip410.patch 
Log Message:
* Wed Feb 10 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.0.0-6
- reenable plugin builds and libs subpackage
- fix their 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/devel/avogadro.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- avogadro.spec	10 Jan 2010 13:34:43 -0000	1.23
+++ avogadro.spec	10 Feb 2010 02:05:05 -0000	1.24
@@ -1,24 +1,31 @@
 %{!?python_sitelib:%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           avogadro
 Version:        1.0.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        An advanced molecular editor for chemical purposes
 
 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)
 
-Obsoletes:      %{name}-libs
-
 BuildRequires:  cmake >= 2.6.0
 BuildRequires:  qt4-devel >= 4.5.1
 BuildRequires:  eigen2-devel >= 2.0.3
 BuildRequires:  openbabel-devel >= 2.2.2
+BuildRequires:  boost-devel >= 1.35
+BuildRequires:  glew-devel >= 1.5.0
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-utils
+BuildRequires:  sip-devel
+BuildRequires:  numpy
+
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
 An advanced molecular editor designed for 
@@ -28,11 +35,20 @@ and related areas, which offers flexible
 a powerful plugin architecture.
 
 
+%package libs
+Summary:        Shared libraries for Avogadro
+Group:          System Environment/Libraries
+%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
+
+%description libs
+This package contains the shared libraries for the
+molecular editor Avogadro.
+
+
 %package devel
 Summary:        Development files for Avogadro
 Group:          Development/Libraries
-
-Requires: %{name} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release} 
 
 %description devel
 This package contains files to develop applications using 
@@ -41,12 +57,13 @@ Avogadros libraries.
 
 %prep
 %setup -q
+%patch0 -p1 -b .sip410
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} %{?BUILD_TESTS} -DENABLE_UPDATE_CHECKER=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_libdir} ..
+%{cmake} %{?BUILD_TESTS} -DENABLE_GLSL=ON -DENABLE_PYTHON=ON -DENABLE_UPDATE_CHECKER=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_libdir} ..
 popd
 make %{?_smp_mflags} -C %{_target_platform}
 
@@ -61,9 +78,9 @@ desktop-file-install --vendor=""        
   $RPM_BUILD_ROOT%{_datadir}/applications/avogadro.desktop
 
 
-%post -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 
 %clean
@@ -77,17 +94,27 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}-icon.png
 %{_datadir}/applications/%{name}.desktop
-%{_libdir}/%{name}
-%{_libdir}/*.so.*
 
 
 %files devel
 %defattr(-,root,root,-)
+%{_datadir}/lib%{name}
 %{_includedir}/%{name}
 %{_libdir}/*.so
 
 
+%files libs
+%defattr(-,root,root,-)
+%{python_sitelib}/Avogadro.so
+%{_libdir}/%{name}
+%{_libdir}/*.so.*
+
+
 %changelog
+* Wed Feb 10 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.0.0-6
+- reenable plugin builds and libs subpackage
+- fix their build with sip 4.10
+
 * Fri Jan 08 2010 Sebastian Dziallas <sebastian at when.com> - 1.0.0-5
 - disable plugin builds and libs subpackage