sharkcz pushed to collectl (el6). "- workaround perl dependency generator issue in EPEL <= 7"

[notifications at fedoraproject.org]

>From 3f987fce0096268d36c0993ebc1316aa06cc3642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 13 Apr 2015 15:55:31 +0200
Subject: - workaround perl dependency generator issue in EPEL <= 7


diff --git a/collectl-4.0.0-perl-deps.patch b/collectl-4.0.0-perl-deps.patch
new file mode 100644
index 0000000..295a054
--- /dev/null
+++ b/collectl-4.0.0-perl-deps.patch
@@ -0,0 +1,13 @@
+diff --git a/colmux b/colmux
+index 6d25a55..a961dba 100755
+--- a/colmux
++++ b/colmux
+@@ -2338,7 +2338,7 @@ Miscellanous
+   -keepalive  secs         pass this in the ssh command as '-o ServerAliveInterval=secs'
+                              to prevent ssh exiting early from an inactive ssh connection
+   -retaddr    addr         tell collectl to connect back to this address.
+-                             use -deb 1 to see address collectl told to use
++                             start with -deb 1 to see address collectl told to use
+   -timeout    secs         use this timeout for remote collectl to connect back
+                              requires collectl V3.6.4 or better
+ 
diff --git a/collectl.spec b/collectl.spec
index b113826..436e5df 100644
--- a/collectl.spec
+++ b/collectl.spec
@@ -1,7 +1,7 @@
 Summary: A utility to collect various Linux performance data
 Name: collectl
 Version: 4.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/System
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
@@ -9,6 +9,8 @@ Source1: %{name}.initd
 Source2: %{name}.sysconfig
 URL: http://collectl.sourceforge.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# workaround perl dependency generator issue (adds R: perl(-deb) on EPEL <= 7)
+Patch0: collectl-4.0.0-perl-deps.patch
 BuildArch: noarch
 Requires: perl(Sys::Syslog), perl(Time::HiRes), perl(Compress::Zlib)
 Requires(post): chkconfig
@@ -22,6 +24,7 @@ A utility to collect Linux performance data
 
 %prep
 %setup -q
+%patch0 -p1 -b .perl-deps
 
 # rename directory for easier inclusion
 mv docs html
@@ -95,6 +98,9 @@ fi
 
 
 %changelog
+* Mon Apr 13 2015 Dan Horák <dan[at]danny.cz> - 4.0.0-2
+- workaround perl dependency generator issue in EPEL <= 7
+
 * Thu Apr 09 2015 Dan Horák <dan[at]danny.cz> - 4.0.0-1
 - upgrade to upstream version 4.0.0 (#1201069)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/collectl.git/commit/?h=el6&id=3f987fce0096268d36c0993ebc1316aa06cc3642