OpenPKG Specs / changeset

     1.1 --- a/bison/bison.patch	Thu Aug 02 22:11:13 2012 +0200
     1.2 +++ b/bison/bison.patch	Thu Aug 02 23:24:05 2012 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  Index: lib/timevar.c
     1.5 ---- lib/timevar.c.orig	2008-07-14 10:56:12 +0200
     1.6 -+++ lib/timevar.c	2008-11-03 19:16:04 +0100
     1.7 -@@ -42,6 +42,7 @@
     1.8 +--- lib/timevar.c.orig	2010-07-26 01:33:12.000000000 +0200
     1.9 ++++ lib/timevar.c	2010-08-06 15:13:37.000000000 +0200
    1.10 +@@ -45,6 +45,7 @@
    1.11   # include <sys/times.h>
    1.12   #endif
    1.13   #ifdef HAVE_SYS_RESOURCE_H
    1.14 @@ -15,9 +15,9 @@
    1.15  http://undeadly.org/cgi?action=article&sid=20080708155228&mode=flat&count=13
    1.16  
    1.17  Index: data/yacc.c
    1.18 ---- data/yacc.c.orig	2008-11-02 19:09:10 +0100
    1.19 -+++ data/yacc.c	2008-11-03 19:16:04 +0100
    1.20 -@@ -1444,7 +1444,10 @@
    1.21 +--- data/yacc.c.orig	2010-08-06 02:37:58.000000000 +0200
    1.22 ++++ data/yacc.c	2010-08-06 15:13:37.000000000 +0200
    1.23 +@@ -1453,7 +1453,10 @@
    1.24        users should not rely upon it.  Assigning to YYVAL
    1.25        unconditionally makes the parser a bit smaller, and it avoids a
    1.26        GCC warning that YYVAL may be used uninitialized.  */
    1.27 @@ -29,3 +29,26 @@
    1.28   ]b4_locations_if(
    1.29   [[  /* Default location.  */
    1.30   
    1.31 +----------------------------------------------------------------------------
    1.32 +
    1.33 +Fix for FreeBSD 8 but without breaking Mac OS X 10.6
    1.34 +
    1.35 +Index: lib/spawn.in.h
    1.36 +--- lib/spawn.in.h.orig	2010-04-11 20:31:37.000000000 +0200
    1.37 ++++ lib/spawn.in.h	2010-08-06 15:57:36.000000000 +0200
    1.38 +@@ -121,6 +121,7 @@
    1.39 + #  define POSIX_SPAWN_SETSCHEDULER 0
    1.40 + # endif
    1.41 + #else
    1.42 ++#if !@HAVE_POSIX_SPAWN@ || defined(__APPLE__)
    1.43 + # if @REPLACE_POSIX_SPAWN@
    1.44 + /* Use the values from the system, for better compatibility.  */
    1.45 + /* But this implementation does not support AIX extensions.  */
    1.46 +@@ -134,6 +135,7 @@
    1.47 + #  define POSIX_SPAWN_SETSCHEDULER       0x20
    1.48 + # endif
    1.49 + #endif
    1.50 ++#endif
    1.51 + /* A GNU extension.  Use the next free bit position.  */
    1.52 + #define POSIX_SPAWN_USEVFORK \
    1.53 +   ((POSIX_SPAWN_RESETIDS | (POSIX_SPAWN_RESETIDS - 1)                     \

     2.1 --- a/bison/bison.spec	Thu Aug 02 22:11:13 2012 +0200
     2.2 +++ b/bison/bison.spec	Thu Aug 02 23:24:05 2012 +0200
     2.3 @@ -1,6 +1,6 @@
     2.4  ##
     2.5  ##  bison.spec -- OpenPKG RPM Package Specification
     2.6 -##  Copyright (c) 2000-2008 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 @@ -22,7 +22,7 @@
    2.12  ##
    2.13  
    2.14  #   package versions
    2.15 -%define       V_new      2.4.1
    2.16 +%define       V_new      2.6
    2.17  %define       V_old      1.35
    2.18  
    2.19  #   package information
    2.20 @@ -36,23 +36,19 @@
    2.21  Group:        CompilerCompiler
    2.22  License:      GPL
    2.23  Version:      %{V_new}
    2.24 -Release:      20090106
    2.25 +Release:      20120720
    2.26  
    2.27  #   package options
    2.28  %option       with_old   no
    2.29  
    2.30  #   list of sources
    2.31 -Source0:      ftp://ftp.gnu.org/gnu/bison/bison-%{V_new}.tar.gz
    2.32 -Source1:      ftp://ftp.gnu.org/gnu/bison/bison-%{V_old}.tar.gz
    2.33 +Source0:      http://ftp.gnu.org/gnu/bison/bison-%{V_new}.tar.gz
    2.34 +Source1:      http://ftp.gnu.org/gnu/bison/bison-%{V_old}.tar.gz
    2.35  Patch0:       bison.patch
    2.36  
    2.37  #   build information
    2.38 -Prefix:       %{l_prefix}
    2.39 -BuildRoot:    %{l_buildroot}
    2.40 -BuildPreReq:  OpenPKG, openpkg >= 20040212, m4, make
    2.41 -PreReq:       OpenPKG, openpkg >= 20040212, m4
    2.42 -AutoReq:      no
    2.43 -AutoReqProv:  no
    2.44 +BuildPreReq:  OpenPKG, openpkg >= 20100101, m4, make
    2.45 +PreReq:       OpenPKG, openpkg >= 20100101, m4
    2.46  Conflicts:    yacc
    2.47  
    2.48  %description
    2.49 @@ -68,12 +64,12 @@
    2.50  %track
    2.51      prog bison:new = {
    2.52          version   = %{V_new}
    2.53 -        url       = ftp://ftp.gnu.org/gnu/bison/
    2.54 +        url       = http://ftp.gnu.org/gnu/bison/
    2.55          regex     = bison-(2.\d+(.\d+)*[a-z]?)\.tar\.gz
    2.56      }
    2.57      prog bison:old = {
    2.58          version   = %{V_old}
    2.59 -        url       = ftp://ftp.gnu.org/gnu/bison/
    2.60 +        url       = http://ftp.gnu.org/gnu/bison/
    2.61          regex     = bison-(1\.3\d+)\.tar\.gz
    2.62      }
    2.63  
    2.64 @@ -82,14 +78,22 @@
    2.65      %patch -p0 -d bison-%{V_new}
    2.66      %setup -q -T -D -a 1
    2.67      %{l_shtool} subst \
    2.68 +        -e 's;ac_config_files.*etc/bench\.pl";;' \
    2.69 +        bison-%{V_new}/configure
    2.70 +    %{l_shtool} subst \
    2.71          -e 's;^\( *SUBDIRS = .*\) examples\(.*\)$;\1\2;' \
    2.72 +        -e 's;^\( *SUBDIRS = .*\) tests\(.*\)$;\1\2;' \
    2.73 +        -e 's;^\( *SUBDIRS = .*\) etc\(.*\)$;\1\2;' \
    2.74          bison-%{V_new}/Makefile.in
    2.75 +    touch bison-%{V_new}/doc/bison.1
    2.76  
    2.77  %build
    2.78      ( cd bison-%{V_new}
    2.79        CC="%{l_cc}" \
    2.80        CFLAGS="%{l_cflags -O}" \
    2.81 -      ./configure \
    2.82 +      CONFIG_SHELL="%{l_bash}" \
    2.83 +      GREP="grep" \
    2.84 +      "%{l_bash}" configure \
    2.85            --prefix=%{l_prefix} \
    2.86            --mandir=%{l_prefix}/man \
    2.87            --infodir=%{l_prefix}/info \
    2.88 @@ -100,6 +104,7 @@
    2.89      ( cd bison-%{V_old}
    2.90        CC="%{l_cc}" \
    2.91        CFLAGS="%{l_cflags -O}" \
    2.92 +      GREP="grep" \
    2.93        ./configure \
    2.94            --prefix=%{l_prefix} \
    2.95            --mandir=%{l_prefix}/man \
    2.96 @@ -110,7 +115,6 @@
    2.97  %endif
    2.98  
    2.99  %install
   2.100 -    rm -rf $RPM_BUILD_ROOT
   2.101  %if "%{with_old}" == "yes"
   2.102      ( cd bison-%{V_old}
   2.103        %{l_make} -f Makefile %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
   2.104 @@ -132,5 +136,4 @@
   2.105  %files -f files
   2.106  
   2.107  %clean
   2.108 -    rm -rf $RPM_BUILD_ROOT
   2.109