[vdr-femon] Fix build with VDR 1.7.23.

Ville Skyttä scop at fedoraproject.org
Sun Jan 15 20:25:41 UTC 2012


commit d4823166cf3da4dd13399dba25fef5a638f2f46d
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Jan 15 22:25:33 2012 +0200

    Fix build with VDR 1.7.23.

 vdr-femon-1.7.11-vdr1723.patch |   12 ++++++++++++
 vdr-femon.spec                 |   10 ++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/vdr-femon-1.7.11-vdr1723.patch b/vdr-femon-1.7.11-vdr1723.patch
new file mode 100644
index 0000000..e730418
--- /dev/null
+++ b/vdr-femon-1.7.11-vdr1723.patch
@@ -0,0 +1,12 @@
+diff -up femon-1.7.11/femontools.c~ femon-1.7.11/femontools.c
+--- femon-1.7.11/femontools.c~	2011-12-04 04:20:00.000000000 +0200
++++ femon-1.7.11/femontools.c	2012-01-15 21:48:04.570703462 +0200
+@@ -349,7 +349,7 @@ cString getModulation(int value)
+ 
+ cString getSystem(int value)
+ {
+-  return cString::sprintf("%s", getUserString(value, SystemValues));
++  return cString::sprintf("%s", getUserString(value, SystemValuesSat));
+ }
+ 
+ cString getRollOff(int value)
diff --git a/vdr-femon.spec b/vdr-femon.spec
index 7add958..f4d9712 100644
--- a/vdr-femon.spec
+++ b/vdr-femon.spec
@@ -3,15 +3,16 @@
 
 Name:           vdr-%{pname}
 Version:        1.7.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        DVB frontend status monitor plugin for VDR
 
 License:        GPLv2+
 URL:            http://www.saunalahti.fi/~rahrenbe/vdr/femon/
 Source0:        http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/%{name}-%{version}.tgz
 Source1:        %{name}.conf
+Patch0:         %{name}-1.7.11-vdr1723.patch
 
-BuildRequires:  vdr-devel >= 1.7.22
+BuildRequires:  vdr-devel >= 1.7.23
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
 
 %description
@@ -24,6 +25,7 @@ also available in advanced display modes.
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1
 
 
 %build
@@ -52,8 +54,8 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
-* Sun Jan 15 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.7.11-3
-- Rebuild.
+* Sun Jan 15 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.7.11-4
+- Fix build with VDR 1.7.23.
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild


More information about the scm-commits mailing list