[rkhunter] Fix for unversioned docs
Kevin Fenzi
kevin at fedoraproject.org
Sat Jul 27 16:32:22 UTC 2013
commit 522eeaf9895ea96e8660d3d9e7459fc4d56b2afb
Author: Kevin Fenzi <kevin at scrye.com>
Date: Sat Jul 27 10:32:04 2013 -0600
Fix for unversioned docs
- Requires: crontabs. Fixes bug #989110
rkhunter.spec | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/rkhunter.spec b/rkhunter.spec
index b6ce2fc..34ae43c 100644
--- a/rkhunter.spec
+++ b/rkhunter.spec
@@ -1,6 +1,9 @@
+# In f20+ use unversioned docdirs, otherwise the old versioned one
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
Name: rkhunter
Version: 1.4.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: A host-based tool to scan for rootkits, backdoors and local exploits
Group: Applications/System
@@ -16,6 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: coreutils, binutils, kmod, findutils, grep
Requires: e2fsprogs, procps, lsof, iproute, wget
Requires: perl, perl(strict), perl(IO::Socket), mailx, logrotate
+Requires: crontabs
%description
Rootkit Hunter (RKH) is an easy-to-use tool which checks
@@ -45,7 +49,7 @@ EOF
%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir}
%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d}
%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts
-%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
+%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_pkgdocdir}
%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8
%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db
%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_var}/log/%{name}
@@ -59,9 +63,9 @@ EOF
%{__install} -m644 -p files/i18n/cn ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/i18n/
%{__install} -m644 -p files/i18n/en ${RPM_BUILD_ROOT}%{_var}/lib/%{name}/db/i18n/
-%{__install} -m644 -p files/CHANGELOG ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
-%{__install} -m644 -p files/LICENSE ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
-%{__install} -m644 -p files/README ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
+%{__install} -m644 -p files/CHANGELOG ${RPM_BUILD_ROOT}%{_pkgdocdir}
+%{__install} -m644 -p files/LICENSE ${RPM_BUILD_ROOT}%{_pkgdocdir}
+%{__install} -m644 -p files/README ${RPM_BUILD_ROOT}%{_pkgdocdir}
%{__install} -m755 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_datadir}/%{name}/scripts/
%{__install} -m644 -p files/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
# Don't ship these unless we want to Require the perl modules
@@ -77,7 +81,7 @@ EOF
%files
%defattr(-,root,root,-)
-%doc %{_docdir}/%{name}-%{version}/*
+%doc %{_pkgdocdir}/*
%{_bindir}/%{name}
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/scripts
@@ -91,10 +95,14 @@ EOF
%dir %{_var}/log/%{name}
%config(noreplace) %{_sysconfdir}/%{name}.conf
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%dir %{_docdir}/%{name}-%{version}
+%dir %{_pkgdocdir}
%{_mandir}/man8/*
%changelog
+* Sat Jul 27 2013 Kevin Fenzi <kevin at scrye.com> 1.4.0-8
+- Fix for unversioned docs
+- Requires: crontabs. Fixes bug #989110
+
* Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 1.4.0-7
- Perl 5.18 rebuild
More information about the scm-commits
mailing list