- fix install of helper lib

[packages/avogadro.git] / avogadro.spec

diff --git a/avogadro.spec b/avogadro.spec
index 4fbb6997514e255424f8480bf34763da354b76eb..2e58f0d92a81c0926f6091ef248fae322b4765bc 100644 (file)
--- a/avogadro.spec
+++ b/avogadro.spec
@@ -1,15 +1,15 @@
 Summary:       An advanced molecular editor for chemical purposes
 Name:          avogadro
-Version:       1.0.3
-Release:       16
+Version:       1.2.0
+Release:       2
 License:       GPL v2
 Group:         Applications/Editors
-Source0:       http://downloads.sourceforge.net/avogadro/%{name}-%{version}.tar.bz2
-# Source0-md5: 92c2702c1980f70fb6d87a1a58147911
+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:                link-X11.patch
+Patch3:                gcc6.patch
 Patch4:                python-install.patch
 URL:           http://avogadro.openmolecules.net/
 BuildRequires: QtNetwork-devel
@@ -74,7 +74,7 @@ cd build
        -DCMAKE_BUILD_TYPE=Release \
        ..
 
-%{__make}
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -83,6 +83,8 @@ 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
 
@@ -91,9 +93,11 @@ 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
@@ -104,8 +108,10 @@ rm -rf $RPM_BUILD_ROOT
 %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)