[vdr-remote] Adapt to VDR >= 1.7.38 build.

Ville Skyttä scop at fedoraproject.org
Mon Feb 18 22:21:35 UTC 2013


commit 2f6e385b14dcc84e65bc9ce7e3eb9d11a53fc1fb
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Feb 19 00:21:20 2013 +0200

    Adapt to VDR >= 1.7.38 build.

 vdr-remote.spec |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/vdr-remote.spec b/vdr-remote.spec
index 66a888a..ba9e847 100644
--- a/vdr-remote.spec
+++ b/vdr-remote.spec
@@ -1,9 +1,9 @@
 %global pname   remote
-%global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$
+%global __provides_exclude_from ^%{vdr_libdir}/.*\\.so.*$
 
 Name:           vdr-%{pname}
 Version:        0.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Extended remote control plugin for VDR
 
 License:        GPL+
@@ -14,7 +14,7 @@ Source2:        %{name}-udev.rules
 # Status query mail sent to upstream and Debian patchkit maintainer 2008-10-25
 Patch0:         http://zap.tartarus.org/~ds/debian/dists/stable/main/source/vdr-plugin-remote_0.3.8-3.ds.diff.gz
 
-BuildRequires:  vdr-devel >= 1.6.0-41
+BuildRequires:  vdr-devel >= 1.7.38
 BuildRequires:  gettext
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
 Requires:       udev
@@ -35,21 +35,17 @@ sed -i \
     debian/patches/04_constness.dpatch
 patch -p1 -i debian/patches/04_constness.dpatch
 
-sed -i -e 's|include Make.config|include $(VDRDIR)/Make.config|' Makefile
-
 for f in CONTRIBUTORS HISTORY ; do
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf-8 ; mv $f.utf-8 $f
 done
 
 
 %build
-make %{?_smp_mflags} OLD_I18N= VDRDIR=%{_libdir}/vdr libvdr-%{pname}.so
+make %{?_smp_mflags} all
 
 
 %install
-
-make install OLD_I18N= LIBDIR=$RPM_BUILD_ROOT%{vdr_plugindir} \
-    LOCDIR=$RPM_BUILD_ROOT%{vdr_localedir}
+%make_install
 
 install -Dpm 644 %{SOURCE1} \
   $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
@@ -66,10 +62,13 @@ chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/*-%{name}.rules
 %doc CONTRIBUTORS COPYING FAQ HISTORY README
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
-%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
+%{vdr_libdir}/libvdr-%{pname}.so.%{vdr_apiversion}
 
 
 %changelog
+* Mon Feb 18 2013 Ville Skyttä <ville.skytta at iki.fi> - 0.5.0-3
+- Adapt to VDR >= 1.7.38 build.
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list