[vdr-osdteletext] Scratch that, move it to vdr_rundir instead.

Ville Skyttä scop at fedoraproject.org
Sun Mar 3 20:48:49 UTC 2013


commit 15251a9222d6ca5c8fa50f004b542fdbb903490d
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Mar 3 22:48:22 2013 +0200

    Scratch that, move it to vdr_rundir instead.

 vdr-osdteletext-0.9.3-cachedir.patch |   48 ----------------------------------
 vdr-osdteletext.spec                 |   13 +++++----
 2 files changed, 7 insertions(+), 54 deletions(-)
---
diff --git a/vdr-osdteletext.spec b/vdr-osdteletext.spec
index faca397..2ca8342 100644
--- a/vdr-osdteletext.spec
+++ b/vdr-osdteletext.spec
@@ -10,7 +10,6 @@ License:        GPLv2+
 URL:            http://projects.vdr-developer.org/projects/show/plg-osdteletext
 Source0:        http://projects.vdr-developer.org/attachments/download/912/%{name}-%{version}.tgz
 Source1:        %{name}.conf
-Patch0:         %{name}-0.9.3-cachedir.patch
 
 BuildRequires:  vdr-devel >= 1.6.0-41
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
@@ -23,7 +22,8 @@ background.
 
 %prep
 %setup -q -n %{pname}-%{version}
-%patch0 -p1
+sed -i -e 's|/var/cache/vdr/vtx|%{vdr_rundir}/%{pname}|g' \
+    osdteletext.c README README.DE txtrecv.c
 
 
 %build
@@ -36,8 +36,9 @@ install -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir}
 install -pm 755 libvdr-%{pname}.so.%{vdr_apiversion} \
   $RPM_BUILD_ROOT%{vdr_plugindir}
 
-install -dm 755 $RPM_BUILD_ROOT{/tmp/vtx,%{_prefix}/lib/tmpfiles.d}
-echo "d /tmp/vtx 0755 %{vdr_user} root -" > \
+install -dm 755 $RPM_BUILD_ROOT%{vdr_rundir}/%{pname}
+install -dm 755 $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d
+echo "d %{vdr_rundir}/%{pname} 0755 %{vdr_user} root -" > \
   $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/%{name}.conf
 
 install -Dpm 644 %{SOURCE1} \
@@ -53,12 +54,12 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 %{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
 %{_prefix}/lib/tmpfiles.d/%{name}.conf
-%attr(-,%{vdr_user},root) %dir /tmp/vtx
+%attr(-,%{vdr_user},root) %{vdr_rundir}/%{pname}/
 
 
 %changelog
 * Sun Mar  3 2013 Ville Skyttä <ville.skytta at iki.fi> - 0.9.3-8
-- Move default cache dir to /tmp/vtx to get it to a by-default tmpfs mount.
+- Move default cache dir to the by-default tmpfs %%{vdr_rundir}.
 
 * Mon Feb 18 2013 Ville Skyttä <ville.skytta at iki.fi> - 0.9.3-7
 - Rebuild.


More information about the scm-commits mailing list