Accepting request 334178 from home:pluskalm:branches:vdr

- Add missing dependency on libirman (boo#941883)
- Update way tmpfiles.d are created 
- Use correct symlinks for services

OBS-URL: https://build.opensuse.org/request/show/334178
OBS-URL: https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=60
This commit is contained in:
Hendrik Vogelsang 2015-09-30 11:58:49 +00:00 committed by Git OBS Bridge
parent 56929dfeb0
commit dbdfdd5f04
2 changed files with 16 additions and 3 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Sep 28 09:35:13 UTC 2015 - mpluskal@suse.com
- Add missing dependency on libirman (boo#941883)
- Update way tmpfiles.d are created
- Use correct symlinks for services
-------------------------------------------------------------------
Mon Sep 7 09:00:31 UTC 2015 - p.drouand@gmail.com

View File

@ -47,6 +47,7 @@ BuildRequires: pkgconfig
BuildRequires: pkgconfig(alsa)
%if 0%{?suse_version} > 1320
BuildRequires: pkgconfig(libftdi1)
BuildRequires: pkgconfig(libirman)
%endif
BuildRequires: python3
BuildRequires: python3-PyYAML
@ -102,10 +103,10 @@ LIRC configuration process.
Summary: LIRC development files
License: GPL-2.0+
Group: Development/Libraries/C and C++
Requires: libirrecord0 = %{version}
Requires: liblirc0 = %{version}
Requires: liblirc_client0 = %{version}
Requires: liblirc_driver0 = %{version}
Requires: libirrecord0 = %{version}
# files were in lirc package previously
Conflicts: lirc <= 0.8.4
@ -227,7 +228,8 @@ perl %{SOURCE6} configs
%install
make DESTDIR=%{buildroot} install %{?_smp_mflags}
# Create backward compatibility symlink
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}d
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}md
mkdir -p %{buildroot}%{_tmpfilesdir}
echo "d %{_localstatedir}/run/lirc 0755 root root 10d" \
> %{buildroot}/%{_tmpfilesdir}/lirc.conf
@ -274,7 +276,11 @@ rm -rf %{buildroot}%{_datadir}/lirc/plugindocs
%post core
%service_add_post lircd.service lircmd.service lircd.socket
systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf || :
%if 0%{?suse_version} <= 1320
systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf >/dev/null 2>&1 || :
%else
%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
%endif
# config files moved to /etc/lirc in 0.8.6
for file in lircd.conf lircmd.conf lircrc; do
if [ -e %{_sysconfdir}/$file -a ! -L %{_sysconfdir}/$file ]; then