X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=avogadro.spec;h=1f899091829928799546220e116e2ffbc82d9e3a;hb=0beb5c2c994f36ffd4fdd083a2586a0764de4815;hp=0070eb8d02b09bfeb9ee5f7abaefb7a5e4ba0646;hpb=53ea67fcff5b094bf727d30614ad10c37cc592ec;p=packages%2Favogadro.git

diff --git a/avogadro.spec b/avogadro.spec
index 0070eb8..1f89909 100644
--- a/avogadro.spec
+++ b/avogadro.spec
@@ -1,27 +1,35 @@
-
-%define		qtver	4.6.3
-
 Summary:	An advanced molecular editor for chemical purposes
 Name:		avogadro
-Version:	1.0.0
-Release:	0.1
+Version:	1.2.0
+Release:	7
 License:	GPL v2
 Group:		Applications/Editors
-Source0:	http://downloads.sourceforge.net/avogadro/%{name}-%{version}.tar.bz2
-# 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
+Patch5:		avogadro_eigen3.patch
+Patch6:		boost-python.patch
 URL:		http://avogadro.openmolecules.net/
-Patch0:		%{name}-sip.patch
-Patch1:		%{name}-linguist.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:	eigen3
 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)
@@ -44,6 +52,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
@@ -51,8 +60,13 @@ libraries.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
+%patch0 -p0
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 install -d build
@@ -62,17 +76,21 @@ 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
 
+%if "%{_lib}" != "lib"
+%{__mv} $RPM_BUILD_ROOT{%{_prefix}/lib,%{_libdir}}/libmsym.so
+%endif
+
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
@@ -81,20 +99,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
+%attr(755,root,root) %{_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
+%attr(755,root,root) %{_libdir}/libavogadro.so
+%attr(755,root,root) %{_libdir}/libavogadro_OpenQube.so
+%{_datadir}/qt4/mkspecs/features/avogadro.prf
+%{_pkgconfigdir}/avogadro.pc
 
 %files libs
 %defattr(644,root,root,755)
-%{py_sitedir}/Avogadro.so
+%attr(755,root,root) %{py_sitedir}/Avogadro.so
 %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/*.so.*