devel/straw straw.spec,1.3,1.4

[Thorsten Leemhuis (thl)]

Author: thl

Update of /cvs/extras/devel/straw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29979

Modified Files:
	straw.spec 
Log Message:
 Change python requires to use python-abi.; Use python_sitelib macros so we will get proper compilation on x86_64.


Index: straw.spec
===================================================================
RCS file: /cvs/extras/devel/straw/straw.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- straw.spec	10 Dec 2004 22:03:11 -0000	1.3
+++ straw.spec	14 Feb 2005 15:42:55 -0000	1.4
@@ -1,9 +1,10 @@
 %define pyver %(python -c 'import sys ; print sys.version[:3]')
-%define pynext %(python -c 'print %{pyver} + 0.1')
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           straw
 Version:        0.22.1
-Release:        4
+Release:        5
 Epoch:          0
 Summary:        GNOME desktop news aggregator
 
@@ -23,7 +24,7 @@
 BuildRequires:	python-bsddb >= 0:4.1
 Requires:	python-bsddb >= 0:4.1
 %endif
-Requires:	python >= 0:%{pyver}, python < 0:%{pynext}
+Requires:	python-abi = %{pyver}
 Requires:	gnome-python2-gconf, gnome-python2-gnomevfs, gnome-python2-gtkhtml2
 # Note: python-adns optional but recommended
 Requires:	python-adns
@@ -53,7 +54,7 @@
     --prefix %_prefix --sysconfdir %_sysconfdir \
     --disable-schemas-install
 # Produce .pyo files to be %ghost'ed.
-python -Oc 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/%{name}'")'
+python -Oc 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT/%{python_sitelib}/%{name}'")'
 
 desktop-file-install \
   --vendor fedora \
@@ -81,10 +82,10 @@
 %doc LICENSE NEWS README TODO
 %config %{_sysconfdir}/gconf/schemas/*.schemas
 %{_bindir}/*
-%dir %{_libdir}/python%{pyver}/site-packages/%{name}
-%{_libdir}/python%{pyver}/site-packages/%{name}/*.py
-%{_libdir}/python%{pyver}/site-packages/%{name}/*.pyc
-%ghost %{_libdir}/python%{pyver}/site-packages/%{name}/*.pyo
+%dir %{python_sitelib}/%{name}
+%{python_sitelib}/%{name}/*.py
+%{python_sitelib}/%{name}/*.pyc
+%ghost %{python_sitelib}/%{name}/*.pyo
 %{_datadir}/applications/*.desktop
 %{_datadir}/locale/*/LC_MESSAGES/%{name}.mo
 %{_datadir}/pixmaps/*
@@ -92,6 +93,10 @@
 
 
 %changelog
+* Sat Feb 05 2005 Toshio Kuratomi <toshio at tiki-lounge.com> 0.22.1-5
+- Change python requires to use python-abi.
+- Use python_sitelib macros so we will get proper compilation on x86_64.
+
 * Tue May  4 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.22.1-0.fdr.4
 - Fix python-bsddb requirement.