devel/python-amara python-amara.spec,1.3,1.4

[Ignacio Vazquez-Abrams (ivazquez)]

Author: ivazquez

Update of /cvs/extras/devel/python-amara
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22294

Modified Files:
	python-amara.spec 
Log Message:
Path and version fixes


Index: python-amara.spec
===================================================================
RCS file: /cvs/extras/devel/python-amara/python-amara.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-amara.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ python-amara.spec	17 Mar 2005 18:55:40 -0000	1.4
@@ -1,19 +1,16 @@
-%{!?pyver: %define pyver %(python -c 'import sys;print(sys.version[0:3])')}
-%define mainpyver %(python -c 'import sys;print(sys.version[0:3])')
-
-%define version 0.9.4
+%{!?pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')}
+%define mainpyver %(%{__python} -c 'import sys;print(sys.version[0:3])')
+%{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %if "%{pyver}" == "%{mainpyver}"
 %define name python-amara
-%define prov python%{pyver}-amara = %{version} python-amara = %{version}
 %else
 %define name python%{pyver}-amara
-%define prov python%{pyver}-Amara = %{version}
 %endif
 
 Name:           %name
-Version:        %version
-Release:        3
+Version:        0.9.4
+Release:        4
 Summary:        A collection of Pythonic tools for XML data binding
 
 Group:          Development/Libraries
@@ -24,7 +21,7 @@
 
 BuildRequires:  python-abi = %{pyver}
 Requires:       python-abi = %{pyver} 4Suite >= 1.0
-Provides:       %{prov}
+Provides:       python%{pyver}-amara = %{version}
 BuildArch:      noarch
 
 %description
@@ -37,30 +34,32 @@
 implementation of XML standards in Python, Amara adds a much more Pythonic face
 to these capabilities.
 
-Amara provides tools you can trust to conform with XML standards without losing
-the familiar Python feel.
-
 %prep
 %setup -q -n Amara-0.9.4
 
 %build
-python setup.py build
+%{__python}%{pyver} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python%{pyver} setup.py install --prefix=$RPM_BUILD_ROOT%{_prefix}
+%{__python}%{pyver} setup.py install --prefix=$RPM_BUILD_ROOT%{_prefix}
+[ "%{pyver}" == "%{mainpyver}" ] || rename .py %{pyver}.py $RPM_BUILD_ROOT%{_bindir}/*.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/flextyper.py
-%{_bindir}/scimitar.py
-%{_libdir}/python%{pyver}/site-packages/amara
+%{_bindir}/*.py
+%{python_sitelib}/amara
 %doc CHANGES COPYING demo manual.html README TODO
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-4
+- Streamlined/fixed Python version handling
+- Implemented %python_sitelib
+- Decreased verbosity in %description
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.4-3
 - Better %pyver and BR/Requires handling
 - Broke %description at 80 columns