OpenPKG Specs / file diff

     1.1 --- a/bison/bison.spec	Thu Aug 02 22:11:13 2012 +0200
     1.2 +++ b/bison/bison.spec	Thu Aug 02 23:24:05 2012 +0200
     1.3 @@ -1,6 +1,6 @@
     1.4  ##
     1.5  ##  bison.spec -- OpenPKG RPM Package Specification
     1.6 -##  Copyright (c) 2000-2008 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 @@ -22,7 +22,7 @@
    1.12  ##
    1.13  
    1.14  #   package versions
    1.15 -%define       V_new      2.4.1
    1.16 +%define       V_new      2.6
    1.17  %define       V_old      1.35
    1.18  
    1.19  #   package information
    1.20 @@ -36,23 +36,19 @@
    1.21  Group:        CompilerCompiler
    1.22  License:      GPL
    1.23  Version:      %{V_new}
    1.24 -Release:      20090106
    1.25 +Release:      20120720
    1.26  
    1.27  #   package options
    1.28  %option       with_old   no
    1.29  
    1.30  #   list of sources
    1.31 -Source0:      ftp://ftp.gnu.org/gnu/bison/bison-%{V_new}.tar.gz
    1.32 -Source1:      ftp://ftp.gnu.org/gnu/bison/bison-%{V_old}.tar.gz
    1.33 +Source0:      http://ftp.gnu.org/gnu/bison/bison-%{V_new}.tar.gz
    1.34 +Source1:      http://ftp.gnu.org/gnu/bison/bison-%{V_old}.tar.gz
    1.35  Patch0:       bison.patch
    1.36  
    1.37  #   build information
    1.38 -Prefix:       %{l_prefix}
    1.39 -BuildRoot:    %{l_buildroot}
    1.40 -BuildPreReq:  OpenPKG, openpkg >= 20040212, m4, make
    1.41 -PreReq:       OpenPKG, openpkg >= 20040212, m4
    1.42 -AutoReq:      no
    1.43 -AutoReqProv:  no
    1.44 +BuildPreReq:  OpenPKG, openpkg >= 20100101, m4, make
    1.45 +PreReq:       OpenPKG, openpkg >= 20100101, m4
    1.46  Conflicts:    yacc
    1.47  
    1.48  %description
    1.49 @@ -68,12 +64,12 @@
    1.50  %track
    1.51      prog bison:new = {
    1.52          version   = %{V_new}
    1.53 -        url       = ftp://ftp.gnu.org/gnu/bison/
    1.54 +        url       = http://ftp.gnu.org/gnu/bison/
    1.55          regex     = bison-(2.\d+(.\d+)*[a-z]?)\.tar\.gz
    1.56      }
    1.57      prog bison:old = {
    1.58          version   = %{V_old}
    1.59 -        url       = ftp://ftp.gnu.org/gnu/bison/
    1.60 +        url       = http://ftp.gnu.org/gnu/bison/
    1.61          regex     = bison-(1\.3\d+)\.tar\.gz
    1.62      }
    1.63  
    1.64 @@ -82,14 +78,22 @@
    1.65      %patch -p0 -d bison-%{V_new}
    1.66      %setup -q -T -D -a 1
    1.67      %{l_shtool} subst \
    1.68 +        -e 's;ac_config_files.*etc/bench\.pl";;' \
    1.69 +        bison-%{V_new}/configure
    1.70 +    %{l_shtool} subst \
    1.71          -e 's;^\( *SUBDIRS = .*\) examples\(.*\)$;\1\2;' \
    1.72 +        -e 's;^\( *SUBDIRS = .*\) tests\(.*\)$;\1\2;' \
    1.73 +        -e 's;^\( *SUBDIRS = .*\) etc\(.*\)$;\1\2;' \
    1.74          bison-%{V_new}/Makefile.in
    1.75 +    touch bison-%{V_new}/doc/bison.1
    1.76  
    1.77  %build
    1.78      ( cd bison-%{V_new}
    1.79        CC="%{l_cc}" \
    1.80        CFLAGS="%{l_cflags -O}" \
    1.81 -      ./configure \
    1.82 +      CONFIG_SHELL="%{l_bash}" \
    1.83 +      GREP="grep" \
    1.84 +      "%{l_bash}" configure \
    1.85            --prefix=%{l_prefix} \
    1.86            --mandir=%{l_prefix}/man \
    1.87            --infodir=%{l_prefix}/info \
    1.88 @@ -100,6 +104,7 @@
    1.89      ( cd bison-%{V_old}
    1.90        CC="%{l_cc}" \
    1.91        CFLAGS="%{l_cflags -O}" \
    1.92 +      GREP="grep" \
    1.93        ./configure \
    1.94            --prefix=%{l_prefix} \
    1.95            --mandir=%{l_prefix}/man \
    1.96 @@ -110,7 +115,6 @@
    1.97  %endif
    1.98  
    1.99  %install
   1.100 -    rm -rf $RPM_BUILD_ROOT
   1.101  %if "%{with_old}" == "yes"
   1.102      ( cd bison-%{V_old}
   1.103        %{l_make} -f Makefile %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
   1.104 @@ -132,5 +136,4 @@
   1.105  %files -f files
   1.106  
   1.107  %clean
   1.108 -    rm -rf $RPM_BUILD_ROOT
   1.109