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: 20-Apr-2004 09:17:02
Branch: HEAD Handle: 2004042008170200
Modified files:
openpkg-src/automake automake.patch automake.spec
Log:
upgrading package: automake 1.8.3 -> 1.8.3b
Summary:
Revision Changes Path
1.4 +27 -26 openpkg-src/automake/automake.patch
1.54 +2 -2 openpkg-src/automake/automake.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/automake/automake.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 automake.patch
--- openpkg-src/automake/automake.patch 15 Apr 2004 10:43:44 -0000 1.3
+++ openpkg-src/automake/automake.patch 20 Apr 2004 07:17:02 -0000 1.4
@@ -1,7 +1,7 @@
Index: Makefile.in
---- Makefile.in.orig 2003-12-10 19:35:11.000000000 +0100
-+++ Makefile.in 2003-12-11 09:12:47.000000000 +0100
-@@ -68,7 +68,7 @@
+--- Makefile.in.orig 2004-04-18 13:29:47.000000000 +0200
++++ Makefile.in 2004-04-20 09:13:08.000000000 +0200
+@@ -67,7 +67,7 @@
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -11,18 +11,18 @@
am__remove_distdir = \
{ test ! -d $(distdir) \
Index: aclocal.in
---- aclocal.in.orig 2003-12-05 22:19:39.000000000 +0100
-+++ aclocal.in 2003-12-11 09:11:05.000000000 +0100
+--- aclocal.in.orig 2004-04-10 19:15:32.000000000 +0200
++++ aclocal.in 2004-04-20 09:14:27.000000000 +0200
@@ -29,7 +29,7 @@
BEGIN
{
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@[EMAIL
PROTECTED]@APIVERSION@';
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
- unshift @INC, (split ':', $perllibdir);
+ unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
}
-@@ -519,12 +519,6 @@
+@@ -620,12 +620,6 @@
$default_dirlist="$acdir/dirlist"
if $acdir ne $default_acdir;
@@ -36,21 +36,21 @@
# get an error in the case where we are searching the default
# directory and it hasn't been created.
Index: automake.in
---- automake.in.orig 2003-12-08 18:53:57.000000000 +0100
-+++ automake.in 2003-12-11 09:12:04.000000000 +0100
+--- automake.in.orig 2004-04-10 19:15:32.000000000 +0200
++++ automake.in 2004-04-20 09:13:59.000000000 +0200
@@ -31,7 +31,7 @@
BEGIN
{
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@[EMAIL
PROTECTED]@APIVERSION@';
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
- unshift @INC, (split ':', $perllibdir);
+ unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
# Override SHELL. This is required on DJGPP so that system() uses
Index: configure
---- configure.orig 2003-12-10 19:35:10.000000000 +0100
-+++ configure 2003-12-11 09:08:23.000000000 +0100
-@@ -1710,7 +1710,7 @@
+--- configure.orig 2004-04-18 13:29:46.000000000 +0200
++++ configure 2004-04-20 09:13:08.000000000 +0200
+@@ -1953,7 +1953,7 @@
# A versioned directory, defined here for convenience.
@@ -59,20 +59,9 @@
# $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
-Index: m4/Makefile.in
---- m4/Makefile.in.orig 2003-12-10 19:35:12.000000000 +0100
-+++ m4/Makefile.in 2003-12-11 09:09:07.000000000 +0100
-@@ -119,7 +119,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--m4datadir = $(datadir)/aclocal-$(APIVERSION)
-+m4datadir = $(datadir)/aclocal
- dist_m4data_DATA = \
- $(top_srcdir)/m4/amversion.m4 \
- as.m4 \
+Index: lib/Automake/Config.in
--- lib/Automake/Config.in.orig 2003-12-25 19:00:29.000000000 +0100
-+++ lib/Automake/Config.in 2004-04-15 12:39:21.000000000 +0200
++++ lib/Automake/Config.in 2004-04-20 09:13:08.000000000 +0200
@@ -32,7 +32,7 @@
$APIVERSION = '@APIVERSION@';
$PACKAGE = '@PACKAGE@';
@@ -82,3 +71,15 @@
1;;
+Index: m4/Makefile.in
+--- m4/Makefile.in.orig 2004-04-18 13:29:48.000000000 +0200
++++ m4/Makefile.in 2004-04-20 09:13:08.000000000 +0200
+@@ -120,7 +120,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-m4datadir = $(datadir)/aclocal-$(APIVERSION)
++m4datadir = $(datadir)/aclocal
+ dist_m4data_DATA = \
+ $(top_srcdir)/m4/amversion.m4 \
+ as.m4 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/automake/automake.spec
============================================================================
$ cvs diff -u -r1.53 -r1.54 automake.spec
--- openpkg-src/automake/automake.spec 15 Apr 2004 10:43:44 -0000 1.53
+++ openpkg-src/automake/automake.spec 20 Apr 2004 07:17:02 -0000 1.54
@@ -33,8 +33,8 @@
Class: BASE
Group: Development
License: GPL
-Version: 1.8.3
-Release: 20040415
+Version: 1.8.3b
+Release: 20040420
# list of sources
Source0: ftp://sources.redhat.com/pub/automake/automake-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
