Hello community, here is the log from the commit of package vdr for openSUSE:Factory checked in at 2012-04-18 12:35:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vdr (Old) and /work/SRC/openSUSE:Factory/.vdr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vdr", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/vdr/vdr.changes 2011-09-23 12:49:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vdr.new/vdr.changes 2012-04-18 12:35:31.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Mar 17 13:43:37 UTC 2012 - [email protected] + +- Add vdr-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- vdr-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vdr.spec ++++++ --- /var/tmp/diff_new_pack.YWJ90C/_old 2012-04-18 12:35:34.000000000 +0200 +++ /var/tmp/diff_new_pack.YWJ90C/_new 2012-04-18 12:35:34.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package vdr # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: vdr -BuildRequires: fontconfig-devel freetype2-devel gcc-c++ libjpeg-devel ncurses-devel +BuildRequires: fontconfig-devel +BuildRequires: freetype2-devel +BuildRequires: gcc-c++ +BuildRequires: libjpeg-devel +BuildRequires: ncurses-devel %if %suse_version > 1000 BuildRequires: libcap-devel %else @@ -38,12 +40,12 @@ %define vdr_sysconfdir /etc/vdr # Url: http://www.tvdr.de/ -License: GPL-2.0+ -Group: Hardware/TV PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq Version: 1.6.0 -Release: 62 +Release: 0 Summary: Video Disk Recorder +License: GPL-2.0+ +Group: Hardware/TV Source: ftp://ftp.tvdr.de/vdr/vdr-%{version}.tar.bz2 Source1: rcvdr Source2: sysconfig.vdr @@ -71,14 +73,15 @@ Patch23: vdr-1.6.0-gcc46.patch # PATCH-FIX-OPENSUSE vdr-v4l-2.6.38.patch [email protected] -- Use new v4l interface Patch24: vdr-v4l-2.6.38.patch +# PATCH-FIX-UPSTREAM vdr-gcc47.patch [email protected] -- Fix build with gcc 4.7. +Patch25: vdr-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: vdr(abi) = %vdr_apiversion Provides: vdr-devel +Provides: vdr(abi) = %vdr_apiversion Requires: xorg-x11-fonts-scalable Recommends: vdr-plugins dvb %package devel -License: GPL-2.0+ Summary: Video Disk Recorder Group: Hardware/TV PreReq: vdr = %version @@ -180,6 +183,7 @@ %if 0%{?suse_version} >= 1210 %patch24 %endif +%patch25 -p1 %build #cp %{SOURCE5} README.SuSE ++++++ vdr-gcc47.patch ++++++ Index: vdr-1.6.0/config.h =================================================================== --- vdr-1.6.0.orig/config.h +++ vdr-1.6.0/config.h @@ -117,7 +117,7 @@ public: if (!isempty(s)) { T *l = new T; if (l->Parse(s)) - Add(l); + this->Add(l); else { esyslog("ERROR: error in %s, line %d", fileName, line); delete l; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
