From bd46e6abfba779ac3f78e469f8ce2ff8e11877581d2179e89e6ff7d6df259cab Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Thu, 8 May 2014 10:00:19 +0000 Subject: [PATCH] Accepting request 233013 from home:oertel:branches:network:samba:STABLE - use _rundir macro OBS-URL: https://build.opensuse.org/request/show/233013 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=103 --- cifs-utils.changes | 5 +++++ cifs-utils.spec | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/cifs-utils.changes b/cifs-utils.changes index d49a2de..a7100a5 100644 --- a/cifs-utils.changes +++ b/cifs-utils.changes @@ -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 diff --git a/cifs-utils.spec b/cifs-utils.spec index c74970b..2eac155 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -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