Accepting request 233011 from home:oertel:branches:hardware

- use _rundir macro

OBS-URL: https://build.opensuse.org/request/show/233011
OBS-URL: https://build.opensuse.org/package/show/hardware/wpa_supplicant?expand=0&rev=36
This commit is contained in:
Factory Maintainer 2014-05-11 05:24:49 +00:00 committed by Git OBS Bridge
parent 341f00b8b1
commit 7288119d90
2 changed files with 12 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 8 11:18:08 CEST 2014 - ro@suse.de
- use _rundir macro
-------------------------------------------------------------------
Mon Sep 9 09:18:17 UTC 2013 - fcrozat@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package wpa_supplicant
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -56,6 +56,9 @@ Patch2: wpa_supplicant-sigusr1-changes-debuglevel.patch
Patch3: wpa_supplicant-errormsg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: logrotate
%if ! %{defined _rundir}
%define _rundir %{_localstatedir}/run
%endif
%description
wpa_supplicant is an implementation of the WPA Supplicant component,
@ -115,7 +118,7 @@ install -m 0644 %{SOURCE3} %{buildroot}/%{_datadir}/dbus-1/system-services
install -m 0644 %{SOURCE5} %{buildroot}/%{_datadir}/dbus-1/system-services
install -d %{buildroot}/%{_sysconfdir}/logrotate.d/
install -m 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/logrotate.d/wpa_supplicant
install -d %{buildroot}/%{_localstatedir}/run/%{name}
install -d %{buildroot}/%{_rundir}/%{name}
install -d %{buildroot}%{_mandir}/man{5,8}
install -m 0644 wpa_supplicant/doc/docbook/*.8 %{buildroot}%{_mandir}/man8
install -m 0644 wpa_supplicant/doc/docbook/*.5 %{buildroot}%{_mandir}/man5
@ -150,9 +153,9 @@ systemctl --quiet enable wpa_supplicant.service || :
%{_datadir}/dbus-1/system-services
%config %{_sysconfdir}/%{name}/%{name}.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/wpa_supplicant
%dir %{_localstatedir}/run/%{name}
%dir %{_rundir}/%{name}
%if 0%{?suse_version} > 1140
%ghost %{_localstatedir}/run/%{name}
%ghost %{_rundir}/%{name}
%endif
%if 0%{?suse_version} > 1230
%{_unitdir}/wpa_supplicant.service