OpenPKG Specs / changeset

     1.1 --- a/python/python.patch	Fri Aug 24 20:52:12 2012 +0200
     1.2 +++ b/python/python.patch	Tue Aug 28 18:28:20 2012 +0200
     1.3 @@ -1,6 +1,6 @@
     1.4  Index: configure
     1.5 ---- configure.orig	2010-11-01 02:47:19.000000000 +0100
     1.6 -+++ configure	2010-12-05 18:07:39.000000000 +0100
     1.7 +--- configure.orig	2011-06-11 17:46:28.000000000 +0200
     1.8 ++++ configure	2011-12-11 16:42:17.000000000 +0100
     1.9  @@ -3920,9 +3920,9 @@
    1.10     CFLAGS=$ac_save_CFLAGS
    1.11   elif test $ac_cv_prog_cc_g = yes; then
    1.12 @@ -32,8 +32,8 @@
    1.13   		    if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
    1.14   		    then
    1.15  Index: setup.py
    1.16 ---- setup.py.orig	2010-10-31 17:40:21.000000000 +0100
    1.17 -+++ setup.py	2010-12-05 18:05:56.000000000 +0100
    1.18 +--- setup.py.orig	2011-06-11 17:46:28.000000000 +0200
    1.19 ++++ setup.py	2011-12-11 16:43:40.000000000 +0100
    1.20  @@ -369,8 +369,8 @@
    1.21   
    1.22       def detect_modules(self):
    1.23 @@ -87,4 +87,3 @@
    1.24               for dir in inc_dirs:
    1.25                   tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
    1.26                   tk_include_sub += [dir + os.sep + "tk" + dotversion]
    1.27 -Common subdirectories: Python-2.7.2.orig/Tools and Python-2.7.2/Tools

     2.1 --- a/python/python.spec	Fri Aug 24 20:52:12 2012 +0200
     2.2 +++ b/python/python.spec	Tue Aug 28 18:28:20 2012 +0200
     2.3 @@ -1,6 +1,6 @@
     2.4  ##
     2.5  ##  python.spec -- OpenPKG RPM Package Specification
     2.6 -##  Copyright (c) 2000-2010 OpenPKG Foundation e.V. <http://openpkg.net/>
     2.7 +##  Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/>
     2.8  ##
     2.9  ##  Permission to use, copy, modify, and distribute this software for
    2.10  ##  any purpose with or without fee is hereby granted, provided that
    2.11 @@ -31,8 +31,8 @@
    2.12  Class:        BASE
    2.13  Group:        Language
    2.14  License:      GPL
    2.15 -Version:      2.7.2
    2.16 -Release:      20110914
    2.17 +Version:      2.7.3
    2.18 +Release:      20120800
    2.19  
    2.20  #   package options
    2.21  %option       with_readline      no
    2.22 @@ -50,10 +50,8 @@
    2.23  Patch0:       python.patch
    2.24  
    2.25  #   build information
    2.26 -Prefix:       %{l_prefix}
    2.27 -BuildRoot:    %{l_buildroot}
    2.28 -BuildPreReq:  OpenPKG, openpkg >= 20060823, gcc
    2.29 -PreReq:       OpenPKG, openpkg >= 20060823, gcc
    2.30 +BuildPreReq:  OpenPKG, openpkg >= 20100101, gcc, make
    2.31 +PreReq:       OpenPKG, openpkg >= 20100101, gcc
    2.32  BuildPreReq:  zlib
    2.33  PreReq:       zlib
    2.34  %if "%{with_readline}" == "yes"
    2.35 @@ -92,8 +90,6 @@
    2.36  BuildPreReq:  openssl
    2.37  PreReq:       openssl
    2.38  %endif
    2.39 -AutoReq:      no
    2.40 -AutoReqProv:  no
    2.41  
    2.42  %description
    2.43      Python is an interpreted, interactive, object-oriented programming
    2.44 @@ -115,10 +111,10 @@
    2.45  %prep
    2.46      %setup -q -n Python-%{version}
    2.47      %patch -p0
    2.48 -    %{l_shtool} subst \
    2.49 -        -e 's;\(LDSHARED=.*\)\$(CC);\1\\$(CC);g' \
    2.50 -        -e 's;\(LDCXXSHARED=.*\)\$(CXX);\1\\$(CXX);g' \
    2.51 -        configure
    2.52 +
    2.53 +%build
    2.54 +    %{l_shtool} subst %{l_value -s -a} \
    2.55 +        setup.py
    2.56      %{l_shtool} subst \
    2.57          -e 's;altinstall bininstall maninstall;altinstall maninstall;' \
    2.58          -e 's;python$(VERSION);python;g' \
    2.59 @@ -136,9 +132,6 @@
    2.60      %{l_shtool} subst \
    2.61          -e 's;python{py_version_short};python;g' \
    2.62          Lib/sysconfig.py
    2.63 -
    2.64 -%build
    2.65 -    echo "" >config.cache
    2.66  %if "%{with_readline}" == "yes"
    2.67      ( echo "readline readline.c %{l_cppflags} %{l_ldflags} -lreadline -ltermcap"
    2.68      ) >>Modules/Setup.local
    2.69 @@ -180,12 +173,6 @@
    2.70      ) >>Modules/Setup.local
    2.71  %endif
    2.72  
    2.73 -    #   getaddrinfo bug
    2.74 -    disableipv6=""
    2.75 -    case "%{l_platform -t}" in
    2.76 -        *-aix* ) disableipv6="--disable-ipv6" ;;
    2.77 -    esac
    2.78 -
    2.79      CC="%{l_prefix}/bin/gcc" \
    2.80      CXX="%{l_cxx}" \
    2.81      CFLAGS="%{l_cflags -O}" \
    2.82 @@ -193,9 +180,6 @@
    2.83      CXXFLAGS="%{l_cxxflags -O}" \
    2.84      LDFLAGS="%{l_ldflags}" \
    2.85      ./configure \
    2.86 -        --cache-file=./config.cache \
    2.87 -        --with-gcc \
    2.88 -        $disableipv6 \
    2.89          --prefix=%{l_prefix} \
    2.90          --mandir=%{l_prefix}/man \
    2.91          --with-dbmliborder=ndbm \
    2.92 @@ -203,7 +187,6 @@
    2.93      %{l_make} %{l_mflags -O}
    2.94  
    2.95  %install
    2.96 -    rm -rf $RPM_BUILD_ROOT
    2.97      %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
    2.98      ln $RPM_BUILD_ROOT%{l_prefix}/lib/python/config/libpython*.a \
    2.99         $RPM_BUILD_ROOT%{l_prefix}/lib/python/config/libpython.a
   2.100 @@ -216,5 +199,4 @@
   2.101  %files -f files
   2.102  
   2.103  %clean
   2.104 -    rm -rf $RPM_BUILD_ROOT
   2.105