OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re, openpkg-web, openpkg-src Date: 11-Oct-2002 21:21:33
Branch: HEAD Handle: 2002101120213101
Modified files:
openpkg-re/vcheck vc.bison
openpkg-src/bison bison.spec
openpkg-web news.txt
Log:
downgrade to Bison 1.35 but nevertheless provide the 1.50
version as bison-beta, similar to what we do with Flex.
Summary:
Revision Changes Path
1.4 +7 -2 openpkg-re/vcheck/vc.bison
1.30 +55 -14 openpkg-src/bison/bison.spec
1.1756 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-re/vcheck/vc.bison
============================================================
$ cvs diff -u -r1.3 -r1.4 vc.bison
--- openpkg-re/vcheck/vc.bison 6 Oct 2002 07:36:08 -0000 1.3
+++ openpkg-re/vcheck/vc.bison 11 Oct 2002 19:21:31 -0000 1.4
@@ -1,9 +1,14 @@
config = {
}
-prog bison = {
+prog bison:beta = {
version = 1.50
url = ftp://ftp.gnu.org/gnu/bison/
- regex = bison-(__VER__)\.tar\.gz
+ regex = bison-(1\.5\d+)\.tar\.gz
+}
+prog bison:release = {
+ version = 1.35
+ url = ftp://ftp.gnu.org/gnu/bison/
+ regex = bison-(1\.3\d+)\.tar\.gz
}
Index: openpkg-src/bison/bison.spec
============================================================
$ cvs diff -u -r1.29 -r1.30 bison.spec
--- openpkg-src/bison/bison.spec 8 Oct 2002 13:07:52 -0000 1.29
+++ openpkg-src/bison/bison.spec 11 Oct 2002 19:21:32 -0000 1.30
@@ -23,6 +23,15 @@
## SUCH DAMAGE.
##
+# package options
+%ifndef with_beta
+%define with_beta yes
+%endif
+
+# package versions
+%define V_release 1.35
+%define V_beta 1.50
+
# package information
Name: bison
Summary: Yacc-compatible LALR(1) Parser Generator
@@ -32,11 +41,12 @@
Distribution: OpenPKG [CORE]
Group: Language
License: GPL
-Version: 1.50
-Release: 20021008
+Version: %{V_release}
+Release: 20021011
# list of sources
-Source0: ftp://ftp.gnu.org/gnu/bison/bison-%{version}.tar.gz
+Source0: ftp://ftp.gnu.org/gnu/bison/bison-%{V_release}.tar.gz
+Source1: ftp://ftp.gnu.org/gnu/bison/bison-%{V_beta}.tar.gz
Patch0: bison.patch
# build information
@@ -57,25 +67,56 @@
with no change. Anyone familiar with yacc should be able to use bison with
little trouble.
+ Options:
+ --define 'with_beta %{with_beta}'
+
%prep
- %setup -q
- %patch -p0
+ %setup0 -q -c -n bison-%{V_release}
+%if "%{with_beta}" == "yes"
+ %setup1 -q -T -D -a 1
+%endif
+ ( cd bison-%{V_beta}
+ %patch -p0
+ )
%build
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- CONFIG_SHELL=/bin/sh \
- ./configure \
- --prefix=%{l_prefix}
- %{l_make} -f Makefile %{l_mflags}
+ ( cd bison-%{V_release}
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ CONFIG_SHELL=/bin/sh \
+ ./configure \
+ --prefix=%{l_prefix}
+ %{l_make} -f Makefile %{l_mflags}
+ )
+%if "%{with_beta}" == "yes"
+ ( cd bison-%{V_beta}
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ CONFIG_SHELL=/bin/sh \
+ ./configure \
+ --prefix=%{l_prefix}
+ %{l_make} -f Makefile %{l_mflags}
+ )
+%endif
%install
rm -rf $RPM_BUILD_ROOT
- %{l_make} -f Makefile %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+%if "%{with_beta}" == "yes"
+ ( cd bison-%{V_beta}
+ %{l_make} -f Makefile %{l_mflags} install
AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+ mv $RPM_BUILD_ROOT%{l_prefix}/bin/bison \
+ $RPM_BUILD_ROOT%{l_prefix}/bin/bison-beta
+ mv $RPM_BUILD_ROOT%{l_prefix}/man/man1/bison.1 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1/bison-beta.1
+ )
+%endif
+ ( cd bison-%{V_release}
+ %{l_make} -f Makefile %{l_mflags} install
AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+ )
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/charset.alias
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1755 -r1.1756 news.txt
--- openpkg-web/news.txt 11 Oct 2002 18:41:20 -0000 1.1755
+++ openpkg-web/news.txt 11 Oct 2002 19:21:32 -0000 1.1756
@@ -1,3 +1,4 @@
+11-Oct-2002: Upgraded package: P<bison-1.35-20021011>
11-Oct-2002: Upgraded package: P<vim-6.1.214-20021011>
11-Oct-2002: Upgraded package: P<whois-4.5.31-20021011>
11-Oct-2002: Upgraded package: P<openpkg-20021011-20021011>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
