rpm/tvheadend
SHA256
1
0
Fork 0
forked from pool/tvheadend
Code Pull Requests Activity

Accepting request 544828 from home:RBrownSUSE:branches:multimedia:apps

Browse Source 
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544828
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/tvheadend?expand=0&rev=22
This commit is contained in:
Martin Pluskal 2017-11-23 15:02:16 +00:00 committed by Git OBS Bridge
parent b82ac74a40
commit cb70fee0f4
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tvheadend.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:53:28 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Sat Jul 1 08:19:55 UTC 2017 - aloisio@gmx.com

11
tvheadend.spec
View File

@ -17,6 +17,11 @@
#
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%define htsgroup video
%define htsuser hts
%define homedir %{_localstatedir}/lib/tvheadend
@ -81,11 +86,11 @@ make V=1 %{?_smp_mflags}
%install
%make_install
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates/
mkdir -p %{buildroot}%{_fillupdir}/
mkdir -p %{buildroot}%{_sbindir}
install -D -m 644 rpm/%{name}.service %{buildroot}/%{_unitdir}/%{name}.service
sed -i 's@/home/tvheadend@%{homedir}@' rpm/%{name}.sysconfig
install -m 644 rpm/%{name}.sysconfig %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
install -m 644 rpm/%{name}.sysconfig %{buildroot}/%{_fillupdir}/sysconfig.%{name}
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
# Install superuser helper script
sed -i 's@/home/tvheadend@%{homedir}@' %{SOURCE3}
@ -126,7 +131,7 @@ getent passwd %htsuser >/dev/null || %{_sbindir}/useradd -g %{htsgroup} -m -d %{
%{_datadir}/tvheadend
%{_mandir}/man1/tvheadend.1%{?ext_man}
%{_unitdir}/%{name}.service
%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
%{_fillupdir}/sysconfig.%{name}
%{_sbindir}/%{name}_super
%{_sbindir}/rc%{name}