do not ghost /run/hplip

This commit is contained in:
akdengi 2013-12-05 10:56:22 +04:00
parent 4399c2bd9a
commit 518b1fee68
2 changed files with 12 additions and 6 deletions

View file

@ -1,2 +0,0 @@
d /run/hplip 0755 root root -
d /var/run/hplip 0775 root lp -

View file

@ -24,7 +24,6 @@ Group: System/Printing
Url: http://hplip.sourceforge.net/
Source0: http://garr.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}%{extraversion}.tar.gz
Source1: hpcups-update-ppds.sh
Source2: %{name}-tmpfiles.conf
# http://www.iconfinder.com/icondetails/6393/128/fax_hardware_icon
Source3: hp-sendfax.png
Source4: hplip.rpmlintrc
@ -467,7 +466,16 @@ Type=Application
Categories=TelephonyTools;Qt;Printing;Utility;
EOF
install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
# Create /run/hplip
mkdir -p %{buildroot}/run/hplip
# install /usr/lib/tmpfiles.d/hplip.conf (bug #1015831)
mkdir -p %{buildroot}%{_tmpfilesdir}
cat > %{buildroot}%{_tmpfilesdir}/hplip.conf <<EOF
# See tmpfiles.d(5) for details
d /run/hplip 0775 root lp -
EOF
# install menu icons
for N in 16 32 48 64; do convert %{SOURCE3} -resize ${N}x${N} $N.png; done
@ -716,8 +724,8 @@ fi
%{_localstatedir}/lib/hp/hplip.state
%{_docdir}/%{name}/README.urpmi
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.hp.hplip.conf
#%{_sysconfdir}/cron.daily/hplip_cron
%{_sysconfdir}/tmpfiles.d/hplip.conf
%dir %attr(0775,root,lp) /run/hplip
%{_tmpfilesdir}/hplip.conf
%{_unitdir}/hplip-printer@.service
%{_datadir}/hplip/hplip_clean.sh