[packages/opendmarc] install tmpfiles config to systemdtmpfilesdir

glen glen at pld-linux.org
Thu May 29 12:05:09 CEST 2014


commit 036967c60126596f67c27cc2462bc8d9d944847f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu May 29 13:02:47 2014 +0300

    install tmpfiles config to systemdtmpfilesdir

 opendmarc.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/opendmarc.spec b/opendmarc.spec
index 961d7b6..48eb386 100644
--- a/opendmarc.spec
+++ b/opendmarc.spec
@@ -14,7 +14,7 @@ BuildRequires:	libtool
 BuildRequires:	mysql-devel
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.583
+BuildRequires:	rpmbuild(macros) >= 1.644
 BuildRequires:	sendmail-devel
 Requires:	libopendmarc = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -73,8 +73,8 @@ perl -pi -e 's|^# (HistoryFile /var/run)/(opendmarc.dat)|$1/opendmarc/$2/;
              s|^# (UserId )|$1|;
             ' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
 
-install -p -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf <<EOF
+install -p -d $RPM_BUILD_ROOT%{systemdtmpfilesdir}
+cat > $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf <<EOF
 D %{_localstatedir}/run/%{name} 0700 %{name} %{name} -
 EOF
 
@@ -114,8 +114,7 @@ fi
 %defattr(644,root,root,755)
 %doc INSTALL README RELEASE_NOTES docs/draft-dmarc-base-02.txt
 %doc db/README.schema db/schema.mysql
-%config(noreplace) %{_sysconfdir}/%{name}.conf
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(755,root,root) %{_sbindir}/opendmarc
 %attr(755,root,root) %{_sbindir}/opendmarc-check
@@ -126,6 +125,7 @@ fi
 %attr(755,root,root) %{_sbindir}/opendmarc-reports
 %{_mandir}/man5/opendmarc.conf.5*
 %{_mandir}/man8/opendmarc*.8*
+%{systemdtmpfilesdir}/%{name}.conf
 %dir %attr(-,%{name},%{name}) %{_localstatedir}/spool/%{name}
 %dir %attr(-,%{name},%{name}) %{_localstatedir}/run/%{name}
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/opendmarc.git/commitdiff/a6502b053600ea8b58f1b2b96a3397cfcd8cbb66



More information about the pld-cvs-commit mailing list