- pldization

Changed files:
    avogadro.spec -> 1.2

diff --git a/avogadro.spec b/avogadro.spec
index c8a44833d32f5df2d1dc4a2e7937d2445c957fe4..ba8a0e873df5cb848db414d81d8558a1cf28caa7 100644 (file)
--- a/avogadro.spec
+++ b/avogadro.spec
@@ -1,23 +1,27 @@
+
+%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
 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
 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
 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: 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: glew-devel >= 1.5.0

-BuildRequires: numpy
+#BuildRequires:        numpy

 BuildRequires: openbabel-devel >= 2.2.2
 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)
 
 Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -27,7 +31,6 @@ computational chemistry, molecular modeling, bioinformatics, materials
 science, and related areas, which offers flexible rendering and a
 powerful plugin architecture.
 
 science, and related areas, which offers flexible rendering and a
 powerful plugin architecture.
 

-

 %package libs
 Summary:       Shared libraries for Avogadro
 Group:         Libraries
 %package libs
 Summary:       Shared libraries for Avogadro
 Group:         Libraries


@@ -40,7 +43,6 @@ Avogadro.
 Summary:       Development files for Avogadro
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 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
 
 %description devel
 This package contains files to develop applications using Avogadros


@@ -50,11 +52,10 @@ libraries.
 %setup -q
 %patch0 -p1 -b .sip410
 
 %setup -q
 %patch0 -p1 -b .sip410
 

-

 %build
 install -d build
 cd build
 %build
 install -d build
 cd build

-%{cmake} \
+%cmake \

        -DENABLE_GLSL=ON \
        -DENABLE_PYTHON=ON \
        -DENABLE_UPDATE_CHECKER=OFF \
        -DENABLE_GLSL=ON \
        -DENABLE_PYTHON=ON \
        -DENABLE_UPDATE_CHECKER=OFF \


@@ -65,7 +66,6 @@ cd build
 cd ..
 %{__make} -C %{_target_platform}
 
 cd ..
 %{__make} -C %{_target_platform}
 

-

 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}


@@ -75,16 +75,12 @@ desktop-file-install --vendor=""                 \
   --dir=$RPM_BUILD_ROOT%{_desktopdir}  \
   $RPM_BUILD_ROOT%{_desktopdir}/avogadro.desktop
 
   --dir=$RPM_BUILD_ROOT%{_desktopdir}  \
   $RPM_BUILD_ROOT%{_desktopdir}/avogadro.desktop
 

-

 %post libs -p /sbin/ldconfig
 %post libs -p /sbin/ldconfig

-

 %postun libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 

-

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-

 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog COPYING
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog COPYING


@@ -93,14 +89,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_pixmapsdir}/%{name}-icon.png
 %{_desktopdir}/%{name}.desktop
 
 %{_pixmapsdir}/%{name}-icon.png
 %{_desktopdir}/%{name}.desktop
 

-

 %files devel
 %defattr(644,root,root,755)
 %{_datadir}/lib%{name}
 %{_includedir}/%{name}
 %{_libdir}/*.so
 
 %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
 %files libs
 %defattr(644,root,root,755)
 %{py_sitedir}/Avogadro.so