Attachment 631638 Details for Bug 840602 – .spec changes

[patch] .spec changes

maradns.spec.diff (text/plain), 5.76 KB, created by Tomasz Torcz on 2012-10-22 16:45:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Torcz

Created: 2012-10-22 16:45:59 UTC

Size: 5.76 KB

patch

obsolete

>--- maradns.spec	2012-08-21 14:16:41.787385140 +0200
>+++ /tmp/maradns.spec	2012-10-22 18:28:42.957330203 +0200
>@@ -1,21 +1,19 @@
> Name:		maradns
> Version:	2.0.06
>-Release:	2%{?dist}
>+Release:	3%{?dist}
> Summary:	Authoritative and recursive DNS server made with security in mind
> # recursive resolver is shipped in versioned directory
> %global dwood_ver	3.2.02
> 
> Source0:	http://www.maradns.org/download/2.0/%{version}/%{name}-%{version}.tar.xz
> # submitted upstream: http://woodlane.webconquest.com/pipermail/list/2012-July/001123.html
>-Patch0:		0001-add-systemd-unit-files-Fedora-15-and-later-RHEL7.patch
>+Patch0:		%{name}-0001-add-systemd-unit-files-Fedora-15-and-later-RHEL7.patch
> License:	BSD
> URL:		http://www.maradns.org/
> 
> BuildRequires:		systemd-units
> Requires(pre):		shadow-utils
>-Requires(post):		systemd-units
>-Requires(preun):	systemd-units
>-Requires(postun):	systemd-units
>+%systemd_requires
> 
> %description
> MaraDNS is a package that implements the Domain Name Service (DNS), an
>@@ -38,7 +36,7 @@
> %build
> 
> # We don't use %%configure here because this is a homebrew configure not generated by autoconf
>-./configure --ipv6
>+./configure --ipv6 --libdir=%{_libdir}
> 
> # first compile Deadwood, otherwise we have no control over make flags
> pushd deadwood-%{dwood_ver}/src
>@@ -49,43 +47,43 @@
> 
> %install
> # create /etc/maradns, /etc/mararc and /etc/dwood3rc first
>-install -d -m 0755 %{buildroot}%{_sysconfdir}/maradns/logger/
>-install -D -m 0644 build/rpm.mararc %{buildroot}%{_sysconfdir}/mararc
>-install -D -m 0644 deadwood-%{dwood_ver}/doc/dwood3rc %{buildroot}%{_sysconfdir}/dwood3rc
>+install -p -d -m 0755 %{buildroot}%{_sysconfdir}/maradns/logger/
>+install -p -D -m 0644 build/rpm.mararc %{buildroot}%{_sysconfdir}/mararc
>+install -p -D -m 0644 deadwood-%{dwood_ver}/doc/dwood3rc %{buildroot}%{_sysconfdir}/dwood3rc
> 
> # cache dir
>-install -d -m 0755 %{buildroot}/var/cache/deadwood
>+install -p -d -m 0755 %{buildroot}/var/cache/deadwood
> 
> # sbin files
>-install -D -m 0755 server/maradns %{buildroot}%{_sbindir}/maradns
>-install -D -m 0755 tcp/zoneserver %{buildroot}%{_sbindir}/zoneserver
>-install -D -m 0755 deadwood-%{dwood_ver}/src/Deadwood %{buildroot}%{_sbindir}/Deadwood
>+install -p -D -m 0755 server/maradns %{buildroot}%{_sbindir}/maradns
>+install -p -D -m 0755 tcp/zoneserver %{buildroot}%{_sbindir}/zoneserver
>+install -p -D -m 0755 deadwood-%{dwood_ver}/src/Deadwood %{buildroot}%{_sbindir}/Deadwood
> 
> # bin files
>-install -D -m 0755 tcp/getzone %{buildroot}%{_bindir}/getzone
>-install -D -m 0755 tcp/fetchzone %{buildroot}%{_bindir}/fetchzone
>-install -D -m 0755 tools/askmara %{buildroot}%{_bindir}/askmara
>+install -p -D -m 0755 tcp/getzone %{buildroot}%{_bindir}/getzone
>+install -p -D -m 0755 tcp/fetchzone %{buildroot}%{_bindir}/fetchzone
>+install -p -D -m 0755 tools/askmara %{buildroot}%{_bindir}/askmara
> 
> # man pages
>-install -d -m 0755 %{buildroot}%{_mandir}/man{1,5,8}
>-install -D -m 0644 -t %{buildroot}%{_mandir}/man1/ \
>+install -p -d -m 0755 %{buildroot}%{_mandir}/man{1,5,8}
>+install -p -D -m 0644 -t %{buildroot}%{_mandir}/man1/ \
> 	doc/en/man/askmara.1 \
> 	doc/en/man/getzone.1 \
> 	doc/en/man/fetchzone.1
>-install -D -m 0644 -t %{buildroot}%{_mandir}/man1/ \
>+install -p -D -m 0644 -t %{buildroot}%{_mandir}/man1/ \
> 	deadwood-%{dwood_ver}/doc/Deadwood.1
>-install -D -m 0644 -t %{buildroot}%{_mandir}/man5/ \
>+install -p -D -m 0644 -t %{buildroot}%{_mandir}/man5/ \
> 	doc/en/man/csv1.5 \
> 	doc/en/man/csv2.5 \
> 	doc/en/man/csv2_txt.5 \
> 	doc/en/man/mararc.5
>-install -D -m 0644 -t %{buildroot}%{_mandir}/man8/ \
>+install -p -D -m 0644 -t %{buildroot}%{_mandir}/man8/ \
> 	doc/en/man/maradns.8 \
> 	doc/en/man/zoneserver.8 \
> 
> # systemd units
> mkdir -p %{buildroot}%{_unitdir}
>-install -D -m 0644 -t %{buildroot}%{_unitdir}/ \
>+install -p -D -m 0644 -t %{buildroot}%{_unitdir}/ \
> 	build/maradns.service \
> 	build/maradns-zoneserver.service \
> 	build/maradns-deadwood.service
>@@ -138,23 +136,14 @@
> 	sed --in-place -e "s/^maradns_gid.*/maradns_gid = $(id -g maradns)/" %{_sysconfdir}/dwood3rc
> 	# correct cache file directory
> 	sed --in-place -e 's@/etc/deadwood@/var/cache/deadwood@' %{_sysconfdir}/dwood3rc
>-	# Initial installation 
>-	/bin/systemctl daemon-reload >/dev/null 2>&1 || :
> fi
>+%systemd_post maradns.service maradns-zoneserver.service maradns-deadwood.service
> 
> %preun
>-if [ $1 -eq 0 ] ; then
>-	# Package removal, not upgrade
>-	/bin/systemctl --no-reload disable maradns.service maradns-zoneserver.service maradns-deadwood.service > /dev/null 2>&1 || :
>-	/bin/systemctl stop maradns.service maradns-zoneserver.service maradns-deadwood.service > /dev/null 2>&1 || :
>-fi
>+%systemd_preun maradns.service maradns-zoneserver.service maradns-deadwood.service
> 
> %postun
>-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
>-if [ $1 -ge 1 ] ; then
>-	# Package upgrade, not uninstall
>-	/bin/systemctl try-restart maradns.service maradns-zoneserver.service maradns-deadwood.service >/dev/null 2>&1 || :
>-fi
>+%systemd_postun_with_restart maradns.service maradns-zoneserver.service maradns-deadwood.service
> 
> %triggerun -- maradns < 1.3.07.09-6
> # Save the current service runlevel info
>@@ -172,7 +161,14 @@
> 
> 
> %changelog
>-* Tue Aug 21 2012 Tomasz Torcz <ttorcz@fedoraproject.org - 2.0.06-2
>+* Mon Oct 22 2012 Tomasz Torcz <ttorcz@fedoraproject.org> - 2.0.06-3
>+- fix review issues
>+  - use name macro in Patch, rename Patch itself
>+  - add "-p" to install lines
>+  - add --libdir... to configure
>+- use macros for systemd operations
>+
>+* Tue Aug 21 2012 Tomasz Torcz <ttorcz@fedoraproject.org> - 2.0.06-2
> - provide link to patch sent upstream
> - review remarks:
>   - removed grouptag
>@@ -181,5 +177,5 @@
>   - remove maradns.gpg.key
>   - be more specific in doc line
> 
>-* Mon Jul 16 2012 Tomasz Torcz <ttorcz@fedoraproject.org - 2.0.06-1
>+* Mon Jul 16 2012 Tomasz Torcz <ttorcz@fedoraproject.org> - 2.0.06-1
> - initial package for 2.0 branch

Actions: View | Diff

Attachments on bug 840602: 631638