- fix install of helper lib

[packages/avogadro.git] / avogadro.spec

diff --git a/avogadro.spec b/avogadro.spec
index d6634da98be921f6e0779136f9185b7a04c05f39..2e58f0d92a81c0926f6091ef248fae322b4765bc 100644 (file)
--- a/avogadro.spec
+++ b/avogadro.spec
@@ -1,29 +1,33 @@
-
-%define                qtver   4.6.3
-
 Summary:       An advanced molecular editor for chemical purposes
 Name:          avogadro
-Version:       1.0.0
+Version:       1.2.0
 Release:       2
 License:       GPL v2
 Group:         Applications/Editors
-Source0:       http://downloads.sourceforge.net/avogadro/%{name}-%{version}.tar.bz2
-# Source0-md5: 1146e8ca6cafa558a373d32f38680bcf
-# fix build with sip 4.10
+Source0:       http://downloads.sourceforge.net/avogadro/%{name}-%{version}.tar.gz
+# Source0-md5: 3206068fc27bd3b717c568ee72f1e5ec
+Patch0:                %{name}-linguist.patch
+Patch1:                %{name}-cmake.patch
+Patch2:                %{name}-moc-boost.patch
+Patch3:                gcc6.patch
+Patch4:                python-install.patch
 URL:           http://avogadro.openmolecules.net/
-Patch0:                %{name}-sip.patch
-Patch1:                %{name}-linguist.patch
-Patch2:                %{name}-cmake.patch
+BuildRequires: QtNetwork-devel
+BuildRequires: QtOpenGL-devel
 BuildRequires: boost-devel >= 1.35
+BuildRequires: boost-python-devel
 BuildRequires: cmake >= 2.8.0
 BuildRequires: desktop-file-utils
 BuildRequires: docbook-utils
 BuildRequires: eigen >= 1:2.0.12
 BuildRequires: glew-devel >= 1.5.0
-BuildRequires: python-numpy-devel
 BuildRequires: openbabel-devel >= 2.2.2
-BuildRequires: qt4-build >= %{qtver}
-BuildRequires: qt4-qmake >= %{qtver}
+BuildRequires: pkgconfig
+BuildRequires: python-numpy-devel
+BuildRequires: python-sip-devel
+BuildRequires: qt4-build >= 4.8.2-5
+BuildRequires: qt4-linguist
+BuildRequires: qt4-qmake >= 4.8.2-5
 BuildRequires: sip
 Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -46,6 +50,7 @@ Avogadro.
 Summary:       Development files for Avogadro
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
+Requires:      glew-devel
 
 %description devel
 This package contains files to develop applications using Avogadros
@@ -53,9 +58,11 @@ libraries.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
+%patch0 -p0
+%patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 install -d build
@@ -65,17 +72,19 @@ cd build
        -DENABLE_PYTHON=ON \
        -DENABLE_UPDATE_CHECKER=OFF \
        -DCMAKE_BUILD_TYPE=Release \
-       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-       -DLIB_INSTALL_DIR=%{_libdir} \
        ..
 
-%{__make}
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_datadir}/qt4/mkspecs/features
+
 %{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%{__mv} $RPM_BUILD_ROOT{%{_prefix}/lib,%{_libdir}}/libmsym.so
+
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
@@ -84,20 +93,28 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog COPYING
+%doc AUTHORS COPYING
 %attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_bindir}/avopkg
+%attr(755,root,root) %{_bindir}/qube
+%{_libdir}/libmsym.so
 %{_datadir}/%{name}
 %{_pixmapsdir}/%{name}-icon.png
 %{_desktopdir}/%{name}.desktop
+%{_mandir}/man1/avogadro.1*
+%{_mandir}/man1/avopkg.1*
 
 %files devel
 %defattr(644,root,root,755)
 %{_datadir}/lib%{name}
 %{_includedir}/%{name}
-%{_libdir}/*.so
+%{_libdir}/libavogadro.so
+%{_libdir}/libavogadro_OpenQube.so
+%{_datadir}/qt4/mkspecs/features/avogadro.prf
+%{_pkgconfigdir}/avogadro.pc
 
 %files libs
 %defattr(644,root,root,755)
-%{_datadir}/python*/site-packages/Avogadro.so
+%{py_sitedir}/Avogadro.so
 %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/*.so.*