[Erp5-report] r15085 - in /spec/mandriva/2007.1: erp5diff/ python2.4-4Suite-XML/ python2.4-...

nobody at svn.erp5.org nobody at svn.erp5.org
Sat Jun 30 15:28:18 CEST 2007


Author: jp
Date: Sat Jun 30 15:28:17 2007
New Revision: 15085

URL: http://svn.erp5.org?rev=15085&view=rev
Log:
fixed file list or library definition so that it is possible to build on x86_64 architecture

Modified:
    spec/mandriva/2007.1/erp5diff/erp5diff.spec
    spec/mandriva/2007.1/python2.4-4Suite-XML/python2.4-4Suite-XML.spec
    spec/mandriva/2007.1/python2.4-ClientForm/python2.4-ClientForm.spec
    spec/mandriva/2007.1/python2.4-fpconst/python2.4-fpconst.spec
    spec/mandriva/2007.1/python2.4-glpk/python2.4-glpk.spec
    spec/mandriva/2007.1/python2.4-imaging/python2.4-imaging.spec
    spec/mandriva/2007.1/python2.4-mechanize/python2.4-mechanize.spec
    spec/mandriva/2007.1/python2.4-pyxml/python2.4-pyxml.spec
    spec/mandriva/2007.1/python2.4-reportlab/python2.4-reportlab.spec
    spec/mandriva/2007.1/python2.4-soap/python2.4-soap.spec

Modified: spec/mandriva/2007.1/erp5diff/erp5diff.spec
URL: http://svn.erp5.org/spec/mandriva/2007.1/erp5diff/erp5diff.spec?rev=15085&r1=15084&r2=15085&view=diff
==============================================================================
--- spec/mandriva/2007.1/erp5diff/erp5diff.spec (original)
+++ spec/mandriva/2007.1/erp5diff/erp5diff.spec Sat Jun 30 15:28:17 2007
@@ -1,8 +1,9 @@
 %define product   erp5diff
 %define version   0.1
-%define release   6.1
+%define release   7
+%define _libdir   /usr/lib
 
-%define zope_home %{_prefix}/lib/zope
+%define zope_home %{_prefix}/lib/erp5
 %define software_home %{zope_home}/lib/python
 
 Summary:       XUpdate Generator for ERP5
@@ -53,6 +54,9 @@
 
 #----------------------------------------------------------------------
 %changelog
+* Sat Jun 30 2007 Jean-Paul Smets <jp at nexedi.com> 0.1-7mdv2007.1
+- force _libdir to /usr/lib
+
 * Tue May 29 2007 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 0.1-6.1mdv2007.1
 - Rebuild against python2.4
 

Modified: spec/mandriva/2007.1/python2.4-4Suite-XML/python2.4-4Suite-XML.spec
URL: http://svn.erp5.org/spec/mandriva/2007.1/python2.4-4Suite-XML/python2.4-4Suite-XML.spec?rev=15085&r1=15084&r2=15085&view=diff
==============================================================================
--- spec/mandriva/2007.1/python2.4-4Suite-XML/python2.4-4Suite-XML.spec (original)
+++ spec/mandriva/2007.1/python2.4-4Suite-XML/python2.4-4Suite-XML.spec Sat Jun 30 15:28:17 2007
@@ -1,13 +1,13 @@
 %define dname 4Suite-XML
 %define version 1.0.2
-%define release 2
+%define release 3
 %define pyver 2.4
 %define python python2.4
 
 Name:           %{python}-%{dname}
 Summary:        4Suite is a suite of Python modules for XML and RDF processing
 Version:        %{version}
-Release: 	%mkrel 2
+Release:        %mkrel %release
 Source0:        http://belnet.dl.sourceforge.net/sourceforge/foursuite/%{dname}-%{version}.tar.bz2 
 URL:            http://4suite.org/
 
@@ -31,24 +31,28 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{python} setup.py install --prefix /usr --root $RPM_BUILD_ROOT --install-lib /usr/lib/python%pyver/site-packages/ 
+%{python} setup.py install --prefix=/usr --root $RPM_BUILD_ROOT --install-lib %{_libdir}/python%pyver/site-packages/ --record=INSTALLED_FILES
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/4Suite/
 
 %clean 
 rm -rf $RPM_BUILD_ROOT 
 
-%files 
+#%files -f INSTALLED_FILES
+%files
 %defattr(-,root,root,0755) 
-
-%doc COPY* README docs/
 %{_libdir}/python%pyver/site-packages/4Suite_XML-%{version}-py%pyver.egg-info
 %{_libdir}/python%pyver/site-packages/Ft
 %{_bindir}/4x*
-%{_libdir}/4Suite/
+/usr/lib/4Suite/
 %{_datadir}/4Suite/
 
+%doc COPY* README docs/
 
 %changelog
+* Sat Jun 30 2007 Jean-Paul Smets <jp at nexedi.com> 1.0.2-3mdv2007.1
+- Find installed files using INSTALLED_FILES
+- use _libdir in install
+
 * Mon May 28 2007 Jean-Paul Smets <jp at nexedi.com> 1.0.2-2mdv2007.1
 - Various name changes
 - Specify python version

Modified: spec/mandriva/2007.1/python2.4-ClientForm/python2.4-ClientForm.spec
URL: http://svn.erp5.org/spec/mandriva/2007.1/python2.4-ClientForm/python2.4-ClientForm.spec?rev=15085&r1=15084&r2=15085&view=diff
==============================================================================
--- spec/mandriva/2007.1/python2.4-ClientForm/python2.4-ClientForm.spec (original)
+++ spec/mandriva/2007.1/python2.4-ClientForm/python2.4-ClientForm.spec Sat Jun 30 15:28:17 2007
@@ -7,7 +7,7 @@
 Summary:        Python module for handling HTML forms
 Name:           python2.4-%product
 Version:        %version
-Release:        %mkrel 2.1
+Release:        %mkrel 3
 Source0:        http://wwwsearch.sourceforge.net/ClientForm/src/%tarname.tar.bz2
 Patch1:         ClientForm-0.2.2-setuptool.patch
 License:        BSD and ZPL
@@ -37,18 +37,20 @@
 
 %install
 %__rm -rf %buildroot
-%__python setup.py install -O1 --skip-build --root %buildroot --single-version-externally-managed
+%__python setup.py install -O1 --skip-build --root=%{buildroot} --record=INSTALLED_FILES --single-version-externally-managed
 
 %clean
 %__rm -rf %buildroot
 
-%files
+%files -f INSTALLED_FILES
 %defattr(755,root,root)
 %doc COPY* GeneralFAQ.html INSTALL.txt MANIFEST.in README.*
-%{_libdir}/python*/site-packages/*
 
 
 %changelog
+* Sat Jun 30 2007 Jean-Paul Smets <jp at nexedi.com> 0.2.2-3mdv2007.1
+- Find installed files using INSTALLED_FILES
+
 * Tue May 29 2007 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 0.2.2-2.1mdv2007.1
 - Rebuild against python2.4
 - Set BuildArch to noarch 

Modified: spec/mandriva/2007.1/python2.4-fpconst/python2.4-fpconst.spec
URL: http://svn.erp5.org/spec/mandriva/2007.1/python2.4-fpconst/python2.4-fpconst.spec?rev=15085&r1=15084&r2=15085&view=diff
==============================================================================
--- spec/mandriva/2007.1/python2.4-fpconst/python2.4-fpconst.spec (original)
+++ spec/mandriva/2007.1/python2.4-fpconst/python2.4-fpconst.spec Sat Jun 30 15:28:17 2007
@@ -6,7 +6,7 @@
 Summary:       IEEE754 float infinity and NaN for python
 Name:          python2.4-%{oname}
 Version:       0.7.2
-Release:       %mkrel 1.1
+Release:       %mkrel 2
 Epoch:         0
 URL:           http://cheeseshop.python.org/packages/source/f/fpconst/0.7.2
 Source0:       http://cheeseshop.python.org/packages/source/f/fpconst/fpconst-0.7.2.tar.bz2
@@ -34,19 +34,21 @@
 
 %install
 %{__rm} -rf %{buildroot}
-python2.4 setup.py install --root %{buildroot}
+python2.4 setup.py install --root %{buildroot} --record=INSTALLED_FILES
 
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -f INSTALLED_FILES
 %defattr(0644,root,root,0755)
 %doc README PKG-INFO
 %defattr(-,root,root)
-%{_libdir}/python*/site-packages/*
 
 
 %changelog
+* Sat Jun 30 2007 Jean-Paul Smets <jp at nexedi.com> 0.7.2-2mdv2007.1
+- Find installed files using INSTALLED_FILES
+
 * Tue May 29 2007 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 0.7.2-1.1mdv2007.1
 - Rebuild against python2.4
 

Modified: spec/mandriva/2007.1/python2.4-glpk/python2.4-glpk.spec
URL: http://svn.erp5.org/spec/mandriva/2007.1/python2.4-glpk/python2.4-glpk.spec?rev=15085&r1=15084&r2=15085&view=diff
==============================================================================
--- spec/mandriva/2007.1/python2.4-glpk/python2.4-glpk.spec (original)
+++ spec/mandriva/2007.1/python2.4-glpk/python2.4-glpk.spec Sat Jun 30 15:28:17 2007
@@ -1,19 +1,19 @@
 %define name python2.4-glpk
 %define dname python-glpk
 %define version 0.4
-%define release 2mdk
+%define release 3
 
 Summary: Python extension module for GLPK
 Name: %{name}
 Version: %{version}
-Release: %{release}
+Release: %mkrel %{release}
 License: GPL
 URL: http://nexedi.com/
 Group: Development/Python
 Source0: python-glpk-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 Requires: python2.4 >= 2.2
-BuildRequires: libpython2.4-devel, libglpk4.7-devel, swig
+BuildRequires: libpython2.4-devel, libglpk, libglpk-devel, swig
 
 %description
 A extension module for GNU Linear Programming Kit to Python.
@@ -37,6 +37,9 @@
 %{_libdir}/python*/site-packages/glpk.so
 
 %changelog
+* Sun Dec 05 2004 Michael Scherer <misc at mandrake.org> 0.4-3mdk
+- Requires changed to libglpk-devel for 64bit compatibility
+
 * Sun Dec 05 2004 Michael Scherer <misc at mandrake.org> 0.4-2mdk
 - Rebuild for new python
 

Modified: spec/mandriva/2007.1/python2.4-imaging/python2.4-imaging.spec
URL: http://svn.erp5.org/spec/mandriva/2007.1/python2.4-imaging/python2.4-imaging.spec?rev=15085&r1=15084&r2=15085&view=diff
==============================================================================
--- spec/mandriva/2007.1/python2.4-imaging/python2.4-imaging.spec (original)
+++ spec/mandriva/2007.1/python2.4-imaging/python2.4-imaging.spec Sat Jun 30 15:28:17 2007
@@ -1,9 +1,10 @@
 %define pyver %(python2.4 -V 2>&1 | cut -f2 -d" " | cut -f1,2 -d".")
+%define py_platsitedir %{_libdir}/python2.4/site-packages
 
 Summary:	Python's own image processing library 
 Name:		python2.4-imaging
 Version: 	1.1.4
-Release: 	%mkrel 11
+Release: 	%mkrel 12
 License:	MIT style
 Group:		Development/Python
 URL:		http://www.pythonware.com/products/pil/
@@ -87,6 +88,9 @@
 
 
 %changelog
+* Sat Jun 30 2007 Jean-Paul Smets <jp at nexedi.com> 1.1.4-12mdv2007.1
+- force definition of py_platsitedir based on _libdir
+
 * Tue May 29 2007 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 1.1.4-11.1mdv2007.1
 - Rebuild against python2.4
 

Modified: spec/mandriva/2007.1/python2.4-mechanize/python2.4-mechanize.spec
URL: http://svn.erp5.org/spec/mandriva/2007.1/python2.4-mechanize/python2.4-mechanize.spec?rev=15085&r1=15084&r2=15085&view=diff
==============================================================================
--- spec/mandriva/2007.1/python2.4-mechanize/python2.4-mechanize.spec (original)
+++ spec/mandriva/2007.1/python2.4-mechanize/python2.4-mechanize.spec Sat Jun 30 15:28:17 2007
@@ -6,7 +6,7 @@
 Summary:        Stateful programmatic web browsing in Python
 Name:           python2.4-%product
 Version:        %version
-Release:        %mkrel 3.1
+Release:        %mkrel 4
 Source0:        http://wwwsearch.sourceforge.net/mechanize/src/%tarname.tar.bz2
 License:        BSD
 Group:          Applications/Development/Tools
@@ -45,17 +45,19 @@
 
 %install
 %__rm -rf %buildroot
-%__python setup.py install -O1 --skip-build --root %buildroot --single-version-externally-managed
+%__python setup.py install -O1 --skip-build --root %buildroot --record=INSTALLED_FILES --single-version-externally-managed
 
 %clean
 %__rm -rf %buildroot
 
-%files
+%files -f INSTALLED_FILES
 %defattr(755,root,root)
 %doc COPYING.txt doc.* INSTALL.txt MANIFEST.in README.*
-%{_libdir}/python*/site-packages/*
 
 %changelog
+* Sat Jun 30 2007 Jean-Paul Smets <jp at nexedi.com> 0.1.2b-4mdv2007.1
+- Find installed files using INSTALLED_FILES
+
 * Tue May 29 2007 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 0.1.2b-3.1mdv2007.1
 - Rebuild against python2.4
 - Set BuildArch to noarch

Modified: spec/mandriva/2007.1/python2.4-pyxml/python2.4-pyxml.spec
URL: http://svn.erp5.org/spec/mandriva/2007.1/python2.4-pyxml/python2.4-pyxml.spec?rev=15085&r1=15084&r2=15085&view=diff
==============================================================================
--- spec/mandriva/2007.1/python2.4-pyxml/python2.4-pyxml.spec (original)
+++ spec/mandriva/2007.1/python2.4-pyxml/python2.4-pyxml.spec Sat Jun 30 15:28:17 2007
@@ -1,8 +1,8 @@
 %define module	PyXML
 %define name	python2.4-pyxml
 %define version 0.8.4
-%define release %mkrel 7
-%define py_platsitedir /usr/lib/python2.4/site-packages
+%define release %mkrel 8
+%define py_platsitedir %{_libdir}/python2.4/site-packages
 
 Name:		%{name}
 Version:	%{version}
@@ -38,24 +38,25 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files -f INSTALLED_FILES
 %defattr(-,root,root)
 %doc LICENCE ANNOUNCE CREDITS README README.dom README.pyexpat README.sgmlop TODO doc/*
-%py_platsitedir/*
-%_bindir/*
+#%py_platsitedir/*
+#%_bindir/*
 %lang(de) %{py_platsitedir}/*/dom/de/
 %lang(en_US) %{py_platsitedir}/*/dom/en_US/
 %lang(fr) %{py_platsitedir}/*/dom/fr/
 
 
 %changelog
+* Sat Jun 30 2007 Jean-Paul Smets <jp at nexedi.com> 0.8.4-8mdv2007.1
+- Make py_platsitedir based on generic _libdir
+
 * Tue Nov 28 2006 Götz Waschk <waschk at mandriva.org> 0.8.4-7mdv2007.0
 + Revision: 88167
 - Import python-pyxml
 
-
-
-* Tue Nov 28 2006 G�tz Waschk <waschk at mandriva.org> 0.8.4-7mdv2007.1
+* Tue Nov 28 2006 Götz Waschk <waschk at mandriva.org> 0.8.4-7mdv2007.1
 - update file list
 
 * Wed Feb 01 2006 Michael Scherer <misc at mandriva.org> 0.8.4-6mdk
@@ -64,13 +65,13 @@
 * Mon Jan 30 2006 Michael Scherer <misc at mandriva.org> 0.8.4-5mdk
 - fix file listing, and no longer ship .pyo
 
-* Tue Jan 17 2006 G�tz Waschk <waschk at mandriva.org> 0.8.4-4mdk
+* Tue Jan 17 2006 Götz Waschk <waschk at mandriva.org> 0.8.4-4mdk
 - depend on python
 
 * Sun Jan 01 2006 Mandriva Linux Team <http://www.mandrivaexpert.com/> 0.8.4-3mdk
 - Rebuild
 
-* Wed May  4 2005 G�tz Waschk <waschk at mandriva.org> 0.8.4-2mdk
+* Wed May  4 2005 Götz Waschk <waschk at mandriva.org> 0.8.4-2mdk
 - use external libexpat
 - enable xpath and xslt
 

Modified: spec/mandriva/2007.1/python2.4-reportlab/python2.4-reportlab.spec
URL: http://svn.erp5.org/spec/mandriva/2007.1/python2.4-reportlab/python2.4-reportlab.spec?rev=15085&r1=15084&r2=15085&view=diff
==============================================================================
--- spec/mandriva/2007.1/python2.4-reportlab/python2.4-reportlab.spec (original)
+++ spec/mandriva/2007.1/python2.4-reportlab/python2.4-reportlab.spec Sat Jun 30 15:28:17 2007
@@ -1,10 +1,10 @@
 %define ver 1_19
-%define py_platsitedir /usr/lib/python2.4/site-packages
+%define py_platsitedir %{_libdir}/python2.4/site-packages
 
 Summary: ReportLab library to create PDF documents using Python
 Name: python2.4-reportlab
 Version: 1.19
-Release: %mkrel 5.1
+Release: %mkrel 6
 URL: http://www.reportlab.org/
 Source0: http://www.reportlab.org/ftp/ReportLab_%{ver}.tar.bz2
 License: BSD
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Sat Jun 30 2007 Jean-Paul Smets <jp at nexedi.com> 1.19-6mdv2007.1
+- py_platsitedir is now based on _libdir
+
 * Tue May 29 2007 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 1.19-5.1mdv2007.1
 - use python2.4
 

Modified: spec/mandriva/2007.1/python2.4-soap/python2.4-soap.spec
URL: http://svn.erp5.org/spec/mandriva/2007.1/python2.4-soap/python2.4-soap.spec?rev=15085&r1=15084&r2=15085&view=diff
==============================================================================
--- spec/mandriva/2007.1/python2.4-soap/python2.4-soap.spec (original)
+++ spec/mandriva/2007.1/python2.4-soap/python2.4-soap.spec Sat Jun 30 15:28:17 2007
@@ -1,7 +1,7 @@
 Name:            python2.4-soap
 Summary:         A SOAP library for python
 Version:         0.12.0
-Release:         %mkrel 3
+Release:         %mkrel 4
 Epoch:           0
 Source0:         http://ovh.dl.sourceforge.net/sourceforge/pywebsvcs/SOAPpy-%{version}.tar.bz2
 Patch0:          SOAPpy-0.12.0-future.patch
@@ -25,24 +25,24 @@
 
 %install
 %{__rm} -rf %{buildroot}
-python2.4 setup.py install --root=%{buildroot}
+python2.4 setup.py install --root=%{buildroot} --record=INSTALLED_FILES 
 
 %clean
 %{__rm} -rf %{buildroot}
 
-%files
+%files -f INSTALLED_FILES
 %defattr(-,root,root)
 %doc docs/* validate tests tools contrib bid
-%{_libdir}/python*/site-packages/*
 
 
 %changelog
+* Sat Jun 30 2007 Jean-Paul Smets <jp at nexedi.com> 0.12.0-4mdv2007.1
+- Find installed files using INSTALLED_FILES
+
 * Sat Dec 09 2006 David Walluck <walluck at mandriva.org> 0.12.0-3mdv2007.0
 + Revision: 93953
 - rebuild for new python
 - Import python-soap
-
-
 
 * Sat Sep 02 2006 David Walluck <walluck at mandriva.org> 0:0.12.0-2mdv2007.0
 - remove %%pyver from Requires




More information about the Erp5-report mailing list