From: Elan Ruusamäe <glen@delfi.ee>
Date: Sun, 28 Aug 2016 12:31:11 +0000 (+0300)
Subject: up to 3.5.0
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=8451ec26bed5ca0c50bbe06ddaafe52c41d1a341;p=packages%2Francid.git

up to 3.5.0
---

diff --git a/rancid.spec b/rancid.spec
index e58c71e..8c4833f 100644
--- a/rancid.spec
+++ b/rancid.spec
@@ -1,35 +1,23 @@
+# TODO (before rel 1)
+# - register user/group
+
 %include	/usr/lib/rpm/macros.perl
 Summary:	Really Awesome New Cisco confIg Differ
 Name:		rancid
-Version:	3.2
+Version:	3.5.0
 Release:	0.1
 License:	BSD with advertising
 Group:		Applications/Networking
 Source0:	ftp://ftp.shrubbery.net/pub/rancid/%{name}-%{version}.tar.gz
-# Source0-md5:	b0bd8a9f98bc1077893425059a03b7ec
+# Source0-md5:	d8791ce73aa23506d2d302234d74e201
 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:	coreutils
 BuildRequires:	iputils-ping
-BuildRequires:	patchutils
-BuildRequires:	perl-base
+BuildRequires:	perl-base >= 1:5.10
 BuildRequires:	rpm-perlprov >= 4.1-13
 Requires:	expect >= 5.40
 Requires:	findutils
@@ -46,19 +34,17 @@ etc) and uses CVS (Concurrent Version System) or Subversion to
 maintain history of changes.
 
 %prep
-%setup -q
+%setup -qc
+mv -n %{name}-*/* .
 %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
 AUTOMAKE=%{_bindir}/automake \
 CVS=%{_bindir}/cvs \
 EXPECT_PATH=%{_bindir}/expect \
 FIND=%{_bindir}/find \
+GIT=%{_bindir}/git \
 GREP=%{_bindir}/grep \
 PERLV_PATH=%{__perl} \
 RSH=%{_bindir}/rsh \