rpms/mx/devel import.log, NONE, 1.1 mx-3.1.1-lib64.patch, NONE, 1.1 mx-3.1.1-longyear.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 mx.spec, 1.19, 1.20 sources, 1.6, 1.7 egenix-mx-base-2.0.1-longyear.patch, 1.1, NONE egenix-mx-base-2.0.2-pyconfig.patch, 1.1, NONE egenix-mx-base-2.0.5-lib64.patch, 1.1, NONE

Wed Sep 17 21:10:22 UTC 2008

Author: pfj

Update of /cvs/pkgs/rpms/mx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14484/devel

Modified Files:
	.cvsignore mx.spec sources 
Added Files:
	import.log mx-3.1.1-lib64.patch mx-3.1.1-longyear.patch 
Removed Files:
	egenix-mx-base-2.0.1-longyear.patch 
	egenix-mx-base-2.0.2-pyconfig.patch 
	egenix-mx-base-2.0.5-lib64.patch 
Log Message:

Spec file fixes
Bump to new version
Patch file fixes for new version
Dropped unused patch file
New -devel subpackage created

--- NEW FILE import.log ---
mx-3_1_1-2_fc10:HEAD:mx-3.1.1-2.fc10.src.rpm:1221685725

mx-3.1.1-lib64.patch:

--- NEW FILE mx-3.1.1-lib64.patch ---
--- egenix-mx-base-3.1.1/mxSetup.py	2008-08-04 13:24:56.000000000 +0100
+++ egenix-mx-base-3.1.1/mxSetup-new.py	2008-09-15 09:27:04.000000000 +0100
@@ -2376,7 +2376,7 @@
 
         if self.install_dir is None:
             installobj = self.distribution.get_command_obj('install')
-            self.install_dir = installobj.install_data
+            self.install_dir = installobj.install_platlib
         if _debug:
             print 'Installing data files to %s' % self.install_dir
         self.set_undefined_options('install',

mx-3.1.1-longyear.patch:

--- NEW FILE mx-3.1.1-longyear.patch ---
--- egenix-mx-base-3.1.1/mx/DateTime/mxDateTime/mxDateTime.c	2008-08-05 09:36:44.000000000 +0100
+++ egenix-mx-base-3.1.1/mx/DateTime/mxDateTime/mxDateTime-new.c	2008-09-15 09:21:23.000000000 +0100
@@ -996,7 +996,7 @@
 
 static
 int mxDateTime_SetFromDateAndTime(mxDateTimeObject *datetime,
-				  int year,
+				  long year,
 				  int month,
 				  int day,
 				  int hour,
@@ -1196,7 +1196,7 @@
 /* --- API functions --- */
 
 static
-PyObject *mxDateTime_FromDateAndTime(int year,
+PyObject *mxDateTime_FromDateAndTime(long year,
 				     int month,
 				     int day,
 				     int hour,
@@ -1224,7 +1224,7 @@
 #define mxDateTime_FromGregorianDateAndTime mxDateTime_FromDateAndTime
 
 static
-PyObject *mxDateTime_FromJulianDateAndTime(int year,
+PyObject *mxDateTime_FromJulianDateAndTime(long year,
 					   int month,
 					   int day,
 					   int hour,
@@ -1406,7 +1406,8 @@
 PyObject *mxDateTime_FromTuple(PyObject *v)
 {
     mxDateTimeObject *datetime = 0;
-    int year,month,day,hour,minute;
+    long year;
+    int month,day,hour,minute;
     double second;
 
     if (!PyTuple_Check(v)) {
@@ -1414,7 +1415,7 @@
 	return NULL;
     }
     if (!PyArg_ParseTuple(v,
-	"iiiiid;need a date/time 6-tuple (year,month,day,hour,minute,second)",
+	"liiiid;need a date/time 6-tuple (year,month,day,hour,minute,second)",
 			  &year,&month,&day,&hour,&minute,&second))
 	return NULL;
     
@@ -4506,14 +4507,14 @@
 	       "fractions. Note that the function does not accept keyword args."
 	       )
 {
-    int year,
-	month = 1,
+    long year;
+    int month = 1,
 	day = 1;
     int hour = 0,
 	minute = 0;
     double second = 0.0;
     
-    Py_Get6Args("i|iiiid",year,month,day,hour,minute,second);
+    Py_Get6Args("l|iiiid",year,month,day,hour,minute,second);
     return mxDateTime_FromDateAndTime(year,month,day,hour,minute,second);
  onError:
     return NULL;
@@ -4526,14 +4527,14 @@
 	       "fractions.  Note that the function does not accept keyword args."
 	       )
 {
-    int year,
-	month = 1,
+    long year;
+    int month = 1,
 	day = 1;
     int hour = 0,
 	minute = 0;
     double second = 0.0;
     
-    Py_Get6Args("i|iiiid",year,month,day,hour,minute,second);
+    Py_Get6Args("l|iiiid",year,month,day,hour,minute,second);
     return mxDateTime_FromJulianDateAndTime(year,month,day,hour,minute,second);
  onError:
     return NULL;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mx/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Feb 2005 20:05:43 -0000	1.6
+++ .cvsignore	17 Sep 2008 21:09:51 -0000	1.7
@@ -1 +1 @@
-egenix-mx-base-2.0.6.tar.gz
+egenix-mx-base-3.1.1.tar.gz


Index: mx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mx/devel/mx.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mx.spec	11 Aug 2008 16:03:02 -0000	1.19
+++ mx.spec	17 Sep 2008 21:09:51 -0000	1.20
@@ -1,22 +1,22 @@
 %define pybasever %{nil}
 %define without_pybasever 1
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Summary:  A collection of Python software tools.
+Summary:  A collection of Python software tools
 Name: mx%{pybasever}
-Version: 2.0.6
-Release: 5%{?dist}
+Version: 3.1.1
+Release: 2%{?dist}
 URL: http://www.lemburg.com/files/python/eGenix-mx-Extensions.html
 Source0: http://www.lemburg.com/python/egenix-mx-base-%{version}.tar.gz
-Patch0: egenix-mx-base-2.0.2-pyconfig.patch
-Patch1: egenix-mx-base-2.0.1-longyear.patch
-Patch2: egenix-mx-base-2.0.5-lib64.patch
+Patch1: mx-3.1.1-longyear.patch
+Patch2: mx-3.1.1-lib64.patch
 License: Python
 Group: Development/Libraries
-BuildRequires: gcc glibc-devel python Distutils
+BuildRequires: Distutils
 BuildRequires: python-devel >= 2.3
 %if %{?without_pybasever}
 Provides: mx2 = %{version}-%{release}
-Obsoletes: mx2
+Obsoletes: mx2 <= %{version}-%{release}
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -24,52 +24,102 @@
 The mx extensions for Python are a collection of Python software tools
 which enhance Python's usability in many areas.
 
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Development files for %{name}
+
 %prep
 %setup -q -n egenix-mx-base-%{version}
-%patch1 -p1
-%patch2 -p1
+%patch1 -p1 -b .longyear
+%patch2 -p1 -b .lib64
 
 %build
+# alter /usr/local/bin/python
+for file in mx/DateTime/Examples/Y2000.py mx/Misc/OrderedMapping.py \
+    mx/TextTools/Examples/pytag.py mx/TextTools/Examples/Loop.py \
+    mx/TextTools/Examples/Python.py mx/DateTime/Examples/AtomicClock.py \
+    mx/TextTools/Examples/mysplit.py mx/TextTools/Examples/HTML.py \
+    mx/DateTime/Examples/alarm.py mx/TextTools/Examples/RegExp.py \
+    mx/TextTools/Examples/altRTF.py mx/TextTools/Examples/Words.py \
+    mx/TextTools/Examples/RTF.py mx/Misc/FileLock.py ; do
+    sed -i -e 's!/usr/local/bin/python!%{_bindir}/python!' ${file}
+done
+
+# These just have test cases and aren't meant to be run
+for file in mx/Log.py mx/BeeBase/FileLock.py mx/Misc/OrderedMapping.py \
+    mx/Misc/FileLock.py ; do
+    sed -i -e '/^#!.*python\b/d' ${file}
+done
+
+
 CFLAGS="$RPM_OPT_FLAGS" python setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES 
+rm -rf %{buildroot}
+python setup.py install --skip-build --root=%{buildroot} 
 
-mkdir -p $RPM_BUILD_ROOT%{_includedir}
-for I in `find $RPM_BUILD_ROOT/usr/%{_lib}/python*/site-packages/mx -name '*.h'`; do
-	mv $I $RPM_BUILD_ROOT%{_includedir}
+pushd %{buildroot}%{python_sitearch}
+for I in `find . -name '*.h'`; do
+    mkdir -p %{buildroot}%{_includedir}/`dirname $I`
+    mv $I %{buildroot}%{_includedir}/`dirname $I`
 done
-install -m444 mx/BeeBase/mxBeeBase/mxh.h $RPM_BUILD_ROOT%{_includedir}
+popd
+
+# Examples, tests, benchmarks
+BASEDIR=%{buildroot}%{python_sitearch}
+mkdir examples
+mv ${BASEDIR}/mx/TextTools/mxTextTools/testkj.py examples/
+mv ${BASEDIR}/mx/Stack/stackbench.py examples/
+mv ${BASEDIR}/mx/Queue/queuebench.py examples/
+mv ${BASEDIR}/mx/DateTime/mxDateTime/test.py examples/
+# This is a utility.  If it's deemed useful to the general public it should
+# be installed in %{_bindir} instead of examples
+mv ${BASEDIR}/mx/BeeBase/showBeeDict.py examples/
 
 # These files are documentation, and are in a bad location
 mkdir docs
-mv -f $RPM_BUILD_ROOT/usr/%{_lib}/python*/site-packages/mx/{LICENSE,COPYRIGHT} docs/
-rm -fr $RPM_BUILD_ROOT/usr/%{_lib}/python*/site-packages/mx/Doc
+mv -f ${BASEDIR}/mx/{LICENSE,COPYRIGHT} docs/
+rm -rf ${BASEDIR}/mx/Doc
 DESTDIR=`pwd`/docs
-pushd $RPM_BUILD_ROOT/usr/%{_lib}/python*/site-packages/mx/
-cp -r --parents */Doc/* $DESTDIR/
+pushd ${BASEDIR}/mx
+cp -r --parents */Doc/* ${DESTDIR}/
+cp -r --parents */Examples/* ${DESTDIR}/
 popd
-rm -rf $RPM_BUILD_ROOT/usr/%{_lib}/python*/site-packages/mx/*/Doc/
-
-# Don't include the examples
-rm -fr $RPM_BUILD_ROOT/usr/%{_lib}/python*/site-packages/mx/*/Examples
+rm -rf ${BASEDIR}/mx/*/Doc/
+rm -rf ${BASEDIR}/mx/*/Examples
+rm -rf docs/*/Examples/*.pyc
+rm -rf docs/*/Examples/*.pyo
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files 
-%defattr(-,root,root) 
+%defattr(-,root,root,-)
 %doc README docs/*
-%{_includedir}/*.h
-%{_libdir}/python*/site-packages/mx
+%{python_sitearch}/mx
+%{python_sitearch}/egenix_mx_base*.egg-info
 
-%changelog
-* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.6-5
-- fix license tag
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/mx/
 
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.6-4
-- Autorebuild for GCC 4.3
+%changelog
+* Mon Sep 15 2008 Toshio Kuratomi <toshio at fedoraproject.org> 3.1.1-2
+- Restore debug package
+- Clean up the python site-packages handling
+- Clean up handling of documentation, examples, scripts
+
+* Mon Sep 15 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 3.1.1-1
+- bump to newest release
+- patch fixes
+- spec file fixes
+- branch new devel sub package
+- fixes to permissions
+- removed debug-package (empty)
 
 * Thu Dec  7 2006 Jeremy Katz <katzj at redhat.com> - 2.0.6-3
 - rebuild against python 2.5
@@ -120,19 +170,19 @@
 * Fri Jun 21 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Wed May 29 2002 Trond Eivind Glomsrød <teg at redhat.com> 2.0.3-4
+* Wed May 29 2002 Trond Eivind GlomsrÃ¸d <teg at redhat.com> 2.0.3-4
 - Make it require python >= 2.2, < 2.3
 
 * Sun May 26 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Thu May 23 2002 Trond Eivind Glomsrød <teg at redhat.com> 2.0.3-2
+* Thu May 23 2002 Trond Eivind GlomsrÃ¸d <teg at redhat.com> 2.0.3-2
 - Move to python 2.2
 
-* Wed Mar 13 2002 Trond Eivind Glomsrød <teg at redhat.com> 2.0.3-1
+* Wed Mar 13 2002 Trond Eivind GlomsrÃ¸d <teg at redhat.com> 2.0.3-1
 - 2.0.3
 
-* Wed Feb 27 2002 Trond Eivind Glomsrød <teg at redhat.com> 2.0.2-5
+* Wed Feb 27 2002 Trond Eivind GlomsrÃ¸d <teg at redhat.com> 2.0.2-5
 - Rebuild (and no, it wasn't broken. It just used /usr/bin/python
   as the version to build for)
 
@@ -142,15 +192,13 @@
 * Wed Jan 09 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Mon Oct  1 2001 Trond Eivind Glomsrød <teg at redhat.com> 2.0.2-2
+* Mon Oct  1 2001 Trond Eivind GlomsrÃ¸d <teg at redhat.com> 2.0.2-2
 - detect python version when building
 - 64bit fix mxDateTime
 
-* Fri Sep 14 2001 Trond Eivind Glomsrød <teg at redhat.com> 2.0.2-1
+* Fri Sep 14 2001 Trond Eivind GlomsrÃ¸d <teg at redhat.com> 2.0.2-1
 - 2.0.2
 - Build for Python 2.2
 
-* Tue Jun 19 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Jun 19 2001 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - Initial build. Needed for python DB API
-
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mx/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Feb 2005 20:05:43 -0000	1.6
+++ sources	17 Sep 2008 21:09:51 -0000	1.7
@@ -1 +1 @@
-66841151728a06f92d0b8dd2ed317a29  egenix-mx-base-2.0.6.tar.gz
+d0f3b1adca33a68867bf50f000060cd6  egenix-mx-base-3.1.1.tar.gz


--- egenix-mx-base-2.0.1-longyear.patch DELETED ---


--- egenix-mx-base-2.0.2-pyconfig.patch DELETED ---


--- egenix-mx-base-2.0.5-lib64.patch DELETED ---


