Accepting request 319728 from home:dimstar:Factory

- Ignore absence of systemd-tmpfiles, it won't be present in the
  build env.

Fixes build with systemd 222

OBS-URL: https://build.opensuse.org/request/show/319728
OBS-URL: https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=55
This commit is contained in:
Hendrik Vogelsang 2015-07-31 10:34:18 +00:00 committed by Git OBS Bridge
parent 693d58c482
commit cfd68f28a6
2 changed files with 23 additions and 7 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jul 31 09:51:51 UTC 2015 - dimstar@opensuse.org
- Ignore absence of systemd-tmpfiles, it won't be present in the
build env.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 23 02:52:35 UTC 2015 - p.drouand@gmail.com Mon Mar 23 02:52:35 UTC 2015 - p.drouand@gmail.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package lirc # spec file for package lirc
# #
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -50,12 +50,12 @@ BuildRequires: pkgconfig(alsa)
%if 0%{?suse_version} > 1320 %if 0%{?suse_version} > 1320
BuildRequires: pkgconfig(libftdi1) BuildRequires: pkgconfig(libftdi1)
%endif %endif
BuildRequires: python3
BuildRequires: python3-PyYAML
BuildRequires: pkgconfig(portaudio-2.0) BuildRequires: pkgconfig(portaudio-2.0)
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(udev)
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
BuildRequires: python3
BuildRequires: python3-PyYAML
Requires: udev Requires: udev
Recommends: lirc-remotes Recommends: lirc-remotes
Suggests: lirc-kmp Suggests: lirc-kmp
@ -77,6 +77,7 @@ control your computer with a remote control.
%package core %package core
Summary: LIRC core, always needed to run LIRC Summary: LIRC core, always needed to run LIRC
License: GPL-2.0+
Group: Hardware/Other Group: Hardware/Other
Provides: %{name} = %{version} Provides: %{name} = %{version}
Obsoletes: %{name} < %{version} Obsoletes: %{name} < %{version}
@ -87,12 +88,13 @@ default driver and most of the applications.
%package config %package config
Summary: LIRC Configuration Tools and Data Summary: LIRC Configuration Tools and Data
License: GPL-2.0+
Group: Hardware/Other Group: Hardware/Other
Requires: lirc-core = %{version} Requires: lirc-core = %{version}
Provides: %{name}-remotes = %{version} Provides: %{name}-remotes = %{version}
Obsoletes: %{name}-remotes < %{version} Obsoletes: %{name}-remotes < %{version}
Requires: python3-gobject
Requires: python3-PyYAML Requires: python3-PyYAML
Requires: python3-gobject
BuildArch: noarch BuildArch: noarch
%description config %description config
@ -101,10 +103,11 @@ LIRC configuration process.
%package devel %package devel
Summary: LIRC development files Summary: LIRC development files
License: GPL-2.0+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: liblirc0 = %{version}
Requires: liblirc_client0 = %{version} Requires: liblirc_client0 = %{version}
Requires: liblirc_driver0 = %{version} Requires: liblirc_driver0 = %{version}
Requires: liblirc0 = %{version}
# files were in lirc package previously # files were in lirc package previously
Conflicts: lirc <= 0.8.4 Conflicts: lirc <= 0.8.4
@ -117,6 +120,7 @@ control your computer with a remote control.
%package -n liblirc_client0 %package -n liblirc_client0
Summary: LIRC client library Summary: LIRC client library
License: GPL-2.0+
Group: Hardware/Other Group: Hardware/Other
# files were in lirc package previously # files were in lirc package previously
Conflicts: lirc <= 0.8.4 Conflicts: lirc <= 0.8.4
@ -127,6 +131,7 @@ the 'lirc' package has to be configured and started.
%package -n liblirc_driver0 %package -n liblirc_driver0
Summary: LIRC driver library Summary: LIRC driver library
License: GPL-2.0+
Group: Hardware/Other Group: Hardware/Other
%description -n liblirc_driver0 %description -n liblirc_driver0
@ -134,6 +139,7 @@ The LIRC driver library. To actually use the lirc plugins.
%package -n liblirc0 %package -n liblirc0
Summary: LIRC driver library Summary: LIRC driver library
License: GPL-2.0+
Group: Hardware/Other Group: Hardware/Other
%description -n liblirc0 %description -n liblirc0
@ -142,6 +148,7 @@ and sending IR signals with the most common IR remote controls.
%package disable-kernel-rc %package disable-kernel-rc
Summary: Disable kernel ir device handling in favor of lirc Summary: Disable kernel ir device handling in favor of lirc
License: GPL-2.0+
Group: Hardware/Other Group: Hardware/Other
Requires: %{name}-core = %{version}-%{release} Requires: %{name}-core = %{version}-%{release}
Recommends: lirc-core = %{version} Recommends: lirc-core = %{version}
@ -153,6 +160,7 @@ Udev rule which disables the kernel built-in handling of infrared devices
%if 0%{?suse_version} > 1320 %if 0%{?suse_version} > 1320
%package drv-ftdi %package drv-ftdi
Summary: Ftdi LIRC User-Space Driver Summary: Ftdi LIRC User-Space Driver
License: GPL-2.0+
Group: Hardware/Other Group: Hardware/Other
Requires: lirc-core = %{version} Requires: lirc-core = %{version}
@ -163,9 +171,9 @@ full support for the ftdi device.
%package drv-portaudio %package drv-portaudio
Summary: Portaudio LIRC User-Space Driver Summary: Portaudio LIRC User-Space Driver
License: LGPL-2.0
Group: Hardware/Other Group: Hardware/Other
Requires: lirc-core = %{version} Requires: lirc-core = %{version}
License: LGPL-2.0
%description drv-portaudio %description drv-portaudio
LIRC user space driver which supports a IR receiver in microphone input LIRC user space driver which supports a IR receiver in microphone input
@ -173,6 +181,8 @@ using the portaudio library.
%package tools-gui %package tools-gui
Summary: LIRC GUI tools Summary: LIRC GUI tools
License: GPL-2.0+
Group: Hardware/Other
Requires: lirc-core = %{version} Requires: lirc-core = %{version}
Requires: xorg-x11-fonts-core Requires: xorg-x11-fonts-core
@ -257,7 +267,7 @@ rm -rf %{buildroot}%{_datadir}/lirc/contrib
%post core %post core
%service_add_post lircd.service lircmd.service lircd.socket %service_add_post lircd.service lircmd.service lircd.socket
systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf || :
# config files moved to /etc/lirc in 0.8.6 # config files moved to /etc/lirc in 0.8.6
for file in lircd.conf lircmd.conf lircrc; do for file in lircd.conf lircmd.conf lircrc; do
if [ -e %{_sysconfdir}/$file -a ! -L %{_sysconfdir}/$file ]; then if [ -e %{_sysconfdir}/$file -a ! -L %{_sysconfdir}/$file ]; then