Accepting request 113577 from home:dirkmueller:branches:devel:languages:python:Factory
- update to 2.7.3: * no change - remove static libpython.a from build to avoid packages linking it statically OBS-URL: https://build.opensuse.org/request/show/113577 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=120
This commit is contained in:
Jan Matejek
Git OBS Bridge
parent
34133fc3bd
commit
725f3b3051
3
Python-2.7.3.tar.bz2
Normal file
3
Python-2.7.3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:726457e11cb153adc3f428aaf1901fc561a374c30e5e7da6742c0742a338663c
|
||||
size 11793433
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:752759ea956bfc4e9638753f68e9a2c96a40677053a4d6720f1a476a984f7bbe
|
||||
size 11801113
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
# This script is called automatically during autobuild checkin.
|
||||
|
||||
for spec in python.spec; do
|
||||
for spec in python-doc.spec python.spec; do
|
||||
{ sed -n -e '1,/COMMON-PATCH-BEGIN/p' $spec
|
||||
sed -n -e '/COMMON-PATCH-BEGIN/,/COMMON-PATCH-END/p' python-base.spec
|
||||
sed -n -e '/COMMON-PATCH-END/,/COMMON-PREP-BEGIN/p' $spec
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Apr 14 08:57:46 UTC 2012 - dmueller@suse.com
|
||||
|
||||
- update to 2.7.3:
|
||||
* no change
|
||||
- remove static libpython.a from build to avoid packages
|
||||
linking it statically
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 28 18:19:18 UTC 2012 - jmatejek@suse.com
|
||||
|
||||
|
||||
@ -18,14 +18,13 @@
|
||||
|
||||
|
||||
Name: python-base
|
||||
Version: 2.7.2.99rc2
|
||||
Version: 2.7.3
|
||||
Release: 0
|
||||
License: Python-2.0
|
||||
Summary: Python Interpreter base package
|
||||
Url: http://www.python.org/
|
||||
Group: Development/Languages/Python
|
||||
#%%define tarversion %{version}
|
||||
%define tarversion 2.7.3rc2
|
||||
%define tarversion %{version}
|
||||
%define tarname Python-%{tarversion}
|
||||
Source0: %{tarname}.tar.bz2
|
||||
Source1: macros.python
|
||||
@ -48,6 +47,7 @@ Patch12: http://psf.upfronthosting.co.za/roundup/tracker/file19029/python
|
||||
Patch13: python-2.7.2-fix_date_time_compiler.patch
|
||||
Patch15: python-2.7.2-disable-tests-in-test_io.patch
|
||||
Patch16: pypirc-secure.diff
|
||||
Patch17: remove-static-libpython.diff
|
||||
# COMMON-PATCH-END
|
||||
%define python_version %(echo %{tarversion} | head -c 3)
|
||||
BuildRequires: automake
|
||||
@ -132,6 +132,7 @@ other applications.
|
||||
%patch15 -p1
|
||||
%endif
|
||||
%patch16 -p1
|
||||
%patch17
|
||||
# COMMON-PREP-END
|
||||
|
||||
# drop Autoconf version requirement
|
||||
@ -216,6 +217,8 @@ 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
|
||||
# link shared library instead of static library that tools expect
|
||||
ln -s ../../libpython%{python_version}.so %{buildroot}%{_libdir}/python%{python_version}/config/libpython%{python_version}.so
|
||||
# remove various things that don't need to be in python-base
|
||||
rm %{buildroot}%{_bindir}/idle
|
||||
rm -rf $CLEANUP_DIR/{curses,bsddb,idlelib,lib-tk,sqlite3}
|
||||
|
||||
@ -15,8 +15,6 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
|
||||
Name: python-doc
|
||||
Version: 2.7
|
||||
Release: 0
|
||||
@ -24,13 +22,29 @@ License: Python-2.0
|
||||
Summary: Additional Package Documentation for Python
|
||||
Url: http://www.python.org/
|
||||
Group: Development/Languages/Python
|
||||
%define pyver 2.7.2.99rc2
|
||||
#%%define tarname Python-%{pyver}
|
||||
%define tarname Python-2.7.3rc2
|
||||
%define pyver 2.7.3
|
||||
%define tarname Python-%{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
|
||||
# COMMON-PATCH-BEGIN
|
||||
Patch1: python-2.7-dirs.patch
|
||||
Patch2: python-distutils-rpm-8.patch
|
||||
Patch3: python-2.7.3rc2-multilib.patch
|
||||
Patch4: python-2.5.1-sqlite.patch
|
||||
Patch5: python-2.7.3rc2-canonicalize2.patch
|
||||
Patch6: python-2.7rc2-configure.patch
|
||||
Patch7: python-2.6-gettext-plurals.patch
|
||||
Patch8: python-2.6b3-curses-panel.patch
|
||||
Patch9: python-2.7.1-distutils_test_path.patch
|
||||
Patch10: sparc_longdouble.patch
|
||||
Patch12: http://psf.upfronthosting.co.za/roundup/tracker/file19029/python-test_structmembers.patch
|
||||
Patch13: python-2.7.2-fix_date_time_compiler.patch
|
||||
Patch15: python-2.7.2-disable-tests-in-test_io.patch
|
||||
Patch16: pypirc-secure.diff
|
||||
Patch17: remove-static-libpython.diff
|
||||
# COMMON-PATCH-END
|
||||
Provides: pyth_doc
|
||||
Provides: pyth_ps
|
||||
Obsoletes: pyth_doc
|
||||
@ -57,6 +71,26 @@ Python, and Macintosh Module Reference in PDF format.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{tarname}
|
||||
# COMMON-PREP-BEGIN
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5
|
||||
%patch6
|
||||
%patch7
|
||||
%patch8
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch12
|
||||
%patch13
|
||||
#skip test_io test for ppc,ppc64 as it broken.
|
||||
%ifarch ppc ppc64
|
||||
%patch15 -p1
|
||||
%endif
|
||||
%patch16 -p1
|
||||
%patch17
|
||||
# COMMON-PREP-END
|
||||
|
||||
%build
|
||||
# nothing to do (...whistles innocently)
|
||||
@ -91,3 +125,4 @@ done
|
||||
%doc %{_docdir}/python/paper-letter
|
||||
|
||||
%changelog
|
||||
|
||||
|
||||
@ -16,14 +16,13 @@
|
||||
#
|
||||
|
||||
Name: python
|
||||
Version: 2.7.2.99rc2
|
||||
Version: 2.7.3
|
||||
Release: 0
|
||||
License: Python-2.0
|
||||
Summary: Python Interpreter
|
||||
Url: http://www.python.org/
|
||||
Group: Development/Languages/Python
|
||||
#%%define tarversion %{version}
|
||||
%define tarversion 2.7.3rc2
|
||||
%define tarversion %{version}
|
||||
%define tarname Python-%{tarversion}
|
||||
Source0: %{tarname}.tar.bz2
|
||||
Source1: README.SUSE
|
||||
@ -52,6 +51,7 @@ Patch12: http://psf.upfronthosting.co.za/roundup/tracker/file19029/python
|
||||
Patch13: python-2.7.2-fix_date_time_compiler.patch
|
||||
Patch15: python-2.7.2-disable-tests-in-test_io.patch
|
||||
Patch16: pypirc-secure.diff
|
||||
Patch17: remove-static-libpython.diff
|
||||
# COMMON-PATCH-END
|
||||
BuildRequires: automake
|
||||
BuildRequires: db-devel
|
||||
@ -172,6 +172,7 @@ implementation of the standard Unix DBM databases.
|
||||
%patch15 -p1
|
||||
%endif
|
||||
%patch16 -p1
|
||||
%patch17
|
||||
# COMMON-PREP-END
|
||||
|
||||
# drop Autoconf version requirement
|
||||
|
||||
49
remove-static-libpython.diff
Normal file
49
remove-static-libpython.diff
Normal file
@ -0,0 +1,49 @@
|
||||
--- Makefile.pre.in
|
||||
+++ Makefile.pre.in
|
||||
@@ -396,7 +396,7 @@
|
||||
|
||||
|
||||
# Build the interpreter
|
||||
-$(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY)
|
||||
+$(BUILDPYTHON): Modules/python.o $(LDLIBRARY)
|
||||
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
|
||||
Modules/python.o \
|
||||
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
||||
@@ -412,18 +412,6 @@
|
||||
*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
|
||||
esac
|
||||
|
||||
-# Build static library
|
||||
-# avoid long command lines, same as LIBRARY_OBJS
|
||||
-$(LIBRARY): $(LIBRARY_OBJS)
|
||||
- -rm -f $@
|
||||
- $(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o
|
||||
- $(AR) $(ARFLAGS) $@ $(PARSER_OBJS)
|
||||
- $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS)
|
||||
- $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS)
|
||||
- $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS)
|
||||
- $(AR) $(ARFLAGS) $@ $(MODOBJS)
|
||||
- $(RANLIB) $@
|
||||
-
|
||||
libpython$(VERSION).so: $(LIBRARY_OBJS)
|
||||
if test $(INSTSONAME) != $(LDLIBRARY); then \
|
||||
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
|
||||
@@ -1008,18 +996,6 @@
|
||||
else true; \
|
||||
fi; \
|
||||
done
|
||||
- @if test -d $(LIBRARY); then :; else \
|
||||
- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
|
||||
- if test "$(SO)" = .dll; then \
|
||||
- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
|
||||
- else \
|
||||
- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
||||
- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
||||
- fi; \
|
||||
- else \
|
||||
- echo Skip install of $(LIBRARY) - use make frameworkinstall; \
|
||||
- fi; \
|
||||
- fi
|
||||
$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
|
||||
$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
|
||||
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
|
||||
Loading…
Reference in New Issue
Block a user