commit ac71f66192beae6b5f21c23b4528c53a94dfbbf6 Author: Elan Ruusamäe <g...@delfi.ee> Date: Fri Dec 18 21:48:15 2015 +0200
add official patches filterout diffs to CHANGES, creates conflicts rancid.spec | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) --- diff --git a/rancid.spec b/rancid.spec index ff15018..6b17724 100644 --- a/rancid.spec +++ b/rancid.spec @@ -11,8 +11,23 @@ Source1: %{name}.cron Source2: %{name}.logrotate Patch0: %{name}-conf.patch Patch1: %{name}-Makefile.patch +Patch20: ftp://ftp.shrubbery.net/pub/rancid/%{name}-3.2.p1.gz +# Patch20-md5: aaae4fbc849f02e2f96a9858753407c4 +Patch21: ftp://ftp.shrubbery.net/pub/rancid/%{name}-3.2.p2.gz +# Patch21-md5: bea7fb227ec66a79f34b35b55db27a78 +Patch22: ftp://ftp.shrubbery.net/pub/rancid/%{name}-3.2.p3.gz +# Patch22-md5: 29ecf6751dfe0bfc365df4bce6ab7f3c +Patch23: ftp://ftp.shrubbery.net/pub/rancid/%{name}-3.2.p4.gz +# Patch23-md5: 8596ba7d19435d02bbcd71da17c082a2 +Patch24: ftp://ftp.shrubbery.net/pub/rancid/%{name}-3.2.p5.gz +# Patch24-md5: 38bd3dc4bae9066d295ff05743f03591 +Patch25: ftp://ftp.shrubbery.net/pub/rancid/%{name}-3.2.p6.gz +# Patch25-md5: 386ddc9d51390ed27eb51f57d0b54023 +Patch26: ftp://ftp.shrubbery.net/pub/rancid/%{name}-3.2.p7.gz +# Patch26-md5: 5e237785b9f86deb16eb68234a85e60a URL: http://www.shrubbery.net/rancid/ BuildRequires: autoconf +BuildRequires: patchutils BuildRequires: automake BuildRequires: cvs BuildRequires: expect >= 5.40 @@ -43,6 +58,10 @@ maintain history of changes. %patch0 -p1 %patch1 -p1 +for p in %{P:20} %{P:21} %{P:22} %{P:23} %{P:24} %{P:25} %{P:26}; do + %{__gzip} -dc $p | filterdiff -x CHANGES | patch -p0 +done + %build %configure \ --sysconfdir=%{_sysconfdir}/%{name} \ ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/rancid.git/commitdiff/ac71f66192beae6b5f21c23b4528c53a94dfbbf6 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit