rpms/avogadro/devel .cvsignore, 1.11, 1.12 avogadro.spec, 1.24, 1.25 sources, 1.11, 1.12 avogadro-1.0.0-sip410.patch, 1.1, NONE avogadro-icon.patch, 1.2, NONE avogadro.desktop, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/avogadro/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24912

Modified Files:
	.cvsignore avogadro.spec sources 
Removed Files:
	avogadro-1.0.0-sip410.patch avogadro-icon.patch 
	avogadro.desktop 
Log Message:
* Mon May 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
- avogadro-1.0.1
- -devel: move cmake-related files here
- -devel: Req: qt4-devel
- %files: track lib sonames
- %check section



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	29 Oct 2009 14:36:54 -0000	1.11
+++ .cvsignore	24 May 2010 18:40:40 -0000	1.12
@@ -1 +1 @@
-avogadro-1.0.0.tar.bz2
+avogadro-1.0.1.tar.bz2


Index: avogadro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/avogadro.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- avogadro.spec	10 Feb 2010 02:05:05 -0000	1.24
+++ avogadro.spec	24 May 2010 18:40:41 -0000	1.25
@@ -1,17 +1,17 @@
 %{!?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)")}
 
+%define ENABLE_TESTS -DENABLE_TESTS:BOOL=ON
+
 Name:           avogadro
-Version:        1.0.0
-Release:        6%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        An advanced molecular editor for chemical purposes
 
 Group:          Applications/Editors
 License:        GPLv2
 URL:            http://avogadro.openmolecules.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-# fix build with sip 4.10
-Patch0:         avogadro-1.0.0-sip410.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake >= 2.6.0
@@ -49,6 +49,7 @@ molecular editor Avogadro.
 Summary:        Development files for Avogadro
 Group:          Development/Libraries
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release} 
+Requires:       qt4-devel
 
 %description devel
 This package contains files to develop applications using 
@@ -57,25 +58,24 @@ Avogadros libraries.
 
 %prep
 %setup -q
-%patch0 -p1 -b .sip410
 
 
 %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} %{?ENABLE_TESTS} -DENABLE_GLSL:BOOL=ON -DENABLE_PYTHON:BOOL=ON  ..
 popd
 make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+
 
-# system menu entry
-desktop-file-install --vendor=""                 \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications  \
-  $RPM_BUILD_ROOT%{_datadir}/applications/avogadro.desktop
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/avogadro.desktop
+%{?ENABLE_TESTS:make test -C %{_target_platform}}
 
 
 %post libs -p /sbin/ldconfig
@@ -90,27 +90,46 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING
-%{_bindir}/%{name}
-%{_datadir}/%{name}
-%{_datadir}/pixmaps/%{name}-icon.png
-%{_datadir}/applications/%{name}.desktop
-
+%{_bindir}/avogadro
+%{_bindir}/avopkg
+# TODO: %lang'ify stuff under %%{_datadir}/avogadro/i18n/
+%{_datadir}/avogadro/
+%{_datadir}/pixmaps/avogadro-icon.png
+%{_datadir}/applications/avogadro.desktop
+%{_mandir}/man1/avogadro.1*
+%{_mandir}/man1/avopkg.1*
 
 %files devel
 %defattr(-,root,root,-)
-%{_datadir}/lib%{name}
-%{_includedir}/%{name}
-%{_libdir}/*.so
-
+%{_includedir}/avogadro/
+%{_libdir}/libavogadro.so
+%{_libdir}/avogadro/*.cmake
+%{_libdir}/avogadro/1_0/*.cmake
+# these look like dups of system copies?, take a closer look and/or ask upstream -- Rex
+%{_libdir}/avogadro/1_0/cmake/
+%{_qt4_prefix}/mkspecs/features/avogadro.prf
 
 %files libs
 %defattr(-,root,root,-)
 %{python_sitelib}/Avogadro.so
-%{_libdir}/%{name}
-%{_libdir}/*.so.*
+%{_datadir}/libavogadro/
+%{_libdir}/libavogadro.so.1*
+%dir %{_libdir}/avogadro/
+%dir %{_libdir}/avogadro/1_0/
+%{_libdir}/avogadro/1_0/colors/
+%{_libdir}/avogadro/1_0/extensions/
+%{_libdir}/avogadro/1_0/engines/
+%{_libdir}/avogadro/1_0/tools/
 
 
 %changelog
+* Mon May 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
+- avogadro-1.0.1
+- -devel: move cmake-related files here
+- -devel: Req: qt4-devel
+- %%files: track lib sonames
+- %%check section
+
 * Wed Feb 10 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.0.0-6
 - reenable plugin builds and libs subpackage
 - fix their build with sip 4.10


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avogadro/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	29 Oct 2009 14:36:54 -0000	1.11
+++ sources	24 May 2010 18:40:41 -0000	1.12
@@ -1 +1 @@
-1146e8ca6cafa558a373d32f38680bcf  avogadro-1.0.0.tar.bz2
+0d5c391197101f0aab7be6b59f81e6fd  avogadro-1.0.1.tar.bz2


--- avogadro-1.0.0-sip410.patch DELETED ---


--- avogadro-icon.patch DELETED ---


--- avogadro.desktop DELETED ---