Hello community, here is the log from the commit of package python for openSUSE:Factory checked in at 2012-03-05 14:03:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python (Old) and /work/SRC/openSUSE:Factory/.python.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python", Maintainer is "jmate...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/python/python-base.changes 2011-10-02 10:25:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python.new/python-base.changes 2012-03-05 14:03:05.000000000 +0100 @@ -1,0 +2,18 @@ +Mon Dec 12 13:39:57 UTC 2011 - toddrme2...@gmail.com + +- Exclude /usr/bin/2to3 to prevent conflicts with python3-2to3 + +------------------------------------------------------------------- +Thu Dec 8 13:31:01 UTC 2011 - jmate...@suse.com + +- %python_version now correctly refers to %tarversion + +------------------------------------------------------------------- +Mon Nov 28 09:21:32 UTC 2011 - sasc...@suse.de + +- Spec file cleanup: + * Run spec-cleaner + * Remove outdated %clean section, AutoReqProv and authors from descr. +- Fix license to Python-2.0 (also SPDX style) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python/python-doc.changes 2011-09-23 12:42:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python.new/python-doc.changes 2012-03-05 14:03:05.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Nov 28 09:21:32 UTC 2011 - sasc...@suse.de + +- Spec file cleanup: + * Run spec-cleaner + * Remove outdated %clean section, AutoReqProv and authors from descr. +- Fix license to Python-2.0 (also SPDX style) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python/python.changes 2011-12-02 09:28:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python.new/python.changes 2012-03-05 14:03:05.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Dec 8 13:30:29 UTC 2011 - jmate...@suse.com + +- %python_version now correctly refers to %tarversion + +------------------------------------------------------------------- +Thu Dec 01 09:21:32 UTC 2011 - sasc...@suse.de + +- Spec file cleanup: + * Run spec-cleaner + * Remove outdated %clean section, AutoReqProv and authors from descr. +- Fix license to Python-2.0 (also SPDX style) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-base.spec ++++++ --- /var/tmp/diff_new_pack.IdweCR/_old 2012-03-05 14:03:07.000000000 +0100 +++ /var/tmp/diff_new_pack.IdweCR/_new 2012-03-05 14:03:07.000000000 +0100 @@ -18,18 +18,12 @@ Name: python-base -BuildRequires: fdupes pkg-config zlib-devel automake +Version: 2.7.2 +Release: 0 +License: Python-2.0 +Summary: Python Interpreter base package Url: http://www.python.org/ -License: MIT License (or similar) Group: Development/Languages/Python -# bug437293 -%ifarch ppc64 -Obsoletes: python-64bit -%endif -# -Summary: Python Interpreter base package -Version: 2.7.2 -Release: 1 %define tarversion %{version} %define tarname Python-%{tarversion} Source0: %{tarname}.tar.bz2 @@ -54,12 +48,19 @@ Patch13: python-2.7.2-fix_date_time_compiler.patch Patch14: python-2.7.1-urllib-noproxy.patch # COMMON-PATCH-END -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define python_version %(echo %{version} | head -c 3) +%define python_version %(echo %{tarversion} | head -c 3) +BuildRequires: automake +BuildRequires: fdupes +BuildRequires: pkg-config +BuildRequires: zlib-devel +# explicitly, see bnc#697251: +Requires: libpython2_7-1_0 = %{version} Provides: %{name} = %{python_version} - -# explicitly, see bnc#697251 -Requires: libpython2_7-1_0 = %{version}-%{release} +# bug437293 +%ifarch ppc64 +Obsoletes: python-64bit +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Python is an interpreted, object-oriented programming language, and is @@ -70,18 +71,11 @@ This package contains all of stand-alone Python files, minus binary modules that would pull in extra dependencies. - - -Authors: --------- - Guido van Rossum <gu...@python.org> - %package -n python-devel -License: Python License .. -Requires: python-base = %{version} glibc-devel Summary: Include Files and Libraries Mandatory for Building Python Modules Group: Development/Languages/Python -AutoReqProv: on +Requires: glibc-devel +Requires: python-base = %{version} %description -n python-devel The Python programming language's interpreter can be extended with @@ -91,34 +85,21 @@ tools for building Python modules, extending the Python interpreter or embedding Python in applications. - - -Authors: --------- - Guido van Rossum <gu...@python.org> - %package -n python-xml -License: Python License .. -Requires: python-base = %{version} Summary: A Python XML Interface Group: Development/Libraries/Python +Requires: python-base = %{version} # pyxml used to live out of tree Provides: pyxml = 0.8.5 Obsoletes: pyxml < 0.8.5 -AutoReqProv: on %description -n python-xml The expat module is a Python interface to the expat XML parser. Since Python2.x, it is part of the core Python distribution. - - %package -n libpython2_7-1_0 -License: MIT License (or similar) Summary: Python Interpreter shared library Group: Development/Languages/Python -AutoReqProv: on -#%description -n libpython%{lib_version} %description -n libpython2_7-1_0 Python is an interpreted, object-oriented programming language, and is @@ -129,12 +110,6 @@ This package contains libpython2.6 shared library for embedding in other applications. - - -Authors: --------- - Guido van Rossum <gu...@python.org> - %prep %setup -q -n %{tarname} # patching @@ -159,21 +134,18 @@ sed -i 's/^version_required/dnl version_required/' configure.in %build -export OPT="$RPM_OPT_FLAGS" +export OPT="%{optflags}" autoreconf -f -i . # Modules/_ctypes/libffi # provide a stable timestamp -touch -r %{S:0} Makefile.pre.in +touch -r %{SOURCE0} Makefile.pre.in # prevent make from trying to rebuild asdl stuff, which requires existing # python installation touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h -./configure \ - --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ +%configure \ --docdir=%{_docdir}/python \ --with-fpectl \ --enable-ipv6 \ @@ -181,9 +153,7 @@ --enable-unicode=ucs4 LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH \ - make %{?_smp_mflags} \ - DESTDIR=$RPM_BUILD_ROOT \ - profile-opt + make %{?_smp_mflags} profile-opt %check # on hppa, the threading of glibc is quite broken. The tests just stop @@ -219,64 +189,53 @@ ######################################## # install it ######################################## -make \ - OPT="$RPM_OPT_FLAGS -fPIC" \ - DESTDIR=$RPM_BUILD_ROOT \ - install +%make_install OPT="%{optflags} -fPIC" # install site-specific tweaks -ln -s python%{python_version} ${RPM_BUILD_ROOT}%{_bindir}/python2 -install -m 644 %{S:4} ${RPM_BUILD_ROOT}%{_libdir}/python%{python_version}/distutils -install -m 644 %{S:5} ${RPM_BUILD_ROOT}%{_libdir}/python%{python_version}/site-packages -install -d -m 755 ${RPM_BUILD_ROOT}/etc/rpm -install -m 644 %{S:1} ${RPM_BUILD_ROOT}/etc/rpm +ln -s python%{python_version} %{buildroot}%{_bindir}/python2 +install -m 644 %{SOURCE4} %{buildroot}%{_libdir}/python%{python_version}/distutils +install -m 644 %{SOURCE5} %{buildroot}%{_libdir}/python%{python_version}/site-packages +install -d -m 755 %{buildroot}%{_sysconfdir}/rpm +install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm # make sure /usr/lib/python/site-packages exists even on lib64 machines -mkdir -p ${RPM_BUILD_ROOT}/usr/lib/python%{python_version}/site-packages +mkdir -p %{buildroot}%{_prefix}/lib/python%{python_version}/site-packages ######################################## # some cleanups ######################################## # remove hard links and replace them with symlinks for dir in bin include %{_lib} ; do - rm -f $RPM_BUILD_ROOT/%{_prefix}/$dir/python - ln -s python%{python_version} $RPM_BUILD_ROOT/%{_prefix}/$dir/python + rm -f %{buildroot}/%{_prefix}/$dir/python + ln -s python%{python_version} %{buildroot}/%{_prefix}/$dir/python done -CLEANUP_DIR="$RPM_BUILD_ROOT%{_libdir}/python%{python_version}" +CLEANUP_DIR="%{buildroot}%{_libdir}/python%{python_version}" # don't distribute precompiled windows installers (duh) rm -f $CLEANUP_DIR/distutils/command/*.exe # kill imageop.so and audioop.so, they are rarely used and insecure rm -f $CLEANUP_DIR/lib-dynload/imageop.so rm -f $CLEANUP_DIR/lib-dynload/audioop.so # remove various things that don't need to be in python-base -rm $RPM_BUILD_ROOT%{_bindir}/idle +rm %{buildroot}%{_bindir}/idle rm -rf $CLEANUP_DIR/{curses,bsddb,idlelib,lib-tk,sqlite3} rm $CLEANUP_DIR/ssl.py* # does not work without _ssl.so anyway # replace duplicate .pyo/.pyc with hardlinks -%fdupes $RPM_BUILD_ROOT/%{_libdir}/python%{python_version} +%fdupes %{buildroot}/%{_libdir}/python%{python_version} ######################################## # documentation ######################################## -export PDOCS=${RPM_BUILD_ROOT}%{_docdir}/%{name} +export PDOCS=%{buildroot}%{_docdir}/%{name} install -d -m 755 $PDOCS -install -c -m 644 %{S:3} $PDOCS/ +install -c -m 644 %{SOURCE3} $PDOCS/ install -c -m 644 LICENSE $PDOCS/ install -c -m 644 README $PDOCS/ -ln -s python%{python_version}.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/python.1.gz +ln -s python%{python_version}.1.gz %{buildroot}%{_mandir}/man1/python.1.gz ######################################## # devel ######################################## # install Makefile.pre.in and Makefile.pre -cp Makefile Makefile.pre.in Makefile.pre $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/config/ - -%clean -rm -rf $RPM_BUILD_ROOT -#%post -n libpython%{lib_version} - -%post -n libpython2_7-1_0 -%{run_ldconfig} -#%postun -n libpython%{lib_version} +cp Makefile Makefile.pre.in Makefile.pre %{buildroot}%{_libdir}/python%{python_version}/config/ -%postun -n libpython2_7-1_0 -%{run_ldconfig} +%post -n libpython2_7-1_0 -p %{run_ldconfig} +%postun -n libpython2_7-1_0 -p %{run_ldconfig} %files -n python-devel %defattr(-, root, root) @@ -298,7 +257,6 @@ %defattr(644, root, root, 755) %{_libdir}/python%{python_version}/xml %{_libdir}/python%{python_version}/lib-dynload/pyexpat.so -#%files -n libpython%{lib_version} %files -n libpython2_7-1_0 %defattr(644, root, root) @@ -306,7 +264,7 @@ %files %defattr(644, root, root, 755) -%config /etc/rpm/macros.python +%config %{_sysconfdir}/rpm/macros.python %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/README %doc %{_docdir}/%{name}/LICENSE @@ -316,8 +274,8 @@ %dir %{_includedir}/python%{python_version} %{_includedir}/python%{python_version}/pyconfig.h %{_libdir}/python -%dir /usr/lib/python%{python_version} -%dir /usr/lib/python%{python_version}/site-packages +%dir %{_prefix}/lib/python%{python_version} +%dir %{_prefix}/lib/python%{python_version}/site-packages %dir %{_libdir}/python%{python_version} %dir %{_libdir}/python%{python_version}/config %{_libdir}/python%{python_version}/config/Setup @@ -343,13 +301,13 @@ %{_libdir}/python%{python_version}/site-packages/_local.pth %dir %{_libdir}/python%{python_version}/lib-dynload %{_libdir}/python%{python_version}/lib-dynload/_bisect.so -#%{_libdir}/python%{python_version}/lib-dynload/_bytesio.so +#%%{_libdir}/python%%{python_version}/lib-dynload/_bytesio.so %{_libdir}/python%{python_version}/lib-dynload/_csv.so %{_libdir}/python%{python_version}/lib-dynload/_collections.so %{_libdir}/python%{python_version}/lib-dynload/_ctypes.so %{_libdir}/python%{python_version}/lib-dynload/_ctypes_test.so %{_libdir}/python%{python_version}/lib-dynload/_elementtree.so -#%{_libdir}/python%{python_version}/lib-dynload/_fileio.so +#%%{_libdir}/python%%{python_version}/lib-dynload/_fileio.so %{_libdir}/python%{python_version}/lib-dynload/_functools.so %{_libdir}/python%{python_version}/lib-dynload/_heapq.so %{_libdir}/python%{python_version}/lib-dynload/_hotshot.so @@ -396,7 +354,7 @@ %{_libdir}/python%{python_version}/lib-dynload/zlib.so %{_libdir}/python%{python_version}/lib-dynload/_codecs*.so %{_libdir}/python%{python_version}/lib-dynload/_multibytecodec.so -%{_libdir}/python%{python_version}/lib-dynload/Python-%{tarversion}-py%{python_version}.egg-info +%{_libdir}/python%{python_version}/lib-dynload/Python-%{version}-py%{python_version}.egg-info # these modules don't support 64-bit arches (disabled by setup.py) %ifnarch alpha ia64 x86_64 s390x ppc64 sparc64 # requires sizeof(int) == sizeof(long) == sizeof(char*) @@ -404,9 +362,9 @@ %endif %attr(755, root, root) %{_bindir}/pydoc %attr(755, root, root) %{_bindir}/python -%attr(755, root, root) %{_bindir}/2to3 %attr(755, root, root) %{_bindir}/python%{python_version} %attr(755, root, root) %{_bindir}/smtpd.py %{_bindir}/python2 +%exclude %{_bindir}/2to3 %changelog ++++++ python-doc.spec ++++++ --- /var/tmp/diff_new_pack.IdweCR/_old 2012-03-05 14:03:07.000000000 +0100 +++ /var/tmp/diff_new_pack.IdweCR/_new 2012-03-05 14:03:07.000000000 +0100 @@ -18,51 +18,42 @@ Name: python-doc +Version: 2.7 +Release: 0 +License: Python-2.0 +Summary: Additional Package Documentation for Python Url: http://www.python.org/ -License: Python License .. Group: Development/Languages/Python -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Additional Package Documentation for Python. -Version: 2.7 -Release: 5 %define pyver 2.7.2 -BuildArch: noarch %define tarname Python-%{pyver} -%define pyname python -Enhances: %{pyname}=%{pyver} Source0: %{tarname}.tar.bz2 Source1: python-%{version}-docs-html.tar.bz2 Source2: python-%{version}-docs-pdf-a4.tar.bz2 Source3: python-%{version}-docs-pdf-letter.tar.bz2 -Provides: pyth_doc pyth_ps -Obsoletes: pyth_doc pyth_ps +Provides: pyth_doc +Provides: pyth_ps +Obsoletes: pyth_doc +Obsoletes: pyth_ps +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch +Enhances: python = %{pyver} %description Tutorial, Global Module Index, Language Reference, Library Reference, Extending and Embedding Reference, Python/C API Reference, Documenting Python, and Macintosh Module Reference in HTML format. - - %package pdf -License: Python License .. -Provides: pyth_pdf -Obsoletes: pyth_pdf Summary: Python PDF Documentation Group: Development/Languages/Python -AutoReqProv: on +Provides: pyth_pdf +Obsoletes: pyth_pdf %description pdf Tutorial, Global Module Index, Language Reference, Library Reference, Extending and Embedding Reference, Python/C API Reference, Documenting Python, and Macintosh Module Reference in PDF format. - - -Authors: --------- - Guido van Rossum <gu...@python.org> - %prep %setup -q -n %{tarname} @@ -70,14 +61,14 @@ # nothing to do (...whistles innocently) %install -export PDOCS=${RPM_BUILD_ROOT}%{_docdir}/%{pyname} +export PDOCS=%{buildroot}%{_docdir}/python install -d -m 755 $PDOCS/Misc install -d -m 755 $PDOCS/paper-a4 $PDOCS/paper-letter $PDOCS/html -tar xfj %{S:1} -C $PDOCS/ +tar xfj %{SOURCE1} -C $PDOCS/ mv $PDOCS/python-%{version}-docs-html $PDOCS/html -tar xfj %{S:2} -C $PDOCS +tar xfj %{SOURCE2} -C $PDOCS mv $PDOCS/docs-pdf $PDOCS/paper-a4 -tar xfj %{S:3} -C $PDOCS +tar xfj %{SOURCE3} -C $PDOCS mv $PDOCS/docs-pdf $PDOCS/paper-letter install -c -m 644 Doc/ACKS.txt $PDOCS/ACKS.txt install -c -m 644 README $PDOCS/README @@ -85,20 +76,17 @@ [ -f $i ] && install -c -m 644 $i $PDOCS/Misc/ done -%clean -rm -rf $RPM_BUILD_ROOT - %files -%defattr(644, root, root, 755) -%dir %{_docdir}/%{pyname} -%doc %{_docdir}/%{pyname}/Misc -%doc %{_docdir}/%{pyname}/html -%doc %{_docdir}/%{pyname}/ACKS.txt -%doc %{_docdir}/%{pyname}/README +%defattr(644,root,root,755) +%dir %{_docdir}/python +%doc %{_docdir}/python/Misc +%doc %{_docdir}/python/html +%doc %{_docdir}/python/ACKS.txt +%doc %{_docdir}/python/README %files pdf -%defattr(644, root, root, 755) -%doc %{_docdir}/%{pyname}/paper-a4 -%doc %{_docdir}/%{pyname}/paper-letter +%defattr(644,root,root,755) +%doc %{_docdir}/python/paper-a4 +%doc %{_docdir}/python/paper-letter %changelog ++++++ python.spec ++++++ --- /var/tmp/diff_new_pack.IdweCR/_old 2012-03-05 14:03:07.000000000 +0100 +++ /var/tmp/diff_new_pack.IdweCR/_new 2012-03-05 14:03:07.000000000 +0100 @@ -15,23 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: python -BuildRequires: db-devel fdupes gdbm-devel gmp-devel libbz2-devel libopenssl-devel ncurses-devel readline-devel sqlite-devel tk-devel xorg-x11-devel automake -#Requires: openssl >= 0.9.8e +Version: 2.7.2 +Release: 0 +License: Python-2.0 +Summary: Python Interpreter Url: http://www.python.org/ -License: MIT License (or similar) Group: Development/Languages/Python -AutoReqProv: on -# bug437293 -%ifarch ppc64 -Obsoletes: python-64bit -%endif -# -Obsoletes: python-nothreads python21 python-elementtree python-sqlite -Summary: Python Interpreter -Version: 2.7.2 -Release: 5 -Requires: python-base = %{version} %define tarversion %{version} %define tarname Python-%{tarversion} Source0: %{tarname}.tar.bz2 @@ -62,10 +54,31 @@ Patch13: python-2.7.2-fix_date_time_compiler.patch Patch14: python-2.7.1-urllib-noproxy.patch # COMMON-PATCH-END -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define python_version %(echo %{version} | head -c 3) +BuildRequires: automake +BuildRequires: db-devel +BuildRequires: fdupes +BuildRequires: gdbm-devel +BuildRequires: gmp-devel +BuildRequires: libbz2-devel +BuildRequires: libopenssl-devel +BuildRequires: ncurses-devel +BuildRequires: readline-devel +BuildRequires: sqlite-devel +BuildRequires: tk-devel +BuildRequires: xorg-x11-devel +%define python_version %(echo %{tarversion} | head -c 3) %define idle_name idle +Requires: python-base = %{version} Provides: %{name} = %{python_version} +Obsoletes: python-elementtree +Obsoletes: python-nothreads +Obsoletes: python-sqlite +Obsoletes: python21 +# bug437293 +%ifarch ppc64 +Obsoletes: python-64bit +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Python is an interpreted, object-oriented programming language, and is @@ -76,16 +89,11 @@ If you want to install third party modules using distutils, you need to install python-devel package. -Authors: --------- - Guido van Rossum <gu...@python.org> - %package idle -License: Python License .. -Requires: python-base = %{version} python-tk Summary: An Integrated Development Environment for Python Group: Development/Languages/Python -AutoReqProv: on +Requires: python-base = %{version} +Requires: python-tk %description idle IDLE is a Tkinter based integrated development environment for Python. @@ -93,81 +101,58 @@ colorizing, and many other things, as well as a Python shell window and a debugger. -Authors: --------- - Guido van Rossum <gu...@python.org> - %package demo -License: Python License .. -Provides: pyth_dmo -Obsoletes: pyth_dmo -Requires: python-base = %{version} Summary: Python Demonstration Scripts Group: Development/Languages/Python -AutoReqProv: on +Requires: python-base = %{version} +Provides: pyth_dmo +Obsoletes: pyth_dmo %description demo Various demonstrations of what you can do with Python and a number of programs that are useful for building or extending Python. -Authors: --------- - Guido van Rossum <gu...@python.org> - %package tk -License: Python License .. -Provides: pyth_tk python_tkinter_lib pyth_tkl python-tkinter +Summary: TkInter - Python Tk Interface +Group: Development/Libraries/Python +Requires: python-base = %{version} +Provides: pyth_tk +Provides: pyth_tkl +Provides: python-tkinter +Provides: python_tkinter_lib #%ifarch %ix86 #Provides: _tkinter.so #%endif -Obsoletes: pyth_tk pyth_tkl python-tkinter -Requires: python-base = %{version} -Summary: TkInter - Python Tk Interface -Group: Development/Libraries/Python -AutoReqProv: on +Obsoletes: pyth_tk +Obsoletes: pyth_tkl +Obsoletes: python-tkinter %description tk Python interface to Tk. Tk is the GUI toolkit that comes with Tcl. The "xrpm" package uses this Python interface. -Authors: --------- - Guido van Rossum <gu...@python.org> - %package curses -License: Python License .. +Summary: Python Interface to the (N)Curses Library +Group: Development/Libraries/Python Requires: python-base = %{version} Obsoletes: pyth_cur Provides: pyth_cur -Summary: Python Interface to the (N)Curses Library -Group: Development/Libraries/Python -AutoReqProv: on %description curses An easy to use interface to the (n)curses CUI library. CUI stands for Console User Interface. -Authors: --------- - Guido van Rossum <gu...@python.org> - %package gdbm -License: MIT License (or similar) +Summary: Python Interface to the GDBM Library +Group: Development/Libraries/Python Requires: python-base = %{version} Obsoletes: pygdmod Provides: pygdmod -Summary: Python Interface to the GDBM Library -Group: Development/Libraries/Python -AutoReqProv: on %description gdbm An easy to use interface for GDBM databases. GDBM is the GNU implementation of the standard Unix DBM databases. -Authors: --------- - Guido van Rossum <gu...@python.org> - %prep %setup -q -n %{tarname} # COMMON-PREP-BEGIN @@ -197,24 +182,21 @@ # necessary for correct linking with GDBM: export SUSE_ASNEEDED=0 -export OPT="$RPM_OPT_FLAGS" +export OPT="%{optflags}" autoreconf -f -i . # Modules/_ctypes/libffi # prevent make from trying to rebuild asdl stuff, which requires existing # python installation touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h -./configure \ - --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ +%configure \ --docdir=%{_docdir}/python \ --enable-ipv6 \ --with-fpectl \ --enable-shared \ --enable-unicode=ucs4 -make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT +make %{?_smp_mflags} %check # on hppa, the threading of glibc is quite broken. The tests just stop @@ -236,114 +218,111 @@ ######################################## # install it ######################################## -make \ - OPT="$RPM_OPT_FLAGS -fPIC" \ - DESTDIR=$RPM_BUILD_ROOT \ - install +%make_install OPT="%{optflags} -fPIC" ######################################## # some cleanups ######################################## # remove hard links and replace them with symlinks for dir in bin include %{_lib} ; do - rm -f $RPM_BUILD_ROOT/%{_prefix}/$dir/python - ln -s python%{python_version} $RPM_BUILD_ROOT/%{_prefix}/$dir/python + rm -f %{buildroot}/%{_prefix}/$dir/python + ln -s python%{python_version} %{buildroot}/%{_prefix}/$dir/python done # kill imageop.so, it's insecure -rm -f $RPM_BUILD_ROOT/%{_libdir}/python%{python_version}/lib-dynload/imageop.so +rm -f %{buildroot}/%{_libdir}/python%{python_version}/lib-dynload/imageop.so #cleanup for -base -rm $RPM_BUILD_ROOT%{_bindir}/python{,%{python_version}} -rm $RPM_BUILD_ROOT%{_bindir}/smtpd.py -rm $RPM_BUILD_ROOT%{_bindir}/pydoc -rm $RPM_BUILD_ROOT%{_bindir}/2to3 -rm $RPM_BUILD_ROOT%{_mandir}/man1/python* -rm $RPM_BUILD_ROOT%{_libdir}/libpython*.so.* -rm $RPM_BUILD_ROOT%{_libdir}/python -find $RPM_BUILD_ROOT%{_libdir}/python%{python_version} -maxdepth 1 ! \( -name "ssl.py" \) -exec rm {} ";" -rm $RPM_BUILD_ROOT%{_bindir}/python%{python_version}-config -rm $RPM_BUILD_ROOT%{_bindir}/python-config -rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/* -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}/compiler -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/config -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/ctypes -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/distutils -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/email -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/encodings -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/hotshot -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/importlib -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/json -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib2to3 -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/logging -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/multiprocessing -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/plat-* -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/pydoc_data -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/test -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/unittest -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/wsgiref -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/xml -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/_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 -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_ctypes_test.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_elementtree.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_functools.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_heapq.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_hotshot.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_io.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_json.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_locale.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_lsprof.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_multiprocessing.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_random.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_socket.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_struct.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_testcapi.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/array.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/binascii.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/bz2.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/cPickle.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/cStringIO.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/cmath.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/crypt.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/datetime.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/fcntl.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/future_builtins.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/grp.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/itertools.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/linuxaudiodev.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/math.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/mmap.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/nis.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/operator.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/ossaudiodev.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/parser.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/pyexpat.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/resource.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/select.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/spwd.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/strop.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/syslog.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/termios.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/time.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/unicodedata.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/zlib.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_codecs*.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_multibytecodec.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/audioop.so -rm -f $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/dl.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/Python-%{tarversion}-py%{python_version}.egg-info +rm %{buildroot}%{_bindir}/python{,%{python_version}} +rm %{buildroot}%{_bindir}/smtpd.py +rm %{buildroot}%{_bindir}/pydoc +rm %{buildroot}%{_bindir}/2to3 +rm %{buildroot}%{_mandir}/man1/python* +rm %{buildroot}%{_libdir}/libpython*.so.* +rm %{buildroot}%{_libdir}/python +find %{buildroot}%{_libdir}/python%{python_version} -maxdepth 1 ! \( -name "ssl.py" \) -exec rm {} ";" +rm %{buildroot}%{_bindir}/python%{python_version}-config +rm %{buildroot}%{_bindir}/python-config +rm %{buildroot}%{_libdir}/pkgconfig/* +rm -r %{buildroot}%{_includedir}/python +rm -r %{buildroot}%{_includedir}/python%{python_version} +rm -r %{buildroot}%{_libdir}/python%{python_version}/compiler +rm -r %{buildroot}%{_libdir}/python%{python_version}/config +rm -r %{buildroot}%{_libdir}/python%{python_version}/ctypes +rm -r %{buildroot}%{_libdir}/python%{python_version}/distutils +rm -r %{buildroot}%{_libdir}/python%{python_version}/email +rm -r %{buildroot}%{_libdir}/python%{python_version}/encodings +rm -r %{buildroot}%{_libdir}/python%{python_version}/hotshot +rm -r %{buildroot}%{_libdir}/python%{python_version}/importlib +rm -r %{buildroot}%{_libdir}/python%{python_version}/json +rm -r %{buildroot}%{_libdir}/python%{python_version}/lib2to3 +rm -r %{buildroot}%{_libdir}/python%{python_version}/logging +rm -r %{buildroot}%{_libdir}/python%{python_version}/multiprocessing +rm -r %{buildroot}%{_libdir}/python%{python_version}/plat-* +rm -r %{buildroot}%{_libdir}/python%{python_version}/pydoc_data +rm -r %{buildroot}%{_libdir}/python%{python_version}/test +rm -r %{buildroot}%{_libdir}/python%{python_version}/unittest +rm -r %{buildroot}%{_libdir}/python%{python_version}/wsgiref +rm -r %{buildroot}%{_libdir}/python%{python_version}/xml +rm %{buildroot}%{_libdir}/libpython%{python_version}.so +rm %{buildroot}%{_libdir}/python%{python_version}/site-packages/README +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_bisect.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_csv.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_collections.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_ctypes.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_ctypes_test.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_elementtree.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_functools.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_heapq.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_hotshot.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_io.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_json.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_locale.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_lsprof.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_multiprocessing.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_random.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_socket.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_struct.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_testcapi.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/array.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/binascii.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/bz2.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/cPickle.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/cStringIO.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/cmath.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/crypt.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/datetime.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/fcntl.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/future_builtins.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/grp.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/itertools.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/linuxaudiodev.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/math.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/mmap.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/nis.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/operator.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/ossaudiodev.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/parser.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/pyexpat.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/resource.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/select.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/spwd.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/strop.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/syslog.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/termios.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/time.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/unicodedata.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/zlib.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_codecs*.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_multibytecodec.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/audioop.so +rm -f %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/dl.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/Python-%{version}-py%{python_version}.egg-info # replace duplicate .pyo/.pyc with hardlinks -%fdupes $RPM_BUILD_ROOT/%{_libdir}/python%{python_version} +%fdupes %{buildroot}/%{_libdir}/python%{python_version} ######################################## # documentation ######################################## -export PDOCS=${RPM_BUILD_ROOT}%{_docdir}/%{name} +export PDOCS=%{buildroot}%{_docdir}/%{name} install -d -m 755 $PDOCS -install -c -m 644 %{S:1} $PDOCS/ +install -c -m 644 %{SOURCE1} $PDOCS/ install -c -m 644 LICENSE $PDOCS/ install -c -m 644 README $PDOCS/ ######################################## @@ -358,23 +337,20 @@ # idle ######################################## # move idle config into /etc -install -d -m755 ${RPM_BUILD_ROOT}/etc/%{idle_name} +install -d -m755 %{buildroot}%{_sysconfdir}/%{idle_name} ( - cd ${RPM_BUILD_ROOT}/%{_libdir}/python%{python_version}/idlelib/ + cd %{buildroot}/%{_libdir}/python%{python_version}/idlelib/ for file in *.def ; do - mv $file ${RPM_BUILD_ROOT}/etc/%{idle_name}/ - ln -sf /etc/%{idle_name}/$file ${RPM_BUILD_ROOT}/%{_libdir}/python%{python_version}/idlelib/ + mv $file %{buildroot}%{_sysconfdir}/%{idle_name}/ + ln -sf /etc/%{idle_name}/$file %{buildroot}/%{_libdir}/python%{python_version}/idlelib/ done ) ######################################## # startup script ######################################## -install -m 644 %{S:2} $RPM_BUILD_ROOT/etc -install -d -m 755 $RPM_BUILD_ROOT/etc/profile.d -install -m 644 %{S:3} %{S:4} $RPM_BUILD_ROOT/etc/profile.d - -%clean -rm -rf $RPM_BUILD_ROOT +install -m 644 %{SOURCE2} %{buildroot}/etc +install -d -m 755 %{buildroot}%{_sysconfdir}/profile.d +install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d %post -p /sbin/ldconfig @@ -382,8 +358,8 @@ %files idle %defattr(644, root, root, 755) -%dir /etc/%{idle_name} -%config /etc/%{idle_name}/* +%dir %{_sysconfdir}/%{idle_name} +%config %{_sysconfdir}/%{idle_name}/* %doc Lib/idlelib/NEWS.txt %doc Lib/idlelib/README.txt %doc Lib/idlelib/TODO.txt @@ -419,8 +395,8 @@ %doc %{_docdir}/%{name}/README %doc %{_docdir}/%{name}/LICENSE %doc %{_docdir}/%{name}/README.SUSE -%config /etc/pythonstart -%config /etc/profile.d/python.* +%config %{_sysconfdir}/pythonstart +%config %{_sysconfdir}/profile.d/python.* %dir %{_libdir}/python%{python_version} %{_libdir}/python%{python_version}/ssl.py* %{_libdir}/python%{python_version}/bsddb -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
