OpenPKG Specs / file diff

     1.1 --- a/python/python.spec	Fri Aug 24 20:52:12 2012 +0200
     1.2 +++ b/python/python.spec	Tue Aug 28 18:28:20 2012 +0200
     1.3 @@ -1,6 +1,6 @@
     1.4  ##
     1.5  ##  python.spec -- OpenPKG RPM Package Specification
     1.6 -##  Copyright (c) 2000-2010 OpenPKG Foundation e.V. <http://openpkg.net/>
     1.7 +##  Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/>
     1.8  ##
     1.9  ##  Permission to use, copy, modify, and distribute this software for
    1.10  ##  any purpose with or without fee is hereby granted, provided that
    1.11 @@ -31,8 +31,8 @@
    1.12  Class:        BASE
    1.13  Group:        Language
    1.14  License:      GPL
    1.15 -Version:      2.7.2
    1.16 -Release:      20110914
    1.17 +Version:      2.7.3
    1.18 +Release:      20120800
    1.19  
    1.20  #   package options
    1.21  %option       with_readline      no
    1.22 @@ -50,10 +50,8 @@
    1.23  Patch0:       python.patch
    1.24  
    1.25  #   build information
    1.26 -Prefix:       %{l_prefix}
    1.27 -BuildRoot:    %{l_buildroot}
    1.28 -BuildPreReq:  OpenPKG, openpkg >= 20060823, gcc
    1.29 -PreReq:       OpenPKG, openpkg >= 20060823, gcc
    1.30 +BuildPreReq:  OpenPKG, openpkg >= 20100101, gcc, make
    1.31 +PreReq:       OpenPKG, openpkg >= 20100101, gcc
    1.32  BuildPreReq:  zlib
    1.33  PreReq:       zlib
    1.34  %if "%{with_readline}" == "yes"
    1.35 @@ -92,8 +90,6 @@
    1.36  BuildPreReq:  openssl
    1.37  PreReq:       openssl
    1.38  %endif
    1.39 -AutoReq:      no
    1.40 -AutoReqProv:  no
    1.41  
    1.42  %description
    1.43      Python is an interpreted, interactive, object-oriented programming
    1.44 @@ -115,10 +111,10 @@
    1.45  %prep
    1.46      %setup -q -n Python-%{version}
    1.47      %patch -p0
    1.48 -    %{l_shtool} subst \
    1.49 -        -e 's;\(LDSHARED=.*\)\$(CC);\1\\$(CC);g' \
    1.50 -        -e 's;\(LDCXXSHARED=.*\)\$(CXX);\1\\$(CXX);g' \
    1.51 -        configure
    1.52 +
    1.53 +%build
    1.54 +    %{l_shtool} subst %{l_value -s -a} \
    1.55 +        setup.py
    1.56      %{l_shtool} subst \
    1.57          -e 's;altinstall bininstall maninstall;altinstall maninstall;' \
    1.58          -e 's;python$(VERSION);python;g' \
    1.59 @@ -136,9 +132,6 @@
    1.60      %{l_shtool} subst \
    1.61          -e 's;python{py_version_short};python;g' \
    1.62          Lib/sysconfig.py
    1.63 -
    1.64 -%build
    1.65 -    echo "" >config.cache
    1.66  %if "%{with_readline}" == "yes"
    1.67      ( echo "readline readline.c %{l_cppflags} %{l_ldflags} -lreadline -ltermcap"
    1.68      ) >>Modules/Setup.local
    1.69 @@ -180,12 +173,6 @@
    1.70      ) >>Modules/Setup.local
    1.71  %endif
    1.72  
    1.73 -    #   getaddrinfo bug
    1.74 -    disableipv6=""
    1.75 -    case "%{l_platform -t}" in
    1.76 -        *-aix* ) disableipv6="--disable-ipv6" ;;
    1.77 -    esac
    1.78 -
    1.79      CC="%{l_prefix}/bin/gcc" \
    1.80      CXX="%{l_cxx}" \
    1.81      CFLAGS="%{l_cflags -O}" \
    1.82 @@ -193,9 +180,6 @@
    1.83      CXXFLAGS="%{l_cxxflags -O}" \
    1.84      LDFLAGS="%{l_ldflags}" \
    1.85      ./configure \
    1.86 -        --cache-file=./config.cache \
    1.87 -        --with-gcc \
    1.88 -        $disableipv6 \
    1.89          --prefix=%{l_prefix} \
    1.90          --mandir=%{l_prefix}/man \
    1.91          --with-dbmliborder=ndbm \
    1.92 @@ -203,7 +187,6 @@
    1.93      %{l_make} %{l_mflags -O}
    1.94  
    1.95  %install
    1.96 -    rm -rf $RPM_BUILD_ROOT
    1.97      %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
    1.98      ln $RPM_BUILD_ROOT%{l_prefix}/lib/python/config/libpython*.a \
    1.99         $RPM_BUILD_ROOT%{l_prefix}/lib/python/config/libpython.a
   1.100 @@ -216,5 +199,4 @@
   1.101  %files -f files
   1.102  
   1.103  %clean
   1.104 -    rm -rf $RPM_BUILD_ROOT
   1.105