packages: avogadro/avogadro.spec - pldization

[shadzik]

Author: shadzik                      Date: Fri Jul 30 21:46:22 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- pldization

---- Files affected:
packages/avogadro:
   avogadro.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/avogadro/avogadro.spec
diff -u packages/avogadro/avogadro.spec:1.1 packages/avogadro/avogadro.spec:1.2
--- packages/avogadro/avogadro.spec:1.1	Fri Jul 30 22:56:24 2010
+++ packages/avogadro/avogadro.spec	Fri Jul 30 23:46:16 2010
@@ -1,24 +1,28 @@
 # $Revision$, $Date$
+
+%define		qtver	4.6.3
+
 Summary:	An advanced molecular editor for chemical purposes
 Name:		avogadro
 Version:	1.0.0
 Release:	0.1
 License:	GPL v2
 Group:		Applications/Editors
-URL:		http://avogadro.openmolecules.net/
 Source0:	http://downloads.sourceforge.net/avogadro/%{name}-%{version}.tar.bz2
 # fix build with sip 4.10
+URL:		http://avogadro.openmolecules.net/
 Patch0:		%{name}-sip.patch
 BuildRequires:	boost-devel >= 1.35
-BuildRequires:	cmake >= 2.6.0
+BuildRequires:	cmake >= 2.8.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	docbook-utils
-BuildRequires:	eigen2-devel >= 2.0.3
+BuildRequires:	eigen >= 1:2.0.12
 BuildRequires:	glew-devel >= 1.5.0
-BuildRequires:	numpy
+#BuildRequires:	numpy
 BuildRequires:	openbabel-devel >= 2.2.2
-BuildRequires:	qt4-build >= 4.5.1
-BuildRequires:	sip-devel
+BuildRequires:	qt4-build >= %{qtver}
+BuildRequires:	qt4-qmake >= %{qtver}
+BuildRequires:	sip
 Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -28,7 +32,6 @@
 science, and related areas, which offers flexible rendering and a
 powerful plugin architecture.
 
-
 %package libs
 Summary:	Shared libraries for Avogadro
 Group:		Libraries
@@ -41,7 +44,6 @@
 Summary:	Development files for Avogadro
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:
 
 %description devel
 This package contains files to develop applications using Avogadros
@@ -51,11 +53,10 @@
 %setup -q
 %patch0 -p1 -b .sip410
 
-
 %build
 install -d build
 cd build
-%{cmake} \
+%cmake \
 	-DENABLE_GLSL=ON \
 	-DENABLE_PYTHON=ON \
 	-DENABLE_UPDATE_CHECKER=OFF \
@@ -66,7 +67,6 @@
 cd ..
 %{__make} -C %{_target_platform}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
@@ -76,16 +76,12 @@
   --dir=$RPM_BUILD_ROOT%{_desktopdir}  \
   $RPM_BUILD_ROOT%{_desktopdir}/avogadro.desktop
 
-
 %post libs -p /sbin/ldconfig
-
 %postun libs -p /sbin/ldconfig
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog COPYING
@@ -94,27 +90,27 @@
 %{_pixmapsdir}/%{name}-icon.png
 %{_desktopdir}/%{name}.desktop
 
-
 %files devel
 %defattr(644,root,root,755)
 %{_datadir}/lib%{name}
 %{_includedir}/%{name}
 %{_libdir}/*.so
 
-
 %files libs
 %defattr(644,root,root,755)
 %{py_sitedir}/Avogadro.so
 %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/*.so.*
 
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/07/30 21:46:16  shadzik
+- pldization
+
 Revision 1.1  2010/07/30 20:56:24  arekm
 - raw
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avogadro/avogadro.spec?r1=1.1&r2=1.2&f=u