From e818a239d19ec6a299ecba507b8cb6b6869372369f997449cc3362c85325c18e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 19 Dec 2008 14:13:49 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python?expand=0&rev=29 --- python-base.changes | 5 +++++ python-base.spec | 9 +++++---- python-doc.spec | 2 +- python.changes | 6 ++++++ python.spec | 25 ++++++++++++++----------- 5 files changed, 31 insertions(+), 16 deletions(-) diff --git a/python-base.changes b/python-base.changes index fd08bea..2525048 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 15 17:10:17 CET 2008 - matejcik@suse.cz + +- removed bsddb directory from python-base, reenabled in python + ------------------------------------------------------------------- Mon Oct 20 15:18:30 CEST 2008 - matejcik@suse.cz diff --git a/python-base.spec b/python-base.spec index fd119d5..8da149b 100644 --- a/python-base.spec +++ b/python-base.spec @@ -28,7 +28,7 @@ Group: Development/Languages/Python AutoReqProv: on Summary: Python Interpreter base package Version: 2.6.0 -Release: 2 +Release: 3 #%define tarname Python-%{version} %define tarname Python-2.6 Source0: %{tarname}.tar.bz2 @@ -221,7 +221,7 @@ rm $RPM_BUILD_ROOT%{_bindir}/idle #rm -r $RPM_BUILD_ROOT%{_includedir}/python #rm -r $RPM_BUILD_ROOT%{_includedir}/python%{python_version} #rm $RPM_BUILD_ROOT%{_libdir}/libpython%{python_version}.so -rm -r $CLEANUP_DIR/{curses,idlelib,lib-tk,sqlite3} +rm -r $CLEANUP_DIR/{curses,bsddb,idlelib,lib-tk,sqlite3} rm $CLEANUP_DIR/ssl.py* # does not work without _ssl.so anyway %if %suse_version >= 1030 @@ -290,7 +290,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/python%{python_version}/config/Setup %{_libdir}/python%{python_version}/config/Makefile %{_libdir}/python%{python_version}/*.* -%{_libdir}/python%{python_version}/bsddb %{_libdir}/python%{python_version}/compiler %{_libdir}/python%{python_version}/ctypes %{_libdir}/python%{python_version}/distutils @@ -377,6 +376,8 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/python2 %changelog +* Mon Dec 15 2008 matejcik@suse.cz +- removed bsddb directory from python-base, reenabled in python * Mon Oct 20 2008 matejcik@suse.cz - added libpython and python-base to baselibs.conf (bnc#432677) - disabled test_smtplib for ia64 so that the package actually @@ -395,7 +396,7 @@ rm -rf $RPM_BUILD_ROOT - update to 2.6rc2 - included patch for https proxy support that resolves bnc#214983 (in a proper way) and bnc#298378 -* Thu Sep 18 2008 matejcik@suse.cz +* Wed Sep 17 2008 matejcik@suse.cz - included /etc/rpm/macros.python to fix the split-caused breakage * Tue Sep 16 2008 matejcik@suse.cz - applied bug-no-proxy patch from python#3879, which should improve diff --git a/python-doc.spec b/python-doc.spec index 7017631..ecb76e6 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -24,7 +24,7 @@ Group: Development/Languages/Python BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. Version: 2.6 -Release: 2 +Release: 3 %define pyver 2.6 BuildArch: noarch %define tarname Python-%{pyver} diff --git a/python.changes b/python.changes index fe53277..c34c36c 100644 --- a/python.changes +++ b/python.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 15 17:10:17 CET 2008 - matejcik@suse.cz + +- reenabled bsddb module, so that dependent packages can build + ( bnc#441088 ) + ------------------------------------------------------------------- Thu Oct 9 18:57:43 CEST 2008 - matejcik@suse.cz diff --git a/python.spec b/python.spec index 409e8a6..09cd6f5 100644 --- a/python.spec +++ b/python.spec @@ -30,7 +30,7 @@ AutoReqProv: on Obsoletes: python-nothreads python21 python-elementtree python-sqlite Summary: Python Interpreter Version: 2.6.0 -Release: 2 +Release: 3 Requires: python-base = %{version} #%define tarname Python-%{version} %define tarname Python-2.6 @@ -263,7 +263,6 @@ rm $RPM_BUILD_ROOT%{_bindir}/python%{python_version}-config rm $RPM_BUILD_ROOT%{_bindir}/python-config rm -r $RPM_BUILD_ROOT%{_includedir}/python rm -r $RPM_BUILD_ROOT%{_includedir}/python%{python_version} -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/bsddb rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/compiler rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/config rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/ctypes @@ -283,7 +282,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/libpython%{python_version}.so rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/site-packages/README rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_bisect.so rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_bytesio.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_bsddb.so rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_csv.so rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_collections.so rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_ctypes.so @@ -428,14 +426,19 @@ rm -rf $RPM_BUILD_ROOT %config /etc/profile.d/python.* %dir %{_libdir}/python%{python_version} %{_libdir}/python%{python_version}/ssl.py* +%{_libdir}/python%{python_version}/bsddb %{_libdir}/python%{python_version}/sqlite3 %dir %{_libdir}/python%{python_version}/lib-dynload +%{_libdir}/python%{python_version}/lib-dynload/_bsddb.so %{_libdir}/python%{python_version}/lib-dynload/_hashlib.so %{_libdir}/python%{python_version}/lib-dynload/_sqlite3.so %{_libdir}/python%{python_version}/lib-dynload/_ssl.so %{_libdir}/python%{python_version}/lib-dynload/readline.so %changelog +* Mon Dec 15 2008 matejcik@suse.cz +- reenabled bsddb module, so that dependent packages can build + ( bnc#441088 ) * Thu Oct 09 2008 matejcik@suse.cz - update to 2.6 (version name is 2.6.0 to prevent upgrade problems) - don't run the whole test suite, only run tests for @@ -739,7 +742,7 @@ rm -rf $RPM_BUILD_ROOT was executed with -i parameter. * Tue Jul 29 2003 ro@suse.de - added tk-devel to neededforbuild -* Fri Jun 27 2003 mcihar@suse.cz +* Thu Jun 26 2003 mcihar@suse.cz - updated to cvs snapshot, mostly because of finally correct DESTDIR support, to avoid buildroot leftovers * Tue Jun 24 2003 mcihar@suse.cz @@ -845,7 +848,7 @@ rm -rf $RPM_BUILD_ROOT - Add provides for correct update * Thu Sep 05 2002 ro@suse.de - remove l2h from neededforbuild (apparently no longer used) -* Thu Aug 15 2002 ro@suse.de +* Wed Aug 14 2002 ro@suse.de - no fpectl.so on alpha * Tue Aug 13 2002 uli@suse.de - rediffed lib64 patch @@ -857,7 +860,7 @@ rm -rf $RPM_BUILD_ROOT - clean part added to spec * Sun Jul 28 2002 kukuk@suse.de - removed termcap and tetex from neededforbuild (not used) -* Sat Jul 27 2002 adrian@suse.de +* Fri Jul 26 2002 adrian@suse.de - fix neededforbuild * Tue Jun 11 2002 meissner@suse.de - add ppc64 to list of 64bit archs that don't compile 3 of the plugins. @@ -876,7 +879,7 @@ rm -rf $RPM_BUILD_ROOT have to reside in */lib64 * Wed May 15 2002 coolo@suse.de - fixing file list for s390x -* Wed May 15 2002 ro@suse.de +* Tue May 14 2002 ro@suse.de - use libdir - try to get this working with lib64 * Mon May 06 2002 schwab@suse.de @@ -961,7 +964,7 @@ rm -rf $RPM_BUILD_ROOT - Use libtk8.3.so and libtcl8.3.so * Thu May 04 2000 kukuk@suse.de - Fix filelist for new doc dir -* Tue Mar 14 2000 ro@suse.de +* Mon Mar 13 2000 ro@suse.de - fixed filelist for alpha * Wed Mar 01 2000 werner@suse.de - Fix config.guess selection @@ -993,10 +996,10 @@ rm -rf $RPM_BUILD_ROOT to have better base-package compatibility to andrich.net. * Thu Mar 18 1999 ro@suse.de - don't set POSIXLY_CORRECT for second patch -* Tue Jan 19 1999 ro@suse.de +* Mon Jan 18 1999 ro@suse.de - added automake to neededforbuild - alpha-fix: don't mix up dec-osf with linux-alpha -* Wed Dec 02 1998 mt@suse.de +* Tue Dec 01 1998 mt@suse.de - removed TkInter into a separate package - pyth_tk - to make it possible to replace it with a PIL based TkInter (Python Imaging Lib) and better package dependecies (not each app needs TkInter) @@ -1019,7 +1022,7 @@ rm -rf $RPM_BUILD_ROOT - python modules - file permissions changed (-x) * Sat Jul 11 1998 bs@suse.de - fixed neededforbuild -* Thu Jul 09 1998 mt@suse.de +* Wed Jul 08 1998 mt@suse.de - new revision 1.5.1 - docu in a separate package (pyth_doc) - Tkinter uses tk8.0/tcl8.0 now