Hello community,

here is the log from the commit of package xawtv for openSUSE:Factory
checked in at Wed Aug 3 17:53:59 CEST 2011.



--------
--- xawtv/xawtv.changes 2009-09-07 15:47:08.000000000 +0200
+++ /mounts/work_src_done/STABLE/xawtv/xawtv.changes    2011-07-03 
19:29:48.000000000 +0200
@@ -1,0 +2,55 @@
+Sun Jul  3 17:24:44 UTC 2011 - asterios.dra...@gmail.com
+
+- Update to version 3.101:
+  * Man fix to remove mention of v4l1, and describe libv4l instead
+  * Fixes at fr/es manuals
+  * Warning fixes
+  * Addition of alsa streaming at xawtv: now, for devices with video
+    associated with audio inputs.
+  * Use X11 editres, instead of its on version, based on a port from
+    a motif library released under a licence that is not GPL compatible
+  * Add auto-detection logic for xawtv: by default, it will now seek for
+    the first TV device. If not available, fall back to the first grabber
+    device.
+  * Add auto-detection logic for scanv: by default, it will now seek for
+    the first TV device. If not afailable, fails.
+  * Add optional support for libexplain at the v4l2/libv4l driver.
+    Libexplain provides a  more complete explanation for the error codes,
+    helping developers to better track what's happened.
+  * Don't expose tuner commands, on devices that are grabber or  webcams
+    at xawtv.
+- Removed the patch for the GPL incompatible OpenGroup license files issue
+  bnc#696259 (fixed upstream).
+
+-------------------------------------------------------------------
+Sat May 28 12:04:12 UTC 2011 - asterios.dra...@gmail.com
+
+- Added a patch (based on upstream) to fix the issue with GPL incompatible
+  OpenGroup license files (bnc#696259).
+
+-------------------------------------------------------------------
+Sat May  7 17:00:50 UTC 2011 - asterios.dra...@gmail.com
+
+- Update to version 3.100:
+  * Incorporation of patches from various distributions.
+  * Porting to V4L2 API.
+  * Lots of other changes (see Changes file).
+- Spec file updates:
+  * Changes based on rpmdevtools templates and spec-cleaner run.
+  * Removed libdrm-devel, recode and slang-devel from Buildrequires:
+    (not needed).
+  * Replaced freeglut-devel with Mesa-devel and added libdv-devel and
+    libquicktime-devel in Buildrequires:.
+  * Moved permissions package requirement in v4l-conf.
+  * Suggest lirc for xawtv and motv.
+  * Updates in Summaries and descriptions.
+  * Install an icon also for motv.
+  * Updates in v4l-conf post scripts.
+  * Minor other updates.
+- Fixed some rpmlint warnings.
+- Updated motv.desktop and xawtv.desktop to be XDG compatible.
+- Removed all previous openSUSE and Fedora patches (except xawtv-3.95.patch)
+  since they are merged upstream, either complete or with some changes.
+- Rebased xawtv-3.95.patch to aplly cleanly.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  xawtv-3.95-bpl.patch
  xawtv-3.95-fixes.patch
  xawtv-3.95-libv4l2.patch
  xawtv-3.95-man.patch
  xawtv-3.95-missing-fclose.patch
  xawtv-3.95-no-dga.patch
  xawtv-3.95.tar.bz2
  xawtv-3.95-v4l2-old-drop.patch
  xawtv-pagemask.patch
  xawtv.PAGE_SIZE.patch
  xawtv-strip.patch
  xawtv-xioctl-error.patch

New:
----
  xawtv-3.101.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xawtv.spec ++++++
--- /var/tmp/diff_new_pack.RmTjHW/_old  2011-08-03 17:48:53.000000000 +0200
+++ /var/tmp/diff_new_pack.RmTjHW/_new  2011-08-03 17:48:53.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package xawtv (Version 3.95)
+# spec file for package xawtv
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -19,106 +19,95 @@
 
 
 Name:           xawtv
-BuildRequires:  aalib-devel alsa-devel freeglut-devel gcc-c++ libdrm-devel 
libjpeg-devel libpng-devel libv4l-devel lirc-devel ncurses-devel openmotif 
openmotif-devel recode slang-devel update-desktop-files xorg-x11-devel 
zvbi-devel
-Url:            http://bytesex.org/xawtv/
-License:        GPL v2 or later
-Group:          Hardware/TV
-Requires:       v4l-conf, tv-common, tv-fonts, pia
-Conflicts:      xaw3dd
-AutoReqProv:    on
-Version:        3.95
-Release:        210
+Version:        3.101
+Release:        1
 Summary:        Video4Linux TV application (Athena)
-Source:         http://dl.bytesex.org/releases/xawtv/%{name}-%{version}.tar.bz2
+
+License:        GPLv2+
+Url:            http://www.kraxel.org/blog/linux/xawtv/
+Group:          Hardware/TV
+Source0:        http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2
 Source1:        xawtv.desktop
 Source2:        motv.desktop
-Patch:          xawtv-3.95.patch
-Patch1:         xawtv-strip.patch
-Patch2:         xawtv-pagemask.patch
-Patch3:         xawtv.PAGE_SIZE.patch
-Patch4:         xawtv-xioctl-error.patch
-# vvv Patches taken from Fedora (some of which originate from Debian)
-Patch5:         xawtv-3.95-man.patch
-Patch6:         xawtv-3.95-fixes.patch
-Patch7:         xawtv-3.95-no-dga.patch
-Patch8:         xawtv-3.95-bpl.patch
-Patch9:         xawtv-3.95-v4l2-old-drop.patch
-Patch10:        xawtv-3.95-libv4l2.patch
-# ^^^
-Patch11:        xawtv-3.95-missing-fclose.patch
+# PATCH-FIX-OPENSUSE xawtv-3.95.patch --
+Patch0:         xawtv-3.95.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-PreReq:         permissions
-
-%description
-xawtv is an X Window System application for watching TV with your Linux
-computer.  It supports video4linux devices (for example bttv cards,
-various USB webcams, and more).  It uses the Athena widgets.
-
 
+BuildRequires:  Mesa-devel
+BuildRequires:  aalib-devel
+BuildRequires:  alsa-devel
+BuildRequires:  gcc-c++
+BuildRequires:  libdv-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libquicktime-devel
+BuildRequires:  libv4l-devel
+BuildRequires:  lirc-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  openmotif
+BuildRequires:  openmotif-devel
+%if 0%{?suse_version}
+BuildRequires:  update-desktop-files
+%endif
+BuildRequires:  xorg-x11-devel
+BuildRequires:  zvbi-devel
+Requires:       pia
+Requires:       tv-common
+Requires:       tv-fonts
+Requires:       v4l-conf
+Suggests:       lirc
+Conflicts:      xaw3dd
 
-Authors:
---------
-    Gerd Knorr <kra...@suse.de>
+%description
+xawtv is an X11 application for watching TV with your Linux box. It supports
+video4linux devices (for example bttv cards, various USB webcams, ...). It uses
+the Athena widgets.
 
 %package      -n motv
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Video4Linux TV application (Motif)
 Group:          Hardware/TV
-Requires:       v4l-conf, tv-common, tv-fonts, pia
+Requires:       pia
+Requires:       tv-common
+Requires:       tv-fonts
+Requires:       v4l-conf
+Suggests:       lirc
 Provides:       xawtv:%{_bindir}/motv
 
 %description  -n motv
-motv is a X11 application for watching TV with your Linux box. It
-supports video4linux devices (for example bttv cards, various USB
-webcams, ...). It's based on xawtv's code, but uses Motif to provide a
-better GUI.
+motv is a X11 application for watching TV with your Linux box. It supports
+video4linux devices (for example bttv cards, various USB webcams, ...).        
It's
+based on xawtv's code, but uses Motif to provide a better GUI.
 
 Also includes the teletext/videotext viewer mtt.
 
-
-
-Authors:
---------
-    Gerd Knorr <kra...@suse.de>
-
 %package      -n tv-common
-License:        GPL v2 or later
-Summary:        Fonts, Tools, and some READMEs for motv and xawtv
-Group:          Development/Libraries/C and C++
+License:        GPLv2+
+Summary:        Frequency tables and some Tools for motv and xawtv
+Group:          Hardware/TV
 Provides:       xawtv:/usr/X11R6/lib/X11/fonts/misc/led-iso8859-1.bdf
 
 %description  -n tv-common
-This package includes some X Window System fonts used by motv and
-xawtv, some utilities for them (xawtv-remote, for example), and some
-README files.
-
-
-
-Authors:
---------
-    Gerd Knorr <kra...@suse.de>
+This package includes frequency tables for various countries and some utilities
+for xawtv and motv (xawtv-remote, for example).
 
 %package      -n v4l-conf
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Video4linux Configuration Tool
 Group:          Hardware/TV
+Requires(post): permissions
 Provides:       xawtv:%{_bindir}/v4l-conf
 
 %description  -n v4l-conf
 This is a small utility used to configure video4linux device drivers
 (bttv, for example).  xawtv, motv, and fbtv need it.
 
-
-
-Authors:
---------
-    Gerd Knorr <kra...@suse.de>
-
 %package      -n v4l-tools
-License:        GPL v2 or later
-Summary:        video4linux terminal / command line utilities
+License:        GPLv2+
+Summary:        Video4linux terminal / command line utilities
 Group:          Hardware/TV
-Requires:       v4l-conf, tv-common
+Requires:       tv-common
+Requires:       v4l-conf
 Provides:       xawtv:%{_bindir}/v4lctl
 
 %description  -n v4l-tools
@@ -128,30 +117,17 @@
 aalib), webcam for capturing and uploading images, a curses radio
 application, ...
 
-
-
-Authors:
---------
-    Gerd Knorr <kra...@suse.de>
-
 %package      -n alevtd
-License:        GPL v2 or later
-Summary:        http server for teletext pages
+License:        GPLv2+
+Summary:        HTTP server for Teletext pages
 Group:          Productivity/Networking/Web/Servers
 
 %description  -n alevtd
 alevtd reads the teletext pages from /dev/vbi and allows to fetch them
 via http, i.e. you can read the teletext pages with a web browser.
 
-
-
-Authors:
---------
-    Gerd Knorr <kra...@suse.de>
-    Edgar Toernig <fro...@gmx.de>
-
 %package      -n pia
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Simple Movie Player
 Group:          Productivity/Multimedia/Video/Players
 Requires:       tv-common
@@ -161,162 +137,145 @@
 movies recorded by xawtv, motv, and streamer.  Other movies might work
 as well.
 
-
-
-Authors:
---------
-    Gerd Knorr <kra...@suse.de>
-
 %prep
 %setup -q
-%patch
-%patch1
-%patch2
-%patch3 -p1
-%patch4
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
+%patch0 -p1
 
 %build
 # This package failed when testing with -Wl,-as-needed being default.
 # So we disable it here, if you want to retest, just delete this comment and 
the line below.
 export SUSE_ASNEEDED=0
 autoreconf -fi
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+export CFLAGS="%{optflags} -fno-strict-aliasing"
 %{configure}
-make
+make %{?_smp_mflags}
 
 %install
-make DESTDIR="%{buildroot}" SUID_ROOT="" install
-gzip %{buildroot}%{_mandir}/man*/*
-%suse_update_desktop_file %{SOURCE1} AudioVideo TV
-%suse_update_desktop_file %{SOURCE2} AudioVideo TV
-mkdir -p %{buildroot}%{_datadir}/applications
+make DESTDIR=%{buildroot} SUID_ROOT="" install
+
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-install -m644 %{SOURCE1} %{SOURCE2} %{buildroot}%{_datadir}/applications
-install contrib/xawtv48x48.xpm  $RPM_BUILD_ROOT%{_datadir}/pixmaps/xawtv.xpm
+install -pm 0644 contrib/xawtv48x48.xpm  
%{buildroot}%{_datadir}/pixmaps/xawtv.xpm
+install -pm 0644 contrib/xawtv48x48.xpm  
%{buildroot}%{_datadir}/pixmaps/motv.xpm
+
+%if 0%{?suse_version}
+%suse_update_desktop_file -i xawtv AudioVideo Video TV
+%suse_update_desktop_file -i motv Motif AudioVideo Video TV
+%endif
+
+%clean
+rm -rf %{buildroot}
+
+%verifyscript -n v4l-conf
+%verify_permissions -e %{_bindir}/v4l-conf
+
+%post -n v4l-conf
+%if 0%{?set_permissions:1} > 0
+  %{set_permissions /usr/bin/v4l-conf}
+%else
+  %{run_permissions}
+%endif
 
 %files
-%defattr(-,root,root)
-%doc COPYING
-%doc Changes TODO README README.*
+%defattr(-,root,root,-)
+%doc COPYING Changes README README.* TODO
 %doc contrib/frequencies* contrib/vdr.config
-%dir %{_mandir}/fr
-%dir %{_mandir}/fr/man1
 %{_bindir}/xawtv
 %{_bindir}/rootv
-%{_mandir}/man1/xawtv.1.gz
-%{_mandir}/*/man1/xawtv.1.gz
-%{_mandir}/man1/rootv.1.gz
-%{_mandir}/*/man1/rootv.1.gz
+%doc %{_mandir}/man1/xawtv.1%{ext_man}
+%doc %lang(es) %{_mandir}/es/man1/xawtv.1%{ext_man}
+%doc %lang(fr) %{_mandir}/fr/man1/xawtv.1%{ext_man}
+%doc %{_mandir}/man1/rootv.1%{ext_man}
+%doc %lang(es) %{_mandir}/es/man1/rootv.1%{ext_man}
 %{_datadir}/X11/app-defaults/Xawtv
 %{_datadir}/applications/xawtv.desktop
 %{_datadir}/pixmaps/xawtv.xpm
 
 %files -n motv
-%defattr(-,root,root)
-%doc COPYING
-%doc Changes TODO README README.*
-%dir %{_datadir}/X11/de
-%dir %{_datadir}/X11/de_DE.UTF-8
-%dir %{_datadir}/X11/fr
-%dir %{_datadir}/X11/it
+%defattr(-,root,root,-)
+%doc COPYING Changes README README.* TODO
+%doc contrib/frequencies* contrib/vdr.config
 %{_bindir}/motv
-%{_mandir}/man1/motv.1.gz
+%doc %{_mandir}/man1/motv.1%{ext_man}
 %{_datadir}/X11/app-defaults/MoTV
-%{_datadir}/X11/*/app-defaults
+%dir %{_datadir}/X11/de_DE.UTF-8
+%dir %{_datadir}/X11/fr_FR.UTF-8
+%dir %{_datadir}/X11/it_IT.UTF-8
+%lang(de) %{_datadir}/X11/de_DE.UTF-8/app-defaults
+%lang(fr) %{_datadir}/X11/fr_FR.UTF-8/app-defaults
+%lang(it) %{_datadir}/X11/it_IT.UTF-8/app-defaults
 %{_bindir}/mtt
-%{_mandir}/man1/mtt.1.gz
+%doc %{_mandir}/man1/mtt.1%{ext_man}
 %{_datadir}/X11/app-defaults/mtt
 %{_datadir}/applications/motv.desktop
+%{_datadir}/pixmaps/motv.xpm
 
 %files -n tv-common
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/subtitles
-%{_mandir}/man1/subtitles.1.gz
-%dir %{_mandir}/fr
-%dir %{_mandir}/fr/man1
-%{_mandir}/*/man1/subtitles.1.gz
+%doc %{_mandir}/man1/subtitles.1%{ext_man}
+%doc %lang(es) %{_mandir}/es/man1/subtitles.1%{ext_man}
 %{_bindir}/xawtv-remote
-%{_mandir}/man1/xawtv-remote.1.gz
-%{_mandir}/*/man1/xawtv-remote.1.gz
+%doc %{_mandir}/man1/xawtv-remote.1%{ext_man}
+%doc %lang(es) %{_mandir}/es/man1/xawtv-remote.1%{ext_man}
 %{_bindir}/propwatch
-%{_mandir}/man1/propwatch.1.gz
-%{_mandir}/man5/xawtvrc.5.gz
-%{_mandir}/*/man5/xawtvrc.5.gz
+%doc %{_mandir}/man1/propwatch.1%{ext_man}
+%doc %{_mandir}/man5/xawtvrc.5.gz
+%doc %lang(es) %{_mandir}/es/man5/xawtvrc.5.gz
 %{_libdir}/xawtv
 %{_datadir}/xawtv
 
 %files -n v4l-conf
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING
 %verify(not mode) %attr(4750,root,video) %{_bindir}/v4l-conf
-%{_mandir}/man8/v4l-conf.8.gz
-%dir %{_mandir}/es
-%dir %{_mandir}/es/man8
-%{_mandir}/*/man8/v4l-conf.8.gz
+%doc %{_mandir}/man8/v4l-conf.8.gz
+%doc %lang(es) %{_mandir}/es/man8/v4l-conf.8.gz
 
 %files -n v4l-tools
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING
-%dir %{_mandir}/fr
-%dir %{_mandir}/fr/man1
 %{_bindir}/radio
-%{_mandir}/man1/radio.1.gz
+%doc %{_mandir}/man1/radio.1%{ext_man}
 %{_bindir}/fbtv
-%{_mandir}/man1/fbtv.1.gz
-%{_mandir}/*/man1/fbtv.1.gz
+%doc %{_mandir}/man1/fbtv.1%{ext_man}
+%doc %lang(es) %{_mandir}/es/man1/fbtv.1%{ext_man}
 %{_bindir}/ttv
-%{_mandir}/man1/ttv.1.gz
-%{_mandir}/*/man1/ttv.1.gz
+%doc %{_mandir}/man1/ttv.1%{ext_man}
+%doc %lang(es) %{_mandir}/es/man1/ttv.1%{ext_man}
 %{_bindir}/streamer
-%{_mandir}/man1/streamer.1.gz
-%{_mandir}/*/man1/streamer.1.gz
+%doc %{_mandir}/man1/streamer.1%{ext_man}
+%doc %lang(es) %{_mandir}/es/man1/streamer.1%{ext_man}
 %{_bindir}/v4lctl
-%{_mandir}/man1/v4lctl.1.gz
-%{_mandir}/*/man1/v4lctl.1.gz
+%doc %{_mandir}/man1/v4lctl.1%{ext_man}
+%doc %lang(es) %{_mandir}/es/man1/v4lctl.1%{ext_man}
 %{_bindir}/record
-%{_mandir}/man1/record.1.gz
+%doc %{_mandir}/man1/record.1%{ext_man}
 %{_bindir}/dump-mixers
-%{_mandir}/man1/dump-mixers.1.gz
+%doc %{_mandir}/man1/dump-mixers.1%{ext_man}
 %{_bindir}/showriff
-%{_mandir}/man1/showriff.1.gz
+%doc %{_mandir}/man1/showriff.1%{ext_man}
 %{_bindir}/showqt
 %{_bindir}/scantv
-%{_mandir}/man1/scantv.1.gz
-%{_mandir}/*/man1/scantv.1.gz
+%doc %{_mandir}/man1/scantv.1%{ext_man}
+%doc %lang(es) %{_mandir}/es/man1/scantv.1%{ext_man}
 %{_bindir}/ntsc-cc
-%{_mandir}/man1/ntsc-cc.1.gz
+%doc %{_mandir}/man1/ntsc-cc.1%{ext_man}
 %{_bindir}/webcam
-%{_mandir}/man1/webcam.1.gz
+%doc %{_mandir}/man1/webcam.1%{ext_man}
 %{_bindir}/v4l-info
-%{_mandir}/man1/v4l-info.1.gz
+%doc %{_mandir}/man1/v4l-info.1%{ext_man}
 
 %files -n alevtd
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/alevtd
-%{_mandir}/man1/alevtd.1.gz
+%doc %{_mandir}/man1/alevtd.1%{ext_man}
 
 %files -n pia
-%defattr(-,root,root)
-%doc COPYING
-%doc Changes TODO README README.*
+%defattr(-,root,root,-)
+%doc COPYING Changes README README.* TODO
 %{_bindir}/pia
-%{_mandir}/man1/pia.1.gz
-
-%post -n v4l-conf
-%run_permissions
-%verifyscript
-%verify_permissions -e %{_bindir}/v4l-conf
-
-%clean
-test "%{buildroot}" != "" -a "%{buildroot}" != "/" &&\
-       rm -rf "%{buildroot}"
+%doc %{_mandir}/man1/pia.1%{ext_man}
 
 %changelog

++++++ motv.desktop ++++++
--- /var/tmp/diff_new_pack.RmTjHW/_old  2011-08-03 17:48:54.000000000 +0200
+++ /var/tmp/diff_new_pack.RmTjHW/_new  2011-08-03 17:48:54.000000000 +0200
@@ -1,11 +1,8 @@
 [Desktop Entry]
-Categories=AudioVideo;TV;AudioVideo;
-Encoding=UTF-8
+Categories=Motif;AudioVideo;Video;TV;
 GenericName=Watch TV!
 Exec=motv
-Icon=xawtv
+Icon=motv
 Name=MoTV
-Path=
-Terminal=0
-TerminalOptions=
+Terminal=false
 Type=Application

++++++ xawtv-3.95.tar.bz2 -> xawtv-3.101.tar.bz2 ++++++
++++ 35314 lines of diff (skipped)

++++++ xawtv-3.95.patch ++++++
--- /var/tmp/diff_new_pack.RmTjHW/_old  2011-08-03 17:48:54.000000000 +0200
+++ /var/tmp/diff_new_pack.RmTjHW/_new  2011-08-03 17:48:54.000000000 +0200
@@ -1,25 +1,6 @@
---- Makefile.in
-+++ Makefile.in
-@@ -29,7 +29,7 @@
- # for CFLAGS
- WARN_FLAGS    := -Wall -Wmissing-prototypes -Wstrict-prototypes 
-Wpointer-arith
- LFS_FLAGS     := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE 
-D_FILE_OFFSET_BITS=64
--X11_FLAGS     := @X_CFLAGS@ @XFT_FLAGS@ -I/usr/X11R6/include/X11/fonts
-+X11_FLAGS     := @X_CFLAGS@ @XFT_FLAGS@ -I/usr/include/X11/fonts
- LIB_FLAGS     := -I. -I./vbistuff -I./x11 \
-                  -I$(srcdir)/jwz -I$(srcdir)/common -I$(srcdir)/console \
-                  -I$(srcdir)/x11 -I$(srcdir)/structs \
-@@ -49,7 +49,7 @@
- VBI_LIBS      := @LIBZVBI@
- GL_LIBS               := @LIBGL@
- DV_LIBS               := @LIBDV@
--FS_LIBS               := -L@x_libraries@ @FSLIB@
-+FS_LIBS               := @X_LIBS@ @FSLIB@
- DLFLAGS               := @DLFLAGS@
- 
- # stuff configure has found
---- common/channel.c
-+++ common/channel.c
+diff -uNr xawtv-3.100.orig/common/channel.c xawtv-3.100/common/channel.c
+--- xawtv-3.100.orig/common/channel.c  2011-02-22 07:56:44.000000000 +0200
++++ xawtv-3.100/common/channel.c       2011-05-07 15:35:34.948000119 +0300
 @@ -181,6 +181,9 @@
      {  -1, NULL,     },
  };
@@ -30,8 +11,9 @@
  /* just malloc memory for a new channel ... */
  struct CHANNEL*
  add_channel(char *name)
---- common/channel.h
-+++ common/channel.h
+diff -uNr xawtv-3.100.orig/common/channel.h xawtv-3.100/common/channel.h
+--- xawtv-3.100.orig/common/channel.h  2011-02-22 07:56:44.000000000 +0200
++++ xawtv-3.100/common/channel.h       2011-05-07 15:36:33.398000163 +0300
 @@ -90,8 +90,5 @@
  
  /* ----------------------------------------------------------------------- */
@@ -41,8 +23,9 @@
 -
  int str_to_int(char *str, struct STRTAB *tab);
  const char* int_to_str(int n, struct STRTAB *tab);
---- common/commands.c
-+++ common/commands.c
+diff -uNr xawtv-3.100.orig/common/commands.c xawtv-3.100/common/commands.c
+--- xawtv-3.100.orig/common/commands.c 2011-02-22 07:56:44.000000000 +0200
++++ xawtv-3.100/common/commands.c      2011-05-07 15:37:07.600000117 +0300
 @@ -162,6 +162,9 @@
  
  static int keypad_state = -1;
@@ -53,14 +36,3 @@
  /* ----------------------------------------------------------------------- */
  
  void add_attrs(struct ng_attribute *new)
---- configure.ac
-+++ configure.ac
-@@ -295,7 +295,7 @@
- AC_SUBST(x11conf)
- 
- AC_MSG_CHECKING(for X11 app-defaults directory)
--resdir=/usr/X11R6/lib/X11
-+resdir=/usr/share/X11
- if test -d /etc/X11/app-defaults; then
-       resdir=/etc/X11
- fi

++++++ xawtv.desktop ++++++
--- /var/tmp/diff_new_pack.RmTjHW/_old  2011-08-03 17:48:54.000000000 +0200
+++ /var/tmp/diff_new_pack.RmTjHW/_new  2011-08-03 17:48:54.000000000 +0200
@@ -1,11 +1,8 @@
 [Desktop Entry]
-Categories=AudioVideo;TV;AudioVideo;
-Encoding=UTF-8
+Categories=AudioVideo;Video;TV;
 GenericName=Watch TV!
 Exec=xawtv
 Icon=xawtv
-Name=xawtv
-Path=
-Terminal=0
-TerminalOptions=
+Name=XawTV
+Terminal=false
 Type=Application


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to