[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/perl/ perl.spec openpkg-web/ news.txt
From:       "Ralf S. Engelschall" <rse () openpkg ! org>
Date:       2002-12-31 9:52:13
[Download RAW message or body]

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  rse@openpkg.org
  Module: openpkg-src openpkg-web          Date:   31-Dec-2002 10:52:13
  Branch: HEAD                             Handle: 2002123109521101

  Modified files:
    openpkg-src/perl        perl.spec
    openpkg-web             news.txt

  Log:
    - prevent Perl from picking up stuff in /usr/local on FreeBSD and NetBSD
    - cleanup packaging a little bit

  Summary:
    Revision    Changes     Path
    1.70        +19 -11     openpkg-src/perl/perl.spec
    1.2474      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/perl/perl.spec
  ============================================================================
  $ cvs diff -u -r1.69 -r1.70 perl.spec
  --- openpkg-src/perl/perl.spec	30 Dec 2002 22:05:50 -0000	1.69
  +++ openpkg-src/perl/perl.spec	31 Dec 2002 09:52:12 -0000	1.70
  @@ -33,18 +33,18 @@
   Group:        Language
   License:      GPL/Artistic
   Version:      5.8.0
  -Release:      20021219
  +Release:      20021231
   
   #   list of sources
  -Source0:      ftp://ftp.cpan.org/pub/CPAN/src/%{name}-%{version}.tar.gz
  +Source0:      ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz
   Source1:      perl-openpkg.sh
   Patch0:       perl.patch
   
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, gcc
  -PreReq:       OpenPKG, openpkg >= 20020206, gcc
  +BuildPreReq:  OpenPKG, openpkg >= 20021230, gcc
  +PreReq:       OpenPKG, openpkg >= 20021230, gcc
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -62,19 +62,24 @@
       chmod -R u+w .
   
   %build
  -    #   Remove bind, db, gdbm and iconv from optional library checks
  -    %{l_shtool} subst -e 's;\(.*for thislib in $libswanted.*\);libswanted=`echo " \
$libswanted " | sed -e "s/ bind / /g" -e "s/ db / /g" -e "s/ gdbm / /g" -e "s/ iconv \
                / /g"`\; \1;' Configure 
  -
       #   configure the Perl package
  -    %{l_shtool} subst -e 's;package=perl5;package=perl;' Configure
  +    %{l_shtool} subst \
  +        -e 's;\(.*for thislib in $libswanted.*\);libswanted=`echo " $libswanted " \
| sed -e "s/ bind / /g" -e "s/ db / /g" -e "s/ gdbm / /g" -e "s/ iconv / /g"`\; \1;' \
\  +        -e 's;package=perl5;package=perl;' \
  +        Configure
  +    %{l_shtool} subst \
  +        -e 's; */usr/local/lib;;' \
  +        hints/freebsd.sh hints/netbsd.sh
       ./Configure \
           -d -e -s \
           -Dprefix=%{l_prefix} \
           -Dinstallprefix=$RPM_BUILD_ROOT%{l_prefix} \
           -Dcc="%{l_cc}" -Doptimize="%{l_cflags -O}" \
           -Dlocincpth="%{l_prefix}/include" \
  +        -Dloclibpth="%{l_prefix}/lib" \
           -Dldflags="-L%{l_prefix}/lib" \
           -Dlibpth="%{l_prefix}/lib /lib /usr/lib /usr/ccs/lib" \
  +        -Dglibpth="%{l_prefix}/lib /lib /usr/lib /usr/ccs/lib" \
           -Uinstallusrbinperl \
           -Ui_malloc -Ui_iconv -Ui_db
   
  @@ -99,7 +104,8 @@
   
       #   install OpenPKG utility for Perl module packages
       %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE perl-openpkg.sh} $RPM_BUILD_ROOT%{l_prefix}/bin/perl-openpkg
  +        %{SOURCE perl-openpkg.sh} \
  +        $RPM_BUILD_ROOT%{l_prefix}/bin/perl-openpkg
   
       #   post-adjustments to installation tree
       rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/perl%{version}
  @@ -109,8 +115,10 @@
       $RPM_BUILD_ROOT%{l_prefix}/bin/perl -pi.orig \
           -e "s:$RPM_BUILD_ROOT%{l_prefix}:%{l_prefix}:g" \
           $RPM_BUILD_ROOT%{l_prefix}/lib/perl/%{version}/*/Config.pm \
  -        `find $RPM_BUILD_ROOT%{l_prefix}/lib/perl/%{version}/ -type f -name \
                ".packlist" -print`
  -    find $RPM_BUILD_ROOT%{l_prefix}/lib/perl/ -name "*.orig" -print | xargs rm -f
  +        `find $RPM_BUILD_ROOT%{l_prefix}/lib/perl/%{version}/ \
  +              -type f -name ".packlist" -print`
  +    find $RPM_BUILD_ROOT%{l_prefix}/lib/perl/ \
  +         -name "*.orig" -print | xargs rm -f
   
       #   strip binary files
       strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2> /dev/null || true
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.2473 -r1.2474 news.txt
  --- openpkg-web/news.txt	31 Dec 2002 09:02:20 -0000	1.2473
  +++ openpkg-web/news.txt	31 Dec 2002 09:52:11 -0000	1.2474
  @@ -1,3 +1,4 @@
  +31-Dec-2002: Upgraded package: P<perl-5.8.0-20021231>
   31-Dec-2002: Upgraded package: P<postfix-2.0.0.1-20021231>
   31-Dec-2002: Upgraded package: P<openssh-3.5p1-20021231>
   31-Dec-2002: Upgraded package: P<perl-ssl-20021231-20021231>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org


[prev in list] [next in list] [prev in thread] [next in thread]