From 9cdca6ff72fad328a65c4ab8455125bbd512252bc4569008064255fd401077e2 Mon Sep 17 00:00:00 2001 From: Factory Maintainer Date: Sun, 11 May 2014 05:24:23 +0000 Subject: [PATCH] Accepting request 233010 from home:oertel:branches:vdr - use _rundir macro OBS-URL: https://build.opensuse.org/request/show/233010 OBS-URL: https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=40 --- lirc.changes | 5 +++++ lirc.spec | 17 ++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/lirc.changes b/lirc.changes index e121871..9e47305 100644 --- a/lirc.changes +++ b/lirc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 8 11:44:22 CEST 2014 - ro@suse.de + +- use _rundir macro + ------------------------------------------------------------------- Sat Mar 2 13:03:37 UTC 2013 - seife+obs@b1-systems.com diff --git a/lirc.spec b/lirc.spec index 7f87347..4bde4e6 100644 --- a/lirc.spec +++ b/lirc.spec @@ -1,7 +1,7 @@ # # spec file for package lirc # -# 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 @@ -69,6 +69,9 @@ Supplements: lirc-kmp BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkgconfig(udev) %define _udevdir %(pkg-config --variable udevdir udev) +%if ! %{defined _rundir} +%define _rundir %{_localstatedir}/run +%endif Requires(pre): %fillup_prereq Requires(pre): %insserv_prereq @@ -167,9 +170,9 @@ make -C doc DESTDIR=%{buildroot} install mkdir -p %{buildroot}%{_datadir}/lirc cp -a remotes %{buildroot}%{_datadir}/lirc install -d -m 755 %{buildroot}/dev -mkdir -p %{buildroot}%{_localstatedir}/run/lirc -touch %{buildroot}%{_localstatedir}/run/lirc/lircd -chmod 600 %{buildroot}%{_localstatedir}/run/lirc/* +mkdir -p %{buildroot}%{_rundir}/lirc +touch %{buildroot}%{_rundir}/lirc/lircd +chmod 600 %{buildroot}%{_rundir}/lirc/* # lircd init scripts install -d -m 755 %{buildroot}%{_sysconfdir}/init.d \ %{buildroot}%{_sbindir} \ @@ -208,9 +211,9 @@ chmod 644 %{buildroot}%{_bindir}/pronto2lirc %doc README.SUSE %doc doc/html doc/images doc/lirc.hwdb doc/lirc.css doc/irxevent.keys %doc contrib -%dir %ghost %{_localstatedir}/run/lirc -%ghost %{_localstatedir}/run/lirc/lircm -%ghost %{_localstatedir}/run/lirc/lircd +%dir %ghost %{_rundir}/lirc +%ghost %{_rundir}/lirc/lircm +%ghost %{_rundir}/lirc/lircd %attr(0755,root,root)/usr/bin/* %{_sbindir}/* %{_sysconfdir}/init.d/lirc