rpms/htmltmpl/devel htmltmpl.spec,1.5,1.6

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/htmltmpl/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv8049

Modified Files:
	htmltmpl.spec 
Log Message:
Sync with Python spec template from fedora-rpmdevtools, should fix x86_64 build.


Index: htmltmpl.spec
===================================================================
RCS file: /cvs/extras/rpms/htmltmpl/devel/htmltmpl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- htmltmpl.spec	10 Dec 2004 22:03:03 -0000	1.5
+++ htmltmpl.spec	16 Dec 2004 17:29:35 -0000	1.6
@@ -1,6 +1,8 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Name:           htmltmpl
 Version:        1.22
-Release:        4
+Release:        5
 Epoch:          0
 Summary:        Templating engine for separation of code and HTML
 
@@ -11,10 +13,10 @@
 Patch0:         %{name}-performance.patch
 Patch1:         %{name}-docs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 
+BuildArch:      noarch
 BuildRequires:  python-devel
-Requires:       python
+Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
 The purpose of the templating engine is to provide web application
@@ -34,21 +36,21 @@
 
 
 %build
-python setup.py build
-python test.py
+%{__python} setup.py build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python setup.py install --root $RPM_BUILD_ROOT
-for file in easydoc easydocp htmltmpl; do
-  touch $(ls -1d $RPM_BUILD_ROOT%{_libdir}/python*)/site-packages/$file.pyo
-done
-install -D -m 0755 easy.py $RPM_BUILD_ROOT%{_bindir}/easydoc
-install -m 0755 tmpl-xgettext.pl $RPM_BUILD_ROOT%{_bindir}
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+install -Dpm 755 easy.py $RPM_BUILD_ROOT%{_bindir}/easydoc
+install -pm 755 tmpl-xgettext.pl $RPM_BUILD_ROOT%{_bindir}
 rm -f doc/makedoc.sh
 
 
+%check || :
+%{__python} test.py
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -63,6 +65,9 @@
 
 
 %changelog
+* Thu Dec 16 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.22-5
+- Sync with Python spec template from fedora-rpmdevtools.
+
 * Sun Aug 24 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:1.22-0.fdr.4
 - Use --root $RPM_BUILD_ROOT instead of --prefix $RPM_BUILD_ROOT%%{_prefix}.
 - Include (%%ghost'd) *.pyo.