Remove tmpfiles.d and use RuntimeDirectory instead
This commit is contained in:
parent
04da2a5e8f
commit
15bacb64aa
@ -20,7 +20,6 @@ Source7: sasl-mechlist.c
|
||||
Source8: sasl-checkpass.c
|
||||
Source9: saslauthd.sysconfig
|
||||
Source10: make-no-dlcompatorsrp-tarball.sh
|
||||
Source11: saslauthd.tmpfiles
|
||||
URL: http://asg.web.cmu.edu/sasl/sasl-library.html
|
||||
Requires: %{name}-lib%{?_isa} = %{version}-%{release}
|
||||
Patch11: cyrus-sasl-2.1.25-no_rpath.patch
|
||||
@ -328,8 +327,6 @@ install -m755 -d $RPM_BUILD_ROOT/etc/rc.d/init.d $RPM_BUILD_ROOT/etc/sysconfig
|
||||
install -d -m755 $RPM_BUILD_ROOT/%{_unitdir}
|
||||
install -m644 -p %{SOURCE5} $RPM_BUILD_ROOT/%{_unitdir}/saslauthd.service
|
||||
install -m644 -p %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd
|
||||
install -m755 -d $RPM_BUILD_ROOT/%{_tmpfilesdir}
|
||||
install -m644 -p %{SOURCE11} $RPM_BUILD_ROOT/%{_tmpfilesdir}/saslauthd.conf
|
||||
|
||||
# Install the config dirs if they're not already there.
|
||||
install -m755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2
|
||||
@ -380,8 +377,7 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir}
|
||||
%{_sbindir}/testsaslauthd
|
||||
%config(noreplace) /etc/sysconfig/saslauthd
|
||||
%{_unitdir}/saslauthd.service
|
||||
%{_tmpfilesdir}/saslauthd.conf
|
||||
%dir %attr(0775, root, saslauth) /run/saslauthd
|
||||
%dir %attr(0755, root, root) /run/saslauthd
|
||||
|
||||
%files lib
|
||||
%defattr(-,root,root)
|
||||
|
@ -6,6 +6,7 @@ Type=forking
|
||||
PIDFile=/run/saslauthd/saslauthd.pid
|
||||
EnvironmentFile=/etc/sysconfig/saslauthd
|
||||
ExecStart=/usr/sbin/saslauthd -m $SOCKETDIR -a $MECH $FLAGS
|
||||
RuntimeDirectory=saslauthd
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
@ -1 +0,0 @@
|
||||
d /run/saslauthd 0775 root saslauth -
|
Loading…
Reference in New Issue
Block a user