OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Jun-2006 08:53:09
Branch: HEAD Handle: 2006062707530900
Modified files:
openpkg-src/autoconf autoconf.spec
Log:
upgrade to GNU Autoconf 2.60 but keep 2.59 packaged as there are some
nasty incompatibilities
Summary:
Revision Changes Path
1.52 +47 -12 openpkg-src/autoconf/autoconf.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/autoconf/autoconf.spec
============================================================================
$ cvs diff -u -r1.51 -r1.52 autoconf.spec
--- openpkg-src/autoconf/autoconf.spec 1 Jan 2006 13:12:08 -0000
1.51
+++ openpkg-src/autoconf/autoconf.spec 27 Jun 2006 06:53:09 -0000
1.52
@@ -23,8 +23,9 @@
##
# version numbers
-%define V_latest 2.59
-%define V_old 2.13
+%define V_latest 2.60
+%define V_older 2.59
+%define V_ancient 2.13
# package information
Name: autoconf
@@ -37,11 +38,12 @@
Group: Development
License: GPL
Version: %{V_latest}
-Release: 20040429
+Release: 20060627
# list of sources
-Source1: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{V_latest}.tar.gz
-Source0: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{V_old}.tar.gz
+Source0: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{V_latest}.tar.gz
+Source1: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{V_older}.tar.gz
+Source2: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{V_ancient}.tar.gz
Patch0: autoconf.patch
# build information
@@ -71,22 +73,42 @@
%prep
%setup -q -c -n autoconf-%{V_latest}
%setup -q -T -D -a 1
+ %setup -q -T -D -a 2
%patch -p0
%build
# configure and build Autoconf (deprecated version)
- ( cd autoconf-%{V_old}
+ ( cd autoconf-%{V_ancient}
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
./configure \
--prefix=%{l_prefix} \
- --program-suffix=-old
+ --program-suffix=-213
%{l_shtool} subst \
- -e 's;\(acdatadir = $(datadir)/autoconf\);\1/old;' \
+ -e 's;\(acdatadir = $(datadir)/autoconf\);\1/213;' \
Makefile
%{l_make} %{l_mflags}
) || exit $?
+ # configure and build Autoconf (older version)
+ ( cd autoconf-%{V_older}
+ %{l_shtool} subst \
+ -e 's;^\(PACKAGE_STRING=.GNU Autoconf [0-9.]*\)\(.\);\1
(%{l_openpkg_release})\2;g' \
+ configure
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ ACLOCAL=true \
+ AUTOMAKE=true \
+ AUTOCONF=true \
+ AUTOHEADER=true \
+ MAKEINFO=true \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --datadir=%{l_prefix}/share/autoconf/259 \
+ --program-suffix=-259
+ %{l_make} %{l_mflags}
+ ) || exit $?
+
# configure and build Autoconf (current version)
( cd autoconf-%{V_latest}
%{l_shtool} subst \
@@ -100,7 +122,9 @@
AUTOHEADER=true \
MAKEINFO=true \
./configure \
- --prefix=%{l_prefix}
+ --prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
+ --infodir=%{l_prefix}/info
%{l_make} %{l_mflags}
) || exit $?
@@ -108,17 +132,28 @@
rm -rf $RPM_BUILD_ROOT
# configure and build Autoconf (deprecated version)
- ( cd autoconf-%{V_old}
+ ( cd autoconf-%{V_ancient}
%{l_make} %{l_mflags} install \
prefix=$RPM_BUILD_ROOT%{l_prefix}
mv $RPM_BUILD_ROOT%{l_prefix}/info/autoconf.info \
- $RPM_BUILD_ROOT%{l_prefix}/info/autoconf-old.info
+ $RPM_BUILD_ROOT%{l_prefix}/info/autoconf-213.info
+ ) || exit $?
+
+ # configure and build Autoconf (older version)
+ ( cd autoconf-%{V_older}
+ %{l_make} %{l_mflags} install \
+ prefix=$RPM_BUILD_ROOT%{l_prefix} \
+ datadir=$RPM_BUILD_ROOT%{l_prefix}/share/autoconf/259
+ mv $RPM_BUILD_ROOT%{l_prefix}/info/autoconf.info \
+ $RPM_BUILD_ROOT%{l_prefix}/info/autoconf-259.info
) || exit $?
# configure and build Autoconf (current version)
( cd autoconf-%{V_latest}
%{l_make} %{l_mflags} install \
- prefix=$RPM_BUILD_ROOT%{l_prefix}
+ prefix=$RPM_BUILD_ROOT%{l_prefix} \
+ mandir=$RPM_BUILD_ROOT%{l_prefix}/man \
+ infodir=$RPM_BUILD_ROOT%{l_prefix}/info
) || exit $?
# strip down installation
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
