[checkdns] Fix RHBZ #947058
fantom
fantom at fedoraproject.org
Tue Feb 25 02:37:22 UTC 2014
commit aff84a89a54e7595a549af854a4698c60bd49275
Author: Matthieu Saulnier <fantom at fedoraproject.org>
Date: Tue Feb 25 03:38:05 2014 +0100
Fix RHBZ #947058
checkdns.spec | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/checkdns.spec b/checkdns.spec
index 31bab46..192e773 100644
--- a/checkdns.spec
+++ b/checkdns.spec
@@ -1,17 +1,15 @@
Name: checkdns
Version: 0.5
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: A Domain Name Server analysis and reporting tool
-Group: Applications/Internet
License: GPLv2+
URL: http://www.enderunix.org/checkdns/
Source0: http://www.enderunix.org/checkdns/%{name}-%{version}.tar.gz
Source1: checkdns.cron
Patch0: checkdns-0.5.config_location.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: httpd, bind
+Requires: httpd, bind, crontabs
Requires(pre): shadow-utils
%description
@@ -39,20 +37,14 @@ export CFLAGS
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/%{_sbindir}
-install -p checkdns $RPM_BUILD_ROOT/%{_sbindir}
+install -D -p %{name} $RPM_BUILD_ROOT/%{_sbindir}/%{name}
install -d $RPM_BUILD_ROOT/%{_sysconfdir}
sed -e '/html_output_dir/s at usr/local/apache/htdocs at var/www/html@' -e '/lang_file/s at local/@@' checkdns.conf-dist > $RPM_BUILD_ROOT/%{_sysconfdir}/checkdns.conf
-install -d $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d
-install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/%{name}
-install -d $RPM_BUILD_ROOT/%{_localstatedir}/www/html/%{name}
-install -p -m 0644 checkdns.css $RPM_BUILD_ROOT/%{_localstatedir}/www/html/%{name}
+install -D -p -m 0640 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/%{name}
+install -D -p -m 0644 %{name}.css $RPM_BUILD_ROOT/%{_localstatedir}/www/html/%{name}/%{name}.css
install -d $RPM_BUILD_ROOT/%{_datadir}/%{name}
cp -rp lang $RPM_BUILD_ROOT/%{_datadir}/%{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
%pre
getent passwd checkdns >/dev/null || useradd -d \
@@ -60,7 +52,6 @@ getent passwd checkdns >/dev/null || useradd -d \
:
%files
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING INSTALL LICENSE README THANKS TODO
%config(noreplace) %{_sysconfdir}/checkdns.conf
%config(noreplace) %{_sysconfdir}/cron.d/%{name}
@@ -70,6 +61,13 @@ getent passwd checkdns >/dev/null || useradd -d \
%config(noreplace) %{_localstatedir}/www/html/%{name}/checkdns.css
%changelog
+* Tue Feb 25 2014 Matthieu Saulnier <fantom at fedoraproject.org> - 0.5-15
+- Add requirement on crontabs (Fix RHBZ #947058)
+- Fix modes of cron job file in %%install section
+- Remove obsoletes tags in spec file
+- Remove %%clean section in spec file
+- Cleanup %%install section in spec file
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list