Author: glen Date: Fri Jan 22 16:51:23 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- ac compatible
---- Files affected:
packages/gzip:
gzip.spec (1.108 -> 1.109)
---- Diffs:
================================================================
Index: packages/gzip/gzip.spec
diff -u packages/gzip/gzip.spec:1.108 packages/gzip/gzip.spec:1.109
--- packages/gzip/gzip.spec:1.108 Thu Jan 21 08:21:37 2010
+++ packages/gzip/gzip.spec Fri Jan 22 17:51:18 2010
@@ -26,7 +26,12 @@
Patch6: %{name}-CVE-2006-433x.patch
URL: http://www.gnu.org/software/gzip/
BuildRequires: autoconf >= 2.60
+%if "%{pld_release}" == "ac"
BuildRequires: automake >= 1:1.7
+%else
+BuildRequires: automake >= 1:1.11
+%endif
+BuildRequires: rpm >= 4.4.9-56
BuildRequires: texinfo
Requires: mktemp
Provides: gzip(rsyncable)
@@ -77,6 +82,14 @@
%patch5 -p1
%patch6 -p1
+%if "%{pld_release}" == "ac"
+%{__sed} -i -e '/AM_SILENT_RULES/d' configure.ac
+%{__sed} -i -e '/AM_INIT_AUTOMAKE/s,1\.11,1.10,' configure.ac
+%{__sed} -i -e '/AM_INIT_AUTOMAKE/s,dist-xz,,' configure.ac
+%{__sed} -i -e '/AM_INIT_AUTOMAKE/s,color-tests,,' configure.ac
+%{__sed} -i -e '/AM_INIT_AUTOMAKE/s,parallel-tests,,' configure.ac
+%endif
+
%build
%{__aclocal} -I m4
%{__autoconf}
@@ -95,7 +108,6 @@
mv -f $RPM_BUILD_ROOT%{_bindir}/gzip $RPM_BUILD_ROOT/bin
rm -f $RPM_BUILD_ROOT%{_bindir}/gunzip $RPM_BUILD_ROOT%{_bindir}/zcat
-
cat << EOF >$RPM_BUILD_ROOT/etc/env.d/GZIP
#GZIP="-5"
EOF
@@ -117,6 +129,10 @@
bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
mv $RPM_BUILD_ROOT%{_mandir}/pt/*.1 $RPM_BUILD_ROOT%{_mandir}/pt/man1
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+rm -f $RPM_BUILD_ROOT%{_mandir}/README.gzip-non-english-man-pages*
+rm -f $RPM_BUILD_ROOT%{_mandir}/gzip-da_de_gzip.patch*
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -152,6 +168,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.109 2010/01/22 16:51:18 glen
+- ac compatible
+
Revision 1.108 2010/01/21 07:21:37 glen
- release 2
@@ -476,32 +495,3 @@
Revision 1.19 1999/07/12 23:05:58 kloczek
- added using CVS keywords in %changelog (for automating them).
-
-* Mon Jun 07 1999 Jan Rękorajski <[email protected]>
- [1.2.4-18]
-- spec cleanup
-
-* Mon Apr 19 1999 Tomasz Kłoczko <[email protected]>
- [1.2.4-17]
-- recompiles on new rpm.
-
-* Sat Jan 02 1999 Tomasz Kłoczko <[email protected]>
- [1.2.4-15]
-- standarized {un}registering info pages; second try (added
- gzip-info.patch).
-
-* Sat Dec 12 1998 Tomasz Kłoczko <[email protected]>
- [1.2.4-14]
-- added gzipping man pages,
-- added using LDFLAGS="-s" to ./configure environment,
-- added some pl man pages: gzip(1), zcmp(1), zdiff(1), zforce(1),
- zgrep(1), zmore(1), znew(1),
-- standarized {un}registering info pages.
-
-* Thu Sep 24 1998 Andrzej Nakonieczny <[email protected]>
- [1.2.4-13]
-- added pl translation,
-- changed buildroot for /tmp/%{name}-%{version}-root,
-- added %{name} and %{version} macros in Source.
-- added %defattr support,
-- start at RH spec.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gzip/gzip.spec?r1=1.108&r2=1.109&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
