Sprout from master 2006-03-28 14:25:56 UTC Elan Ruusamäe <glen@pld-linux.org> '- complete patch (apply to all languages)'
Cherrypick from master 2004-11-08 13:24:05 UTC freetz <freetz@pld-linux.org> '- fix DESTDIR mess in byte compiled python stuff':
automake-py_compile.patch -> 1.1
Delete:
automake-amd64.patch
automake-c.lo.patch
automake-info.patch
automake-libtool.patch
automake-libtoolize.patch
automake-no_versioned_dir.patch
automake.spec
+++ /dev/null
-diff -durN -x '*~' -x '*.orig' automake-1.8.orig/lib/config.sub automake-1.8/lib/config.sub
---- automake-1.8.orig/lib/config.sub 2003-11-25 23:07:32.000000000 +0100
-+++ automake-1.8/lib/config.sub 2004-01-02 21:29:53.839623027 +0100
-@@ -380,6 +380,9 @@
- amd64)
- basic_machine=x86_64-pc
- ;;
-+ amd64-*)
-+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- amdahl)
- basic_machine=580-amdahl
- os=-sysv
+++ /dev/null
---- automake-1.6b/lib/am/depend2.am.wiget Wed Aug 7 16:07:22 2002
-+++ automake-1.6b/lib/am/depend2.am Wed Aug 7 16:07:58 2002
-@@ -82,7 +82,7 @@
- if %FASTDEP%
- ## In fast-dep mode, we can always use -o.
- if %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF "%DEPBASE%.Tpo" \
-- %-c% -o %LTOBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% \
-+ %-c% -o %LTOBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \
- then mv "%DEPBASE%.Tpo" "%DEPBASE%.Po"; \
- else rm -f "%DEPBASE%.Tpo"; exit 1; \
- fi
+++ /dev/null
---- automake-1.9.6/doc/automake.texi.orig 2005-07-09 11:28:44.000000000 +0200
-+++ automake-1.9.6/doc/automake.texi 2005-07-16 15:22:23.458288944 +0200
-@@ -32,14 +32,10 @@
- @end quotation
- @end copying
-
--@dircategory Software development
-+@dircategory Programming tools:
- @direntry
--* automake: (automake). Making Makefile.in's.
--@end direntry
--
--@dircategory Individual utilities
--@direntry
--* aclocal: (automake)Invoking aclocal. Generating aclocal.m4.
-+* automake: (automake). Making Makefile.in's
-+* aclocal: (automake)aclocal. Generating aclocal.m4
- @end direntry
-
- @titlepage
-@@ -130,7 +126,7 @@
-
- * Requirements:: Configuration requirements
- * Optional:: Other things Automake recognizes
--* Invoking aclocal:: Auto-generating aclocal.m4
-+* aclocal:: Auto-generating aclocal.m4
- * aclocal options:: aclocal command line arguments
- * Macro search path:: Modifying aclocal's search path
- * Macros:: Autoconf macros supplied with Automake
-@@ -1286,7 +1282,7 @@
- @menu
- * Requirements:: Configuration requirements
- * Optional:: Other things Automake recognizes
--* Invoking aclocal:: Auto-generating aclocal.m4
-+* aclocal:: Auto-generating aclocal.m4
- * aclocal options:: aclocal command line arguments
- * Macro search path:: Modifying aclocal's search path
- * Macros:: Autoconf macros supplied with Automake
-@@ -1490,13 +1486,12 @@
- @code{m4_include} is seldom used by @file{configure.ac} authors, but
- can appear in @file{aclocal.m4} when @command{aclocal} detects that
- some required macros come from files local to your package (as opposed
--to macros installed in a system-wide directory, @pxref{Invoking
--aclocal}).
-+to macros installed in a system-wide directory, @pxref{aclocal}).
-
- @end ftable
-
-
--@node Invoking aclocal
-+@node aclocal
- @section Auto-generating aclocal.m4
-
- @cindex Invoking @command{aclocal}
-@@ -2120,12 +2115,12 @@
-
- @code{ACLOCAL_AMFLAGS} contains options to pass to @command{aclocal}
- when @file{aclocal.m4} is to be rebuilt by @command{make}. This line is
--also used by @command{autoreconf} (@pxref{autoreconf Invocation, ,
-+also used by @command{autoreconf} (@pxref{autoreconf, ,
- Using @command{autoreconf} to Update @file{configure} Scripts,
- autoconf, The Autoconf Manual}) to run @command{aclocal} with suitable
--options, or by @command{autopoint} (@pxref{autopoint Invocation, ,
-+options, or by @command{autopoint} (@pxref{autopoint, ,
- Invoking the @command{autopoint} Program, gettext, GNU gettext tools})
--and @command{gettextize} (@pxref{gettextize Invocation, , Invoking the
-+and @command{gettextize} (@pxref{gettextize, , Invoking the
- @command{gettextize} Program, gettext, GNU gettext tools}) to locate
- the place where Gettext's macros should be installed. So even if you
- do not really care about the rebuild rules, you should define
+++ /dev/null
-diff -uNr automake-1.6.3/automake.in automake-1.6.3.new/automake.in
---- automake-1.6.3/automake.in Wed Aug 28 19:41:13 2002
-+++ automake-1.6.3.new/automake.in Wed Aug 28 19:41:47 2002
-@@ -3017,10 +3017,7 @@
- }
- if (basename ($onelib) !~ /$libname_rx$/)
- {
-- # FIXME this should only be a warning for foreign packages
-- # FIXME should put line number here. That means mapping
-- # from library name back to variable name.
-- &am_error ("`$onelib' is not a standard libtool library name");
-+ warn ("`$onelib' is not a standard libtool library name");
- }
-
- if (variable_defined ($xlib . '_LIBADD'))
+++ /dev/null
---- automake-1.4-p4/automake.in Wed Jul 12 11:40:03 2000
-+++ automake-1.4-p4/automake.in Thu Nov 9 07:04:46 2000
-@@ -6882,9 +6882,11 @@
- $suppress = 1;
-
- # Maybe run libtoolize.
-+ @libtoolize_args = ('--automake');
-+ push @libtoolize_args, '-c' if $copy_missing;
- if ($seen_libtool
- && grep ($_ eq $file, @libtoolize_files)
-- && system ('libtoolize', '--automake'))
-+ && system ('libtoolize', @libtoolize_args))
- {
- $message = "installing \`$errfile'";
- $suppress = 0;
+++ /dev/null
---- automake-1.8.4/automake.in.orig 2004-04-10 19:15:32.000000000 +0200
-+++ automake-1.8.4/automake.in 2004-04-29 02:33:26.305817840 +0200
-@@ -31,7 +31,7 @@
-
- BEGIN
- {
-- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
-+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
- unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
-
- # Override SHELL. This is required on DJGPP so that system() uses
---- automake-1.8.4/aclocal.in.orig 2004-04-10 19:15:32.000000000 +0200
-+++ automake-1.8.4/aclocal.in 2004-04-29 02:33:09.191419624 +0200
-@@ -29,7 +29,7 @@
-
- BEGIN
- {
-- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
-+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
- unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
- }
-
-@@ -623,7 +623,7 @@
- # 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")
-+ push (@dirlist, "$acdir")
- if $acdir eq $default_acdir;
-
- # By default $(datadir)/aclocal doesn't exist. We don't want to
---- automake-1.8.4/lib/Automake/Config.in.orig 2003-12-25 19:00:29.000000000 +0100
-+++ automake-1.8.4/lib/Automake/Config.in 2004-04-29 02:31:08.561758120 +0200
-@@ -32,7 +32,7 @@
- $APIVERSION = '@APIVERSION@';
- $PACKAGE = '@PACKAGE@';
- $VERSION = '@VERSION@';
--$libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
-+$libdir = '@datadir@/@PACKAGE@';
-
- 1;;
-
--- /dev/null
+diff -aurN automake-1.9.3.orig/lib/am/python.am automake-1.9.3/lib/am/python.am
+--- automake-1.9.3.orig/lib/am/python.am 2004-01-28 21:50:43.000000000 +0100
++++ automake-1.9.3/lib/am/python.am 2004-11-08 13:57:57.149780216 +0100
+@@ -53,7 +53,7 @@
+ ## Byte-compile must be done at install time, since file times are
+ ## encoded in the actual files.
+ test -z "$$dlist" || \
+- PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(%NDIR%dir)" $$dlist
++ PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(%NDIR%dir)" --destdir "$(DESTDIR)" $$dlist
+ endif %?INSTALL%
+
+
+diff -aurN automake-1.9.3.orig/lib/py-compile automake-1.9.3/lib/py-compile
+--- automake-1.9.3.orig/lib/py-compile 2004-01-12 23:56:48.000000000 +0100
++++ automake-1.9.3/lib/py-compile 2004-11-08 14:00:18.155344112 +0100
+@@ -35,16 +35,27 @@
+
+ basedir=
+
+-case "$1" in
+- --basedir)
+- basedir=$2
+- if test -z "$basedir"; then
+- echo "$0: Missing argument to --basedir." 1>&2
+- exit 1
+- fi
+- shift 2
+- ;;
+- -h|--h*)
++loop=true
++while test "x$loop" = "xtrue"
++do
++ case "$1" in
++ --basedir)
++ basedir=$2
++ if test -z "$basedir"; then
++ echo "$0: Missing argument to --basedir." 1>&2
++ exit 1
++ fi
++ shift 2
++ ;;
++ --destdir)
++ destdir=$2
++ if test -z "$destdir"; then
++ echo "$0: Missing argument to --destdir." 1>&2
++ exit 1
++ fi
++ shift 2
++ ;;
++ -h|--h*)
+ cat <<\EOF
+ Usage: py-compile [--help] [--version] [--basedir DIR] FILES..."
+
+@@ -53,13 +64,17 @@
+
+ Report bugs to <bug-automake@gnu.org>.
+ EOF
+- exit 0
+- ;;
+- -v|--v*)
+- echo "py-compile $scriptversion"
+- exit 0
+- ;;
+-esac
++ exit 0
++ ;;
++ -v|--v*)
++ echo "py-compile $scriptversion"
++ exit 0
++ ;;
++ *)
++ loop=false
++ ;;
++ esac
++done
+
+ if [ $# = 0 ]; then
+ echo "$0: No files given. Try \`$0 --help' for more information." 1>&2
+@@ -69,9 +84,22 @@
+ # if basedir was given, then it should be prepended to filenames before
+ # byte compilation.
+ if [ -z "$basedir" ]; then
+- trans="path = file"
++ trans=" path = file"
+ else
+- trans="path = os.path.join('$basedir', file)"
++ trans=" path = os.path.join('$basedir', file)"
++fi
++
++# if destdir was given, then it should be stripped from path when storing
++# the intended file name
++if [ -z "$destdir" ]; then
++ transdfile=" dfile = path"
++else
++ transdfile="
++ if path.startswith('$destdir'):
++ dfile = path.split('$destdir')[1]
++ else:
++ dfile = path
++ "
+ fi
+
+ $PYTHON -c "
+@@ -80,12 +108,13 @@
+ files = '''$*'''
+ print 'Byte-compiling python modules...'
+ for file in string.split(files):
+- $trans
++$trans
++$transdfile
+ if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
+ continue
+ print file,
+ sys.stdout.flush()
+- py_compile.compile(path)
++ py_compile.compile(path, dfile=dfile)
+ print" || exit $?
+
+ # this will fail for python < 1.5, but that doesn't matter ...
+@@ -95,12 +124,13 @@
+ files = '''$*'''
+ print 'Byte-compiling python modules (optimized versions) ...'
+ for file in string.split(files):
+- $trans
++$trans
++$transdfile
+ if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
+ continue
+ print file,
+ sys.stdout.flush()
+- py_compile.compile(path)
++ py_compile.compile(path, dfile=dfile)
+ print" 2>/dev/null || :
+
+ # Local Variables:
+++ /dev/null
-%include /usr/lib/rpm/macros.perl
-Summary: GNU automake - Makefile configuration tools
-Summary(de): GNU automake - Makefile-Konfigurationstools
-Summary(es): GNU automake - herramientas de configuración de Makefile
-Summary(fr): automake de GNU - Outils de configuration des makefiles
-Summary(ko): ½º½º·Î MakefileÀ» ¸¸µé¾îÁÖ´Â GNU µµ±¸
-Summary(pl): GNU Automake - generator plików Makefile
-Summary(pt_BR): GNU automake - ferramentas de configuração de Makefile
-Summary(ru): GNU automake - ÉÎÓÔÒÕÍÅÎÔÙ ÄÌÑ Á×ÔÏÍÁÔÉÞÅÓËÏÊ ÇÅÎÅÒÁÃÉÉ Makefile'Ï×
-Summary(tr): Makefile yapýlandýrma araçlarý
-Summary(uk): GNU automake - ¦ÎÓÔÒÕÍÅÎÔÉ ÄÌÑ Á×ÔÏÍÁÔÉÞÎϧ ÇÅÎÅÒÁæ§ Makefile'¦×
-Name: automake
-Version: 1.9.6
-Release: 2
-Epoch: 1
-License: GPL
-Group: Development/Building
-Source0: ftp://sources.redhat.com/pub/automake/%{name}-%{version}.tar.bz2
-# Source0-md5: c11b8100bb311492d8220378fd8bf9e0
-Patch0: %{name}-info.patch
-Patch1: %{name}-man.patch
-Patch2: %{name}-no_versioned_dir.patch
-Patch3: %{name}-CCASCOMPILE-output.patch
-Patch4: %{name}-morearchs.patch
-Patch5: %{name}-quoteld.patch
-URL: http://sources.redhat.com/automake/
-BuildRequires: autoconf >= 2.58
-BuildRequires: rpm-perlprov
-BuildRequires: texinfo >= 4.7
-Requires(pre): fileutils
-Requires: perl(File::Glob)
-Conflicts: autoconf < 2.58
-Conflicts: libtool < 2:1.5-11
-#BuildArch: noarch -- autoconf doesn't allow
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%define _aclocaldir %{_datadir}/aclocal
-
-%description
-Automake is an experimental Makefile generator. Automake was inspired
-by the 4.4BSD make and include files, but aims to be portable and to
-conform to the GNU standards for Makefile variables and targets.
-
-%description -l de
-Automake ist ein experimenteller Makefile-Generator, inspiriert durch
-die 4.4BSD-Make und Include-Dateien, der jedoch auf Portabilität und
-Konformität mit den GNU-Standards für Makefile-Variable und Targets
-abzielt.
-
-%description -l es
-Automake es un creador experimental de Makefiles. Fue inspirado en el
-4.4BSD make y incluye archivos, pero visa ser portátil y compatible
-con los padrones GNU para variables y dianas de Makefile.
-
-%description -l fr
-automake est un générateur expérimental de makefiles. Il a été inspiré
-par le make de BSD 4.4, mais se veut portable et conforme aux
-standards GNU pour les variables et les cibles des makefiles.
-
-%description -l pl
-Automake jest eksperymentalnym generatorem plików Makefile'a.
-Narzêdzie to jest wzorowane na make i plikach nag³ówkowych z systemu
-4.4BSD. Umo¿liwia ono generowanie plików Makefile w oderwaniu od
-platformy systemowej bêd±c jednocze¶nie zgodnym ze standardami GNU.
-
-%description -l pt_BR
-Automake é um gerador experimental de Makefiles. Ele foi inspirado
-pelo 4.4BSD make e inclui arquivos, mas visa ser portável e compatível
-com os padrões GNU para variáveis e alvos de Makefile.
-
-%description -l ru
-Automake - ÜÔÏ ÜËÓÐÅÒÉÍÅÎÔÁÌØÎÙÊ ÇÅÎÅÒÁÔÏÒ Makefile'Ï×. éÄÅÑ ÂÙÌÁ
-ÎÁ×ÅÑÎÁ ÐÒÏÇÒÁÍÍÏÊ make É ÈÅÄÅÒÁÍÉ ÉÚ 4.4BSD, ÎÏ automake ÐÒÅÔÅÎÄÕÅÔ
-ÎÁ ÔÏ, ÞÔÏÂÙ ÂÙÔØ ÐÏÒÔÁÂÅÌØÎÏÊ É ÓÏÏÔ×ÅÔÓÔ×Ï×ÁÔØ ÓÔÁÎÄÁÒÔÁÍ GNU ÎÁ
-ÐÅÒÅÍÅÎÎÙÅ É ÃÅÌÉ Makefile'Ï×.
-
-%description -l tr
-Automake deneysel bir Makefile üreticisidir. 4.4BSD make ve include
-dosyalarýndan esinlenilmistir, ama amaç taþýnabilir olmak ve Makefile
-deðiþkenleri ve hedefleri için GNU standartlarýna uyum göstermektir.
-
-%description -l uk
-Automake - ÃÅ ÅËÓÐÅÒÉÍÅÎÔÁÌØÎÉÊ ÇÅÎÅÒÁÔÏÒ Makefile'¦×. ¶ÄÅÑ ÂÕÌÁ
-ÎÁצÑÎÁ ÐÒÏÇÒÁÍÏÀ make ÔÁ ÈÅÄÅÒÁÍÉ Ú 4.4BSD, ÁÌÅ automake ÍÁ¤ ÚÁ æÌØ
-ÍϦÌØΦÓÔØ ÔÁ צÄÐÏצÄΦÓÔØ ÓÔÁÎÄÁÒÔÁÍ GNU ÎÁ ÚͦÎΦ Ô¦ æ̦
-Makefile'¦×.
-
-%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
-%build
-%{__autoconf}
-%configure
-%{__make}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- m4datadir=%{_aclocaldir} \
- pkgvdatadir=%{_datadir}/automake
-
-install aclocal.1 automake.1 $RPM_BUILD_ROOT%{_mandir}/man1
-
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir*
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-
-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-
-%files
-%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README THANKS TODO
-%attr(755,root,root) %{_bindir}/*
-%{_infodir}/automake*
-
-%{_aclocaldir}
-%{_mandir}/man1/*
-
-%dir %{_datadir}/automake
-%{_datadir}/automake/am
-%{_datadir}/automake/Automake
-%{_datadir}/automake/COPYING
-%{_datadir}/automake/INSTALL
-%{_datadir}/automake/texinfo.tex
-%{_datadir}/automake/ansi2knr*
-%attr(755,root,root) %{_datadir}/automake/acinstall
-%attr(755,root,root) %{_datadir}/automake/compile
-%attr(755,root,root) %{_datadir}/automake/config.guess
-%attr(755,root,root) %{_datadir}/automake/config.sub
-%attr(755,root,root) %{_datadir}/automake/config-ml.in
-%attr(755,root,root) %{_datadir}/automake/depcomp
-%attr(755,root,root) %{_datadir}/automake/elisp-comp
-%attr(755,root,root) %{_datadir}/automake/install-sh
-%attr(755,root,root) %{_datadir}/automake/mdate-sh
-%attr(755,root,root) %{_datadir}/automake/missing
-%attr(755,root,root) %{_datadir}/automake/mkinstalldirs
-%attr(755,root,root) %{_datadir}/automake/py-compile
-%attr(755,root,root) %{_datadir}/automake/symlink-tree
-%attr(755,root,root) %{_datadir}/automake/ylwrap
projects / packages / automake.git / commitdiff