Changeset 1156 for spec/trunk/SPECS/python.spec

Timestamp:

Jun 3, 2017, 10:51:43 PM (8 years ago)

Author:

dmik

Message:

spec: python: Release version 2.7.6-18.

File:

• spec/trunk/SPECS/python.spec (modified) (16 diffs)

spec/trunk/SPECS/python.spec

@@ -1 @@
-#define svn_url     F:/rd/rpm/python/trunk
-%define svn_url     http://svn.netlabs.org/repos/rpm/python/trunk
-%define svn_rev     1117
-
 %{!?__python_ver:%global __python_ver EMPTY}
 #global __python_ver 2.7
@@ -47 +43 @@
 %global _python_bytecompile_errors_terminate_build 0
 
+# Completely disable python dependency generators as we enforce the right
+# provides/requires manually. This, in particular, prevents python-libs from
+# having the python(abi) dependency so that it can be installed anone.
+%global __python_provides %{nil}
+%global __python_requires %{nil}
+
+# Exclude Windows installer stubs from debug info stripping
+%define _strip_opts --debuginfo -x "wininst-*.exe"
+
 Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 Version: 2.7.6
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: Python
 Group: Development/Languages
+Requires: %{name}-libs = %{version}-%{release}
 Provides: python-abi = %{pybasever}
 Provides: python(abi) = %{pybasever}
 
-Source: %{name}-%{version}%{?svn_rev:-r%{svn_rev}}.zip
-
-BuildRequires: gcc make subversion zip
+%scm_source svn http://svn.netlabs.org/repos/rpm/python/trunk 1151
 
 %if %{main_python}
@@ -76 +80 @@
 %endif
 
+# Because of fread override that fixes freezes when reading big files on JFS
+Requires: libcx >= 0.5.3
+
 # YD because of libcx
 Requires: db4 > 4.8.30-6
@@ -83 +90 @@
 Conflicts: rpm < 4.13.0-8
 Conflicts: yum-metadata-parser < 1.1.4-6
-
-# YD unix adds this automatically by parsing elf binaries
-Requires: %{name}-libs = %{version}-%{release}
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -108 +112 @@
 %endif
 
-# OS/2 specific
-BuildRequires: mmap urpo-devel
-
 URL: http://www.python.org/
 
@@ -140 +141 @@
 Summary: The libraries for python runtime
 Group: Applications/System
-Requires: %{name} = %{version}-%{release}
+
 # Needed for ctypes, to load libraries, worked around for Live CDs size
 # Requires: binutils
@@ -152 +153 @@
 Summary: The libraries and header files needed for Python development
 Group: Development/Libraries
-Requires: %{python}%{?_isa} = %{version}-%{release}
+Requires: %{python} = %{version}-%{release}
 Requires: python-rpm-macros
 Requires: python2-rpm-macros
@@ -224 +225 @@
 
 %prep
-%if %{?svn_rev:%(sh -c 'if test -f "%{_sourcedir}/%{name}-%{version}-r%{svn_rev}.zip" ; then echo 1 ; else echo 0 ; fi')}%{!?svn_rev):0}
-%setup -q
-%else
-%setup -n "%{name}-%{version}" -Tc
-svn export %{?svn_rev:-r %{svn_rev}} %{svn_url} . --force
-rm -f "%{_sourcedir}/%{name}-%{version}%{?svn_rev:-r%{svn_rev}}.zip"
-(cd .. && zip -SrX9 "%{_sourcedir}/%{name}-%{version}%{?svn_rev:-r%{svn_rev}}.zip" "%{name}-%{version}")
-%endif
+%scm_setup
 
 %if 0%{?with_systemtap}
@@ -258 +252 @@
 %build
 
-export LDFLAGS="-g -Zbin-files -Zhigh-mem -Zomf -Zargs-wild -Zargs-resp"
-export LIBS="-lcx -lssl -lcrypto -lurpo -lpthread -lintl"
+# NOTE: Put -lcx to LDFLAGS instead of LIBS to have LIBCx linked to all shared
+# (.pyd) modules in addition to the python DLL and EXE itself
+export LDFLAGS="-g -Zbin-files -Zhigh-mem -Zomf -Zargs-wild -Zargs-resp -Zmap -lcx"
+export LIBS="-lssl -lcrypto -lintl"
 %configure \
         --enable-shared \
@@ -354 +350 @@
 rm %{buildroot}%{pylibdir}/*.egg-info
 
+# Get rid of all .pyo files as they are identical to .pyc (only needed in
+# python -O mode which is used rarely or not at all on OS/2)
+find %{buildroot}%{pylibdir} -type f -name *.pyo -exec rm -f {} +
+
 %clean
 rm -fr %{buildroot}
@@ -370 +370 @@
 
 
-%files
+%files -f %{debug_package_exclude_files}
 %defattr(-, root, root, -)
 %doc LICENSE README
@@ -382 +382 @@
 %{_bindir}/python%{pybasever}.exe
 %{_mandir}/*/*
-%exclude %{_bindir}/*.dbg
 
 %dir %{pylibdir}
@@ -388 +387 @@
 %{dynload_dir}/Python-%{version}-py%{pybasever}.egg-info
 %{dynload_dir}/*.pyd
+%exclude %{dynload_dir}/*.map
 %exclude %{dynload_dir}/_ctypes_test.pyd
 %exclude %{dynload_dir}/_ct3574.pyd
@@ -438 +438 @@
 %{_includedir}/python%{pybasever}/%{_pyconfig_h}
 
-%files libs
+%files libs -f %{debug_package_exclude_files}
 %defattr(-,root,root,-)
 #%doc LICENSE README
@@ -446 +446 @@
 %doc systemtap-example.stp pyfuntop.stp
 %endif
-%exclude %{_libdir}/*.dbg
 %{pylibdir}/unittest/*
 
@@ -517 +516 @@
 
 %changelog
+* Sat Jun 3 2017 Dmitriy Kuminov <coding@dmik.org> 2.7.6-18
+- Put the LIBCx library to LDFLAGS rather than LIBS to have all module DLLs
+  linked against it as well.
+- Rebuild against LIBCx 0.5.3 to incorporate DosRead JFS workaround for fread.
+- Remove urpo as it conflicts with LIBCx.
+- Remove pthread from libraries as not needed any more.
+- Remove .pyo files (needed only in python -O mode which is rarely used).
+- Remove .dbg files for Windows stubs (wininst-*.exe).
+- Use scm_source/scm_setup for downloading sources.
+
 * Mon Apr 24 2017 yd <yd@os2power.com> 2.7.6-17
 - add new requirements and move unittest files. ticket#248.