packages: avogadro/avogadro.spec, avogadro/avogadro-python2.7.patch (REMOVE...

[baggins]

Author: baggins                      Date: Mon Jun 25 19:42:02 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.0.3
- removed obsolete patches
- updated files
- BR qt4 with fixed moc wrt boost

---- Files affected:
packages/avogadro:
   avogadro.spec (1.20 -> 1.21) , avogadro-python2.7.patch (1.1 -> NONE)  (REMOVED), avogadro-sipfix.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/avogadro/avogadro.spec
diff -u packages/avogadro/avogadro.spec:1.20 packages/avogadro/avogadro.spec:1.21
--- packages/avogadro/avogadro.spec:1.20	Sun Mar 11 09:31:45 2012
+++ packages/avogadro/avogadro.spec	Mon Jun 25 21:41:57 2012
@@ -1,21 +1,15 @@
 # $Revision$, $Date$
-
-%define		qtver	4.7.0
-
 Summary:	An advanced molecular editor for chemical purposes
 Name:		avogadro
-Version:	1.0.1
-Release:	9
+Version:	1.0.3
+Release:	1
 License:	GPL v2
 Group:		Applications/Editors
 Source0:	http://downloads.sourceforge.net/avogadro/%{name}-%{version}.tar.bz2
-# Source0-md5:	0d5c391197101f0aab7be6b59f81e6fd
-# fix build with sip 4.10
+# Source0-md5:	92c2702c1980f70fb6d87a1a58147911
+Patch0:		%{name}-linguist.patch
+Patch1:		%{name}-cmake.patch
 URL:		http://avogadro.openmolecules.net/
-Patch0:		%{name}-python2.7.patch
-Patch1:		%{name}-linguist.patch
-Patch2:		%{name}-cmake.patch
-Patch3:		%{name}-sipfix.patch
 BuildRequires:	QtNetwork-devel
 BuildRequires:	QtOpenGL-devel
 BuildRequires:	boost-devel >= 1.35
@@ -29,9 +23,9 @@
 BuildRequires:	pkgconfig
 BuildRequires:	python-numpy-devel
 BuildRequires:	python-sip-devel
-BuildRequires:	qt4-build >= %{qtver}
+BuildRequires:	qt4-build >= 4.8.2-5
 BuildRequires:	qt4-linguist
-BuildRequires:	qt4-qmake >= %{qtver}
+BuildRequires:	qt4-qmake >= 4.8.2-5
 BuildRequires:	sip
 Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -62,9 +56,7 @@
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p0
-%patch2 -p1
-%patch3 -p0
+%patch1 -p1
 
 %build
 install -d build
@@ -74,17 +66,19 @@
 	-DENABLE_PYTHON=ON \
 	-DENABLE_UPDATE_CHECKER=OFF \
 	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-DLIB_INSTALL_DIR=%{_libdir} \
 	..
 
 %{__make}
 
 %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},%{_datadir}/qt4/mkspecs}/features/avogadro.prf
+
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
@@ -95,19 +89,23 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog COPYING
 %attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_bindir}/avopkg
 %{_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
+%{_datadir}/qt4/mkspecs/features/avogadro.prf
 
 %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.*
 
@@ -117,6 +115,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2012/06/25 19:41:57  baggins
+- up to 1.0.3
+- removed obsolete patches
+- updated files
+- BR qt4 with fixed moc wrt boost
+
 Revision 1.20  2012/03/11 08:31:45  arekm
 - release 9
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/avogadro/avogadro.spec?r1=1.20&r2=1.21