OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 31-Oct-2004 13:42:02 Branch: HEAD Handle: 2004103112420100 Modified files: openpkg-src/flex flex.spec Log: Switch from flex GNU flex 2.5.4a flex-beta GNU flex 2.5.31 (with_beta=yes) to flex GNU flex 2.5.31 flex-old GNU flex 2.5.4a similar to what we did in the past for GNU autoconf. Packages which do not build with GNU flex 2.5.31 have to be patched to use "flex-old" now. Summary: Revision Changes Path 1.73 +43 -46 openpkg-src/flex/flex.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/flex/flex.spec ============================================================================ $ cvs diff -u -r1.72 -r1.73 flex.spec --- openpkg-src/flex/flex.spec 17 Jul 2004 14:33:18 -0000 1.72 +++ openpkg-src/flex/flex.spec 31 Oct 2004 12:42:01 -0000 1.73 @@ -24,9 +24,9 @@ ## # package versions -%define V_release 2.5.4a -%define V_release_maj 2.5.4 -%define V_beta 2.5.31 +%define V_new 2.5.31 +%define V_old 2.5.4a +%define V_old_maj 2.5.4 # package information Name: flex @@ -38,15 +38,15 @@ Class: CORE Group: Language License: BSD -Version: %{V_release} -Release: 20040717 +Version: %{V_new} +Release: 20041031 # package options -%option with_beta yes +%option with_new yes # list of sources -Source0: ftp://ftp.gnu.org/gnu/non-gnu/flex/flex-%{V_release}.tar.gz -Source1: http://osdn.dl.sourceforge.net/sourceforge/lex/flex-%{V_beta}.tar.gz +Source0: http://osdn.dl.sourceforge.net/sourceforge/lex/flex-%{V_new}.tar.gz +Source1: ftp://ftp.gnu.org/gnu/non-gnu/flex/flex-%{V_old}.tar.gz Patch0: flex.patch # build information @@ -68,71 +68,68 @@ Whenever it finds one, it executes the corresponding C code. %track - prog flex:release = { - version = %{V_release} - url = ftp://ftp.gnu.org/gnu/non-gnu/flex/ + prog flex:new = { + version = %{V_new} + url = http://prdownloads.sourceforge.net/lex/ regex = flex-(__VER__)\.tar\.gz } - prog flex:beta = { - version = %{V_beta} - url = http://prdownloads.sourceforge.net/lex/ + prog flex:old = { + version = %{V_old} + url = ftp://ftp.gnu.org/gnu/non-gnu/flex/ regex = flex-(__VER__)\.tar\.gz } %prep %setup -q -c -%if "%{with_beta}" == "yes" %setup -q -T -D -a 1 - %patch -p0 -d flex-%{V_beta} - sleep 1; touch flex-%{V_beta}/scan.c -%endif + %patch -p0 -d flex-%{V_new} + sleep 1; touch flex-%{V_new}/scan.c %build - # configure and build Flex (stable version) - ( cd flex-%{V_release_maj} + # configure and build Flex (new version) + ( cd flex-%{V_new} CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ + HELP2MAN=`type -P true` \ ./configure \ - --prefix=$RPM_BUILD_ROOT%{l_prefix} + --prefix=%{l_prefix} \ + --disable-nls + cp -p doc/flex.1 doc/flex.1.saved %{l_make} %{l_mflags} ) || exit $? - # configure and build Flex (beta version) -%if "%{with_beta}" == "yes" - ( cd flex-%{V_beta} + # configure and build Flex (old version) + ( cd flex-%{V_old_maj} CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ - HELP2MAN=`type -P true` \ ./configure \ - --prefix=%{l_prefix} \ - --disable-nls - cp -rp doc/flex.1 doc/flex.1.saved + --prefix=$RPM_BUILD_ROOT%{l_prefix} %{l_make} %{l_mflags} ) || exit $? -%endif %install rm -rf $RPM_BUILD_ROOT - # install Flex (beta version) -%if "%{with_beta}" == "yes" - ( cd flex-%{V_beta} - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" - mv $RPM_BUILD_ROOT%{l_prefix}/bin/flex \ - $RPM_BUILD_ROOT%{l_prefix}/bin/flex-beta - mv $RPM_BUILD_ROOT%{l_prefix}/include/FlexLexer.h \ - $RPM_BUILD_ROOT%{l_prefix}/include/FlexLexer-beta.h - mv $RPM_BUILD_ROOT%{l_prefix}/lib/libfl.a \ - $RPM_BUILD_ROOT%{l_prefix}/lib/libfl-beta.a - mv doc/flex.1.saved \ - $RPM_BUILD_ROOT%{l_prefix}/man/man1/flex-beta.1 - ) || exit $? -%endif - - # install Flex (stable version) - ( cd flex-%{V_release_maj} + # install Flex (old version) + ( cd flex-%{V_old_maj} %{l_make} %{l_mflags} install rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/flex++ + mv $RPM_BUILD_ROOT%{l_prefix}/bin/flex \ + $RPM_BUILD_ROOT%{l_prefix}/bin/flex-old + mv $RPM_BUILD_ROOT%{l_prefix}/include/FlexLexer.h \ + $RPM_BUILD_ROOT%{l_prefix}/include/FlexLexer-old.h + mv $RPM_BUILD_ROOT%{l_prefix}/lib/libfl.a \ + $RPM_BUILD_ROOT%{l_prefix}/lib/libfl-old.a + mv $RPM_BUILD_ROOT%{l_prefix}/man/man1/flex.1 \ + $RPM_BUILD_ROOT%{l_prefix}/man/man1/flex-old.1 + ) || exit $? + + # install Flex (new version) + ( cd flex-%{V_new} + %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" + %{l_shtool} install -c -m 644 \ + doc/flex.1.saved \ + $RPM_BUILD_ROOT%{l_prefix}/man/man1/flex.1 ) || exit $? # strip down installation @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]