rpms/avogadro/devel avogadro.spec,1.22,1.23

[Sebastian Dziallas]

Author: sdz

Update of /cvs/pkgs/rpms/avogadro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10349/devel

Modified Files:
	avogadro.spec 
Log Message:
disable additional plugin builds for now



Index: avogadro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/avogadro.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- avogadro.spec	7 Jan 2010 22:42:21 -0000	1.22
+++ avogadro.spec	10 Jan 2010 13:34:43 -0000	1.23
@@ -1,9 +1,8 @@
 %{!?python_sitelib:%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           avogadro
 Version:        1.0.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        An advanced molecular editor for chemical purposes
 
 Group:          Applications/Editors
@@ -12,18 +11,14 @@ URL:            http://avogadro.openmole
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Obsoletes:      %{name}-libs
+
 BuildRequires:  cmake >= 2.6.0
 BuildRequires:  qt4-devel >= 4.5.1
 BuildRequires:  eigen2-devel >= 2.0.3
 BuildRequires:  openbabel-devel >= 2.2.2
-BuildRequires:  boost-devel >= 1.35
-BuildRequires:  glew-devel >= 1.5.0
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-utils
-BuildRequires:  sip-devel
-BuildRequires:  numpy
-
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
 An advanced molecular editor designed for 
@@ -33,20 +28,11 @@ and related areas, which offers flexible
 a powerful plugin architecture.
 
 
-%package libs
-Summary:        Shared libraries for Avogadro
-Group:          System Environment/Libraries
-%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
-
-%description libs
-This package contains the shared libraries for the
-molecular editor Avogadro.
-
-
 %package devel
 Summary:        Development files for Avogadro
 Group:          Development/Libraries
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release} 
+
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 This package contains files to develop applications using 
@@ -60,7 +46,7 @@ Avogadros libraries.
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} %{?BUILD_TESTS} -DENABLE_GLSL=ON -DENABLE_PYTHON=ON -DENABLE_UPDATE_CHECKER=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_libdir} ..
+%{cmake} %{?BUILD_TESTS} -DENABLE_UPDATE_CHECKER=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_libdir} ..
 popd
 make %{?_smp_mflags} -C %{_target_platform}
 
@@ -75,9 +61,9 @@ desktop-file-install --vendor=""        
   $RPM_BUILD_ROOT%{_datadir}/applications/avogadro.desktop
 
 
-%post libs -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
 %clean
@@ -91,23 +77,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}-icon.png
 %{_datadir}/applications/%{name}.desktop
+%{_libdir}/%{name}
+%{_libdir}/*.so.*
 
 
 %files devel
 %defattr(-,root,root,-)
-%{_datadir}/lib%{name}
 %{_includedir}/%{name}
 %{_libdir}/*.so
 
 
-%files libs
-%defattr(-,root,root,-)
-%{python_sitelib}/Avogadro.so
-%{_libdir}/%{name}
-%{_libdir}/*.so.*
-
-
 %changelog
+* Fri Jan 08 2010 Sebastian Dziallas <sebastian at when.com> - 1.0.0-5
+- disable plugin builds and libs subpackage
+
 * Thu Jan 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-4
 - rebuild (sip)