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: 11-Nov-2006 20:41:29
Branch: HEAD Handle: 2006111119412900
Modified files:
openpkg-src/automake automake.patch automake.spec
Log:
upgrading package: automake 1.9.6 -> 1.10
Summary:
Revision Changes Path
1.6 +34 -38 openpkg-src/automake/automake.patch
1.75 +7 -4 openpkg-src/automake/automake.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/automake/automake.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 automake.patch
--- openpkg-src/automake/automake.patch 12 Aug 2004 07:38:49 -0000
1.5
+++ openpkg-src/automake/automake.patch 11 Nov 2006 19:41:29 -0000
1.6
@@ -1,7 +1,7 @@
Index: Makefile.in
---- 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 @@
+--- Makefile.in.orig 2006-10-15 19:25:23 +0200
++++ Makefile.in 2006-11-11 19:17:47 +0100
+@@ -68,7 +68,7 @@
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -11,9 +11,9 @@
am__remove_distdir = \
{ test ! -d $(distdir) \
Index: aclocal.in
---- 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 @@
+--- aclocal.in.orig 2006-10-15 18:19:37 +0200
++++ aclocal.in 2006-11-11 19:18:37 +0100
+@@ -30,7 +30,7 @@
BEGIN
{
@@ -22,23 +22,19 @@
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
}
-@@ -620,12 +620,6 @@
- $default_dirlist="$acdir/dirlist"
- if $acdir ne $default_acdir;
-
-- # Search the versioned directory near the end, and then the
-- # unversioned directory last. Only do this if the user didn't
-- # override acdir.
-- push (@dirlist, "$acdir-$APIVERSION")
-- if $acdir eq $default_acdir;
--
- # By default $(datadir)/aclocal doesn't exist. We don't want to
- # get an error in the case where we are searching the default
- # directory and it hasn't been created.
+@@ -56,7 +56,7 @@
+ # @system_includes can be augmented with the `dirlist' file. Also
+ # --acdir will reset both @automake_includes and @system_includes.
+ my @user_includes = ();
+-my @automake_includes = ("@datadir@/aclocal-$APIVERSION");
++my @automake_includes = ("@datadir@/aclocal");
+ my @system_includes = ('@datadir@/aclocal');
+
+ # Whether we should copy M4 file in $user_includes[0].
Index: automake.in
---- 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 @@
+--- automake.in.orig 2006-10-15 18:19:37 +0200
++++ automake.in 2006-11-11 19:17:47 +0100
+@@ -32,7 +32,7 @@
BEGIN
{
@@ -48,9 +44,9 @@
# Override SHELL. This is required on DJGPP so that system() uses
Index: configure
---- configure.orig 2004-04-18 13:29:46.000000000 +0200
-+++ configure 2004-04-20 09:13:08.000000000 +0200
-@@ -1728,7 +1728,7 @@
+--- configure.orig 2006-10-15 19:25:22 +0200
++++ configure 2006-11-11 19:17:47 +0100
+@@ -2197,7 +2197,7 @@
# A versioned directory, defined here for convenience.
@@ -60,24 +56,24 @@
# $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
Index: lib/Automake/Config.in
---- lib/Automake/Config.in.orig 2003-12-25 19:00:29.000000000 +0100
-+++ lib/Automake/Config.in 2004-04-20 09:13:08.000000000 +0200
-@@ -32,7 +32,7 @@
- $APIVERSION = '@APIVERSION@';
- $PACKAGE = '@PACKAGE@';
- $VERSION = '@VERSION@';
--$libdir = '@datadir@/@[EMAIL PROTECTED]@APIVERSION@';
-+$libdir = '@datadir@/@PACKAGE@';
+--- lib/Automake/Config.in.orig 2005-05-14 21:52:09 +0200
++++ lib/Automake/Config.in 2006-11-11 19:18:55 +0100
+@@ -30,7 +30,7 @@
+ our $APIVERSION = '@APIVERSION@';
+ our $PACKAGE = '@PACKAGE@';
+ our $VERSION = '@VERSION@';
+-our $libdir = '@datadir@/@[EMAIL PROTECTED]@APIVERSION@';
++our $libdir = '@datadir@/@PACKAGE@';
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@
+--- m4/Makefile.in.orig 2006-10-15 19:25:24 +0200
++++ m4/Makefile.in 2006-11-11 19:19:09 +0100
+@@ -143,7 +143,7 @@
target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
-m4datadir = $(datadir)/aclocal-$(APIVERSION)
+m4datadir = $(datadir)/aclocal
dist_m4data_DATA = \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/automake/automake.spec
============================================================================
$ cvs diff -u -r1.74 -r1.75 automake.spec
--- openpkg-src/automake/automake.spec 13 Oct 2006 17:26:55 -0000
1.74
+++ openpkg-src/automake/automake.spec 11 Nov 2006 19:41:29 -0000
1.75
@@ -32,8 +32,8 @@
Class: BASE
Group: Building
License: GPL
-Version: 1.9.6
-Release: 20061013
+Version: 1.10
+Release: 20061111
# list of sources
Source0:
ftp://sources.redhat.com/pub/automake/automake-%{version}.tar.gz
@@ -42,8 +42,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, perl, autoconf >= 2.58, grep
-PreReq: OpenPKG, openpkg >= 20040130, perl, autoconf >= 2.58
+BuildPreReq: OpenPKG, openpkg >= 20040130, perl, autoconf >= 2.60, grep
+PreReq: OpenPKG, openpkg >= 20040130, perl, autoconf >= 2.60
AutoReq: no
AutoReqProv: no
@@ -77,6 +77,9 @@
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
+ mv $RPM_BUILD_ROOT%{l_prefix}/share/doc/automake/amhello-*.tar.gz \
+ $RPM_BUILD_ROOT%{l_prefix}/share/automake/
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
