Accepting request 233014 from network:samba:STABLE

- use _rundir macro (forwarded request 233013 from oertel)

OBS-URL: https://build.opensuse.org/request/show/233014
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cifs-utils?expand=0&rev=37
This commit is contained in:
Stephan Kulow 2014-05-22 18:37:36 +00:00 committed by Git OBS Bridge
commit db265cb180
2 changed files with 13 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 8 11:45:19 CEST 2014 - ro@suse.de
- use _rundir macro
-------------------------------------------------------------------
Thu Mar 20 19:40:40 UTC 2014 - lmuelle@suse.com

View File

@ -75,9 +75,13 @@ BuildRequires: pkg-config
BuildRequires: pkgconfig
%endif
Requires: keyutils
%if %suse_version > 1220
%if 0%{?suse_version} > 1220
BuildRequires: gpg-offline
%endif
%if ! %{defined _rundir}
%define _rundir %{_localstatedir}/run
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -142,12 +146,12 @@ mkdir -p \
${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d \
${RPM_BUILD_ROOT}/%{_sysconfdir}/samba \
${RPM_BUILD_ROOT}/%{_sbindir} \
${RPM_BUILD_ROOT}/var/run
${RPM_BUILD_ROOT}/%{_rundir}
install -m 0755 -p ${RPM_SOURCE_DIR}/cifs.init ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d/cifs
install -m 0600 -p ${RPM_SOURCE_DIR}/cifstab ${RPM_BUILD_ROOT}/%{_sysconfdir}/samba/cifstab
ln -s %{_sysconfdir}/init.d/${cifs_init_script} ${RPM_BUILD_ROOT}/%{_sbindir}/rccifs
touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script} \
${RPM_BUILD_ROOT}/var/run/cifs
${RPM_BUILD_ROOT}%{_rundir}/cifs
%endif
# Hardlink duplicate files
%if 0%{?suse_version} > 1110
@ -220,7 +224,7 @@ exit 0
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/samba/cifstab
%{_sbindir}/rccifs
%dir %{_sysconfdir}/samba
%ghost %{_localstatedir}/run/cifs
%ghost %{_rundir}/cifs
%endif
%files devel