Hello community, here is the log from the commit of package nxtvepg checked in at Thu Aug 17 18:23:01 CEST 2006. -------- --- nxtvepg/nxtvepg.changes 2006-01-25 21:38:53.000000000 +0100 +++ nxtvepg/nxtvepg.changes 2006-08-17 18:07:29.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 17 18:07:25 CEST 2006 - cthiel@suse.de + +- fix build with X.Org 7.1 + +------------------------------------------------------------------- New: ---- nxtvepg-2.7.5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nxtvepg.spec ++++++ --- /var/tmp/diff_new_pack.KBcBnB/_old 2006-08-17 18:22:56.000000000 +0200 +++ /var/tmp/diff_new_pack.KBcBnB/_new 2006-08-17 18:22:56.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package nxtvepg (Version 2.7.5) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -17,29 +17,30 @@ Group: Hardware/TV Autoreqprov: on Version: 2.7.5 -Release: 1 -Summary: Nextview EPG decoder and browser +Release: 14 +Summary: Nextview EPG Decoder and Browser Source0: %{name}-%{version}.tar.bz2 Source1: rc.nxtvepg +Patch: nxtvepg-2.7.5.patch Patch4: nxtvepg-64.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -In this software package, you find a decoder for Nextview -- an -Electronic TV Program Guide for the analog domain (as opposed to the -various digital EPGs that come with most digital broadcasts). It allows -you to decode and browse TV program listings for most of the major -networks in Germany, Austria, France, and Switzerland. +In this software package, find a decoder for Nextview--an electronic TV +program guide for the analog domain (as opposed to the various digital +EPGs that come with most digital broadcasts). It allows you to decode +and browse TV program listings for most of the major networks in +Germany, Austria, France, and Switzerland. -Currently, Nextview EPG is transmitted by: * in Germany and Austria: +Currently, Nextview EPG is transmitted by: * In Germany and Austria: Kabel1, 3Sat, RTL-II, EuroNews (coverage: apx. 31 networks) -* in Switzerland: SF1, TSR1, TSI1, EuroNews, 3sat, Kabel1 (coverage: +* In Switzerland: SF1, TSR1, TSI1, EuroNews, 3sat, Kabel1 (coverage: apx. 37 networks) -* in France: Canal+, M6 (coverage: 8 networks) +* In France: Canal+, M6 (coverage: 8 networks) -* in Turkey: TRT-1 (coverage: 17 networks) +* In Turkey: TRT-1 (coverage: 17 networks) @@ -50,6 +51,7 @@ %prep %setup -q %patch4 -p1 -b .64 +%patch %build export CFLAGS="-g $RPM_OPT_FLAGS" @@ -59,9 +61,6 @@ SYS_DBDIR=/var/tmp/nxtvdb %install -if test "%{buildroot}" != ""; then - rm -rf "%{buildroot}" -fi make ROOT=%{buildroot} \ prefix=/usr \ lib=%{_lib} \ @@ -79,15 +78,15 @@ /usr/sbin/rcnxtvepg /usr/bin/nxtvepg /usr/share/man/man1/nxtvepg.1* -/usr/X11R6/lib/X11/app-defaults/Nxtvepg +%{_datadir}/X11/app-defaults/Nxtvepg %doc CHANGES COPYRIGHT TODO README* manual.html %clean -if test "%{buildroot}" != ""; then - rm -rf "%{buildroot}" -fi +rm -rf $RPM_BUILD_ROOT %changelog -n nxtvepg +* Thu Aug 17 2006 - cthiel@suse.de +- fix build with X.Org 7.1 * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Wed Jul 27 2005 - kraxel@suse.de ++++++ nxtvepg-2.7.5.patch ++++++ --- Makefile +++ Makefile @@ -48,7 +48,7 @@ exec_prefix = ${prefix} bindir = $(ROOT)${exec_prefix}/bin mandir = $(ROOT)${prefix}/man/man1 -resdir = $(ROOT)/usr/X11R6/lib/X11 +resdir = $(ROOT)/usr/share/X11 lib = lib # if you have perl set the path here, else just leave it alone ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org