rpm/automake
SHA256
1
0
Fork 0
forked from pool/automake
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/automake?expand=0&rev=3

Browse Source
This commit is contained in:
OBS User unknown 2007-10-13 16:02:19 +00:00 committed by Git OBS Bridge
parent 28116adaed
commit 441708139a
3 changed files with 156 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
automake.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Oct 11 11:17:09 CEST 2007 - schwab@suse.de
- Add lzma support.
-------------------------------------------------------------------
Mon Jan 29 16:58:05 CET 2007 - sbrabec@suse.cz

15
automake.spec
View File

@ -12,17 +12,18 @@
Name: automake
BuildRequires: help2man
License: GNU General Public License (GPL)
License: GPL v2 or later
Group: Development/Tools/Building
Autoreqprov: on
AutoReqProv: on
PreReq: %{install_info_prereq}
Version: 1.10
Release: 10
Release: 48
Summary: A Program for Automatically Generating GNU-Style Makefile.in Files
URL: http://www.gnu.org/software/automake
Url: http://www.gnu.org/software/automake
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: automake-%{version}.tar.bz2
Patch1: automake-SuSE.patch
Patch2: lzma.diff
Patch3: require_file.patch
%description
@ -43,6 +44,7 @@ Authors:
%prep
%setup -q -n automake-%{version}
%patch1
%patch2 -p1
%patch3
%build
@ -81,8 +83,9 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/aclocal*
/usr/share/automake-*
%config /etc/aclocal_dirlist
%changelog -n automake
%changelog
* Thu Oct 11 2007 - schwab@suse.de
- Add lzma support.
* Mon Jan 29 2007 - sbrabec@suse.cz
- Removed references to /opt/gnome.
* Sun Oct 15 2006 - schwab@suse.de

142
lzma.diff Normal file
View File

@ -0,0 +1,142 @@
2007-10-09 Jim Meyering <meyering@redhat.com>
Add lzma compression support.
* automake.in (handle_dist): Recognize dist-lzma.
(make_paragraphs): Map LZMA to dist-lzma.
* doc/automake.texi (Dist): Add dist-lzma.
(Options): Likewise.
* lib/Automake/Options.pm (_process_option_list):
* lib/am/distdir.am (dist-lzma): New rule.
(dist dist-all): Add command to create an lzma-compressed tarball.
(distcheck): Handle lzma-compressed tarballs just like the others.
Suggestion from Karl Berry.
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1649
retrieving revision 1.1650
diff -u -r1.1649 -r1.1650
--- automake/automake.in 2007/09/30 04:18:20 1.1649
+++ automake/automake.in 2007/10/09 14:52:19 1.1650
@@ -3613,7 +3613,7 @@
{
my $archive_defined = option 'no-dist-gzip' ? 0 : 1;
$archive_defined ||=
- grep { option "dist-$_" } ('shar', 'zip', 'tarZ', 'bzip2');
+ grep { option "dist-$_" } qw(shar zip tarZ bzip2 lzma);
error (option 'no-dist-gzip',
"no-dist-gzip specified but no dist-* specified, "
. "at least one archive format must be enabled")
@@ -6446,6 +6446,7 @@
'MAINTAINER-MODE'
=> $seen_maint_mode ? subst ('MAINTAINER_MODE_TRUE') : '',
+ 'LZMA' => !! option 'dist-lzma',
'BZIP2' => !! option 'dist-bzip2',
'COMPRESS' => !! option 'dist-tarZ',
'GZIP' => ! option 'no-dist-gzip',
===================================================================
RCS file: /cvs/automake/automake/doc/automake.texi,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- automake/doc/automake.texi 2007/08/19 07:46:52 1.171
+++ automake/doc/automake.texi 2007/10/09 14:52:20 1.172
@@ -8082,6 +8082,11 @@
Generate a gzip tar archive of the distribution.
@trindex dist-gzip
+@item @code{dist-lzma}
+Generate a lzma tar archive of the distribution. lzma archives are
+frequently smaller than @command{bzip2}-compressed archives.
+@trindex dist-lzma
+
@item @code{dist-shar}
Generate a shar archive of the distribution.
@trindex dist-shar
@@ -8369,6 +8374,12 @@
Hook @code{dist-bzip2} to @code{dist}.
@trindex dist-bzip2
+@item @option{dist-lzma}
+@cindex Option, @option{dist-lzma}
+@opindex dist-lzma
+Hook @code{dist-lzma} to @code{dist}.
+@trindex dist-lzma
+
@item @option{dist-shar}
@cindex Option, @option{dist-shar}
@opindex dist-shar
@@ -8540,7 +8551,7 @@
These three mutually exclusive options select the tar format to use
when generating tarballs with @samp{make dist}. (The tar file created
is then compressed according to the set of @option{no-dist-gzip},
-@option{dist-bzip2} and @option{dist-tarZ} options in use.)
+@option{dist-bzip2}, @option{dist-lzma} and @option{dist-tarZ} options in use.)
These options must be passed as argument to @code{AM_INIT_AUTOMAKE}
(@pxref{Macros}) because they can require additional configure checks.
@@ -12074,4 +12085,4 @@
@c LocalWords: LTALLOCA MALLOC malloc memcmp strdup alloca libcompat xyz DFOO
@c LocalWords: unprefixed buildable preprocessed DBAZ DDATADIR WARNINGCFLAGS
@c LocalWords: LIBFOOCFLAGS LIBFOOLDFLAGS ftable testSubDir obj LIBTOOLFLAGS
-@c LocalWords: barexec Pinard's automatize initialize
+@c LocalWords: barexec Pinard's automatize initialize lzma
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/Options.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- automake/lib/Automake/Options.pm 2007/07/07 11:23:27 1.8
+++ automake/lib/Automake/Options.pm 2007/10/09 14:52:20 1.9
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -261,6 +261,7 @@
elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo'
|| $_ eq 'dist-shar' || $_ eq 'dist-zip'
|| $_ eq 'dist-tarZ' || $_ eq 'dist-bzip2'
+ || $_ eq 'dist-lzma'
|| $_ eq 'no-dist-gzip' || $_ eq 'no-dist'
|| $_ eq 'dejagnu' || $_ eq 'no-texinfo.tex'
|| $_ eq 'readme-alpha' || $_ eq 'check-news'
===================================================================
RCS file: /cvs/automake/automake/lib/am/distdir.am,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- automake/lib/am/distdir.am 2007/07/07 11:23:28 1.70
+++ automake/lib/am/distdir.am 2007/10/09 14:52:20 1.71
@@ -259,6 +259,12 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+?LZMA?DIST_ARCHIVES += $(distdir).tar.lzma
+.PHONY: dist-lzma
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
?COMPRESS?DIST_ARCHIVES += $(distdir).tar.Z
.PHONY: dist-tarZ
dist-tarZ: distdir
@@ -295,6 +301,7 @@
dist dist-all: distdir
?GZIP? tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
?BZIP2? tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+?LZMA? tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
?COMPRESS? tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
?SHAR? shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
?ZIP? -rm -f $(distdir).zip
@@ -320,6 +327,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \