rpms/PyXML/F-8 PyXML.spec,1.28,1.29

[Johan Cwiklinski (trasher)]

Author: trasher

Update of /cvs/extras/rpms/PyXML/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7828

Modified Files:
	PyXML.spec 
Log Message:
- Added python egg
- added dist tag in Release
- corrected non utf8 files and non executable files errors from rpmlint



Index: PyXML.spec
===================================================================
RCS file: /cvs/extras/rpms/PyXML/F-8/PyXML.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- PyXML.spec	24 Aug 2007 11:03:40 -0000	1.28
+++ PyXML.spec	13 Apr 2008 15:42:43 -0000	1.29
@@ -1,7 +1,7 @@
-Summary: XML libraries for python.
+Summary: XML libraries for python
 Name: PyXML
 Version: 0.8.4
-Release: 7
+Release: 8%{?dist}
 Source: http://prdownloads.sourceforge.net/pyxml/PyXML-%{version}.tar.gz
 Patch0: PyXML-0.7.1-intern.patch
 Patch1: PyXML-0.8.4-cvs20041111-python2.4-backport.patch
@@ -11,6 +11,7 @@
 Requires: python
 URL: http://pyxml.sourceforge.net/
 BuildRequires: python python-devel
+BuildRequires: python-setuptools
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 
 %description
@@ -25,26 +26,49 @@
 %patch1 -p1 -b .python2.4-backport
 %patch2 -p1
 
+# mostly to make rpmlint happier, files not UTF-8 encoded
+iconv -f ISO-8859-1 -t UTF-8 ANNOUNCE > ANNOUNCE.utf && mv ANNOUNCE.utf ANNOUNCE
+iconv -f ISO-8859-1 -t UTF-8 CREDITS > CREDITS.utf && mv CREDITS.utf CREDITS
+iconv -f ISO-8859-1 -t UTF-8 README > README.utf && mv README.utf README
+pushd doc
+pushd xmlproc
+sed -i -e 's/\r$//' standard.css
+popd
+iconv -f ISO-8859-1 -t UTF-8 xml-howto.txt > xml-howto.txt.utf && mv xml-howto.txt.utf xml-howto.txt
+iconv -f ISO-8859-1 -t UTF-8 xml-ref.txt > xml-ref.txt.utf && mv xml-ref.txt.utf xml-ref.txt
+popd
+
+
 %build
-CFLAGS="$RPM_OPT_FLAGS" python setup.py build  --with-xslt
+CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build  --with-xslt
 
 %install
 rm -fr $RPM_BUILD_ROOT
-python setup.py install --root=$RPM_BUILD_ROOT --with-xslt
+python -c 'import setuptools; execfile("setup.py")' install --skip-build --root=$RPM_BUILD_ROOT --with-xslt
+#%find_lang 4Suite
 
+# mostly to make rpmlint happier, non-executable-scripts
+chmod a+x $RPM_BUILD_ROOT%{_libdir}/python?.?/site-packages/_xmlplus/xslt/_4xslt.py
+chmod a+x $RPM_BUILD_ROOT%{_libdir}/python?.?/site-packages/_xmlplus/dom/ext/c14n.py
+chmod a+x $RPM_BUILD_ROOT%{_libdir}/python?.?/site-packages/_xmlplus/dom/html/GenerateHtml.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root)
 %doc LICENCE ANNOUNCE CREDITS README README.dom README.pyexpat README.sgmlop TODO doc/*
 %{_bindir}/xmlproc_parse
 %{_bindir}/xmlproc_val
+%{_libdir}/python?.?/site-packages/*egg-info
 %{_libdir}/python?.?/site-packages/_xmlplus/
 
 %changelog
+* Sun Apr 13 2008 Johan Cwiklinski <johan AT x-tnd DOT be> - 0.8.4-8
+- Added python egg
+- added dist tag in Release
+- corrected non utf8 files and non executable files errors from rpmlint
+
 * Tue Aug 21 2007 Florian La Roche <laroche at redhat.com> - 0.8.4-7
 - rebuild
 
@@ -121,16 +145,16 @@
 * Wed Dec 11 2002 Tim Powers <timp at redhat.com> 0.7.1-7
 - lib64'ize
 
-* Thu Aug 29 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.7.1-6
+* Thu Aug 29 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.7.1-6
 - Reenable expat. While most code works, some specify expat directly
   and fails. Fix #72698, but there is still broken code there (it just 
   goes on to other errors)
 
-* Tue Aug 27 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.7.1-5
+* Tue Aug 27 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.7.1-5
 - Disable expat support. Other parsers are included. Broken here, 
   broken in 0.8.0. This fixes #72698
 
-* Fri Jun 28 2002 Trond Eivind Glomsrød <teg at redhat.com>
+* Fri Jun 28 2002 Trond Eivind Glomsrød <teg at redhat.com>
 - A fix for the expatreader
 
 * Fri Jun 21 2002 Tim Powers <timp at redhat.com>
@@ -139,40 +163,40 @@
 * Thu May 23 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Fri May 10 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.7.1-1
+* Fri May 10 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.7.1-1
 - 0.7.1
 
-* Tue Feb 26 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.7-4
+* Tue Feb 26 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.7-4
 - Rebuild
 
-* Mon Jan 21 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.7-3
+* Mon Jan 21 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.7-3
 - Remove xpath, xslt - use the ones in 4Suite
 - patch the build script, it's broken
 
 * Wed Jan 09 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Tue Jan  1 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.7-1
+* Tue Jan  1 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.7-1
 - PyXML 0.7
 
-* Wed Dec  5 2001 Trond Eivind Glomsrød <teg at redhat.com> 0.6.6-2
+* Wed Dec  5 2001 Trond Eivind Glomsrød <teg at redhat.com> 0.6.6-2
 - Add .pyo files
 - Don't hardcode python version
 
-* Tue Sep 18 2001 Trond Eivind Glomsrød <teg at redhat.com> 0.6.6-1
+* Tue Sep 18 2001 Trond Eivind Glomsrød <teg at redhat.com> 0.6.6-1
 - 0.6.6
 - Build for python 2.2
 
-* Tue Jul 24 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Jul 24 2001 Trond Eivind Glomsrød <teg at redhat.com>
 - Add python-devel to BuildRequires (#49820)
 
-* Tue Jul 10 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Jul 10 2001 Trond Eivind Glomsrød <teg at redhat.com>
 - Mark the locale-specific files as such
 
-* Thu Jun  7 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Thu Jun  7 2001 Trond Eivind Glomsrød <teg at redhat.com>
 - Don't obsolete itself
 
-* Mon May  7 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon May  7 2001 Trond Eivind Glomsrød <teg at redhat.com>
 - Initial build, it's no longer part of 4Suite