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

[Ignacio Vazquez-Abrams (ivazquez)]

Author: ivazquez

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

Modified Files:
	python-HTMLgen.spec 
Log Message:
Version and %python_sitelib cleanup


Index: python-HTMLgen.spec
===================================================================
RCS file: /cvs/extras/devel/python-HTMLgen/python-HTMLgen.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-HTMLgen.spec	16 Mar 2005 23:41:59 -0000	1.3
+++ python-HTMLgen.spec	17 Mar 2005 22:09:25 -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 2.2.2
+%{!?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()")}
+%{!?pydir: %define pydir %(%{__python}%{pyver} -c "from distutils.sysconfig import get_config_vars; print get_config_vars()['LIBDEST']")}
 
 %if "%{pyver}" == "%{mainpyver}"
 %define name python-HTMLgen
-%define prov python%{pyver}-htmlgen = %{version} python-htmlgen = %{version}
 %else
 %define name python%{pyver}-HTMLgen
-%define prov python%{pyver}-htmlgen = %{version}
 %endif
 
 Name:           %name
-Version:        %version
-Release:        2
+Version:        2.2.2
+Release:        3
 Summary:        A class library for the generation of HTML documents
 
 Group:          Development/Libraries
@@ -22,10 +19,9 @@
 Source0:        http://starship.python.net/crew/friedrich/HTMLgen.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Provides:       %{prov}
 BuildRequires:  python-abi = %{pyver}
 Requires:       python-abi = %{pyver}
-Provides:       HTMLgen = %{version}
+Provides:       python%{pyver}HTMLgen = %{version}
 BuildArch:      noarch
 
 %description
@@ -40,22 +36,26 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+install -d -m 0755 $RPM_BUILD_ROOT%{python_sitelib}
 for file in HTMLgen.py HTMLcolors.py HTMLutil.py HTMLcalendar.py barchart.py colorcube.py imgsize.py NavLinks.py Formtools.py ImageH.py ImageFileH.py ImagePaletteH.py GifImagePluginH.py JpegImagePluginH.py PngImagePluginH.py; do
-  install -m 0644 $file $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+  install -m 0644 $file $RPM_BUILD_ROOT%{python_sitelib}
 done
-python%{pyver} %{_libdir}/python%{pyver}/compileall.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
-python%{pyver} -O %{_libdir}/python%{pyver}/compileall.py $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages
+%{__python}%{pyver} %{pydir}/compileall.py $RPM_BUILD_ROOT%{python_sitelib}
+%{__python}%{pyver} -O %{pydir}/compileall.py $RPM_BUILD_ROOT%{python_sitelib}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/python%pyver/site-packages/*.py
-%{_libdir}/python%pyver/site-packages/*.py[co]
+%{python_sitelib}/*.py
+%{python_sitelib}/*.py[co]
 
 %changelog
+* Thu Mar 17 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-3
+- Streamlined version handling
+- Implemented %python_sitelib
+
 * Wed Mar 16 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.2.2-2
 - Modified %setup to use -n
 - Broke %description at 80 columns