Hello community,
here is the log from the commit of package vdr-plugins
checked in at Tue Feb 19 02:35:12 CET 2008.
--------
--- vdr-plugins/vdr-plugins.changes 2008-01-10 13:31:49.000000000 +0100
+++ /mounts/work_src_done/STABLE/vdr-plugins/vdr-plugins.changes 2008-02-18 14:54:40.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Feb 18 14:20:47 CET 2008 - lnussel@suse.de
+
+- fix build of epgsearch with vdr 1.5.15
+- also install additional plugins that are part of epgsearch
+- generate Makefile to build all plugins
+
+-------------------------------------------------------------------
New:
----
epgsearch-0.9.23-string.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vdr-plugins.spec ++++++
--- /var/tmp/diff_new_pack.pV9501/_old 2008-02-19 02:34:33.000000000 +0100
+++ /var/tmp/diff_new_pack.pV9501/_new 2008-02-19 02:34:33.000000000 +0100
@@ -10,12 +10,13 @@
# norootforbuild
+
Name: vdr-plugins
%if 0%{?_without_xine:1}
%define with_xine_default 0
%else
-# xine after 10.3 contains vdr-xine 0.7.12
-%if %suse_version > 1030
+# xine doesn't build on 10.1 atm
+%if %suse_version > 1010
%define with_xine_default 1
%else
%define with_xine_default 0
@@ -34,7 +35,10 @@
%endif
%define with_vdr15 %{?_with_vdr15:1}%{!?_with_vdr15:%with_vdr15_default}
#
-BuildRequires: gcc-c++ pkgconfig vdr xine-devel xine-lib
+BuildRequires: gcc-c++ pkgconfig vdr
+%if %with_xine
+BuildRequires: xine-devel
+%endif
%if %suse_version > 1020
BuildRequires: fdupes
%endif
@@ -51,7 +55,7 @@
Group: Productivity/Multimedia/Other
AutoReqProv: on
Version: 0.5
-Release: 269
+Release: 289
Summary: Plugins for the Video Disc Recorder VDR
#
Source0: vdr-cutalot-0.0.2a.tgz
@@ -79,6 +83,7 @@
Patch5: streamdev-Makefile.diff
Patch6: vdr-cutalot-0.0.2a-vdr15.diff
Patch7: vdr-remote-0.3.4-vdr15.diff
+Patch8: epgsearch-0.9.23-string.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: vdrapi = %{vdrapiversion}
@@ -120,28 +125,35 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
-pushd epgsearch-0.9.23
-#touch skipvdr15 # broken atm
-popd
-pushd streamdev-%{streamdev_version}
-touch skipvdr15 # broken atm
-popd
-
-%build
+%patch8 -p0
+#
+touch streamdev-%{streamdev_version}/skipvdr15 # broken atm
+#
plugins="cutalot-0.0.2a remote-0.3.4 epgsearch-0.9.23 streamdev-%{streamdev_version}"
%if %with_xine
plugins="xine-0.8.1 $plugins"
%endif
+echo "SUBDIRS =" > Makefile
+echo "SUBDIRS15 =" >> Makefile
for i in $plugins; do
%if %with_vdr15
cp -a "$i" "%{vdr15str}$i"
%endif
for lE in "" %{vdr15str}; do
- pushd $lE$i
- test -e skipvdr$lE || make %{?jobs:-j%jobs} all VDRDIR=/usr/include/vdr$lE LIBDIR=. LOCALEDIR=./locale
- popd
+ test -e $lE$i/skipvdr$lE || echo "SUBDIRS$lE += $lE$i" >> Makefile
done
done
+cat >> Makefile <<'EOF'
+all: $(SUBDIRS) $(SUBDIRS15)
+$(SUBDIRS):
+ $(MAKE) -C $@ all VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=.
+$(SUBDIRS15):
+ $(MAKE) -C $@ all VDRDIR=/usr/include/vdr15 LIBDIR=. LOCALEDIR=.
+.PHONY: all $(SUBDIRS) $(SUBDIRS15)
+EOF
+
+%build
+make %{?jobs:-j%jobs}
%install
install -d -m 755 %{buildroot}%{_docdir}/vdr/plugins
@@ -208,11 +220,12 @@
popd
%endif
pushd epgsearch-0.9.23
- installib epgsearch
+ installib epgsearch conflictcheckonly epgsearchonly quickepgsearch
installdoc epgsearch COPYING HISTORY
chmod 644 scripts/*
rm -f scripts/*~
cp -R doc conf scripts %{buildroot}%{_docdir}/vdr/plugins/epgsearch
+ install -m 755 createcats %{buildroot}%{_bindir}
for lE in "" %{vdr15str}; do
test -e skipvdr$lE && continue
install -d -m 755 %{buildroot}/etc/vdr$lE/plugins/epgsearch
@@ -257,8 +270,8 @@
%config(noreplace) /etc/vdr/plugins/[^x]*
%_libdir/vdr/libvdr*
%_docdir/vdr/plugins/
-%if %with_xine
%{_bindir}/*
+%if %with_xine
%attr(755, vdr, video) /var/lib/vdr-xine
/etc/vdr/plugins/xine
%if %with_vdr15
@@ -277,70 +290,74 @@
%endif
%changelog
-* Thu Jan 10 2008 - lnussel@suse.de
+* Mon Feb 18 2008 lnussel@suse.de
+- fix build of epgsearch with vdr 1.5.15
+- also install additional plugins that are part of epgsearch
+- generate Makefile to build all plugins
+* Thu Jan 10 2008 lnussel@suse.de
- update vdr-xine to 0.8.1
* HDTV improvements
* network socket support
- disable nodebug patch so see whether it's still required
-* Sun Oct 21 2007 - lnussel@wachendorf.lan
+* Sun Oct 21 2007 lnussel@wachendorf.lan
- update epgseach plugin to 0.9.23
- fix installation of locale files for vdr 1.5
-* Fri Oct 19 2007 - lnussel@suse.de
+* Fri Oct 19 2007 lnussel@suse.de
- update vdr-xine to 0.9.12
-* Tue Oct 02 2007 - seife@suse.de
+* Tue Oct 02 2007 seife@suse.de
- update streamdev plugin to CVS snapshot 20070921
-* Tue Jun 12 2007 - lnussel@suse.de
+* Tue Jun 12 2007 lnussel@suse.de
- fix build with vdr15
- remove exectuable bits from docu and remove files with backup suffix
-* Mon Jun 11 2007 - lnussel@suse.de
+* Mon Jun 11 2007 lnussel@suse.de
- update epgseach plugin to 0.9.21
- add support for vdr 1.5
-* Thu May 24 2007 - stbinner@suse.de
+* Thu May 24 2007 stbinner@suse.de
- use %%fdupes
-* Mon Mar 26 2007 - lnussel@suse.de
+* Mon Mar 26 2007 lnussel@suse.de
- require 'vdrapi' instead of 'vdr'
-* Sat Mar 10 2007 - lnussel@suse.de
+* Sat Mar 10 2007 lnussel@suse.de
- depend on APIVERSION instead of vdr's version number
-* Tue Jan 16 2007 - lnussel@suse.de
+* Tue Jan 16 2007 lnussel@suse.de
- honor CFLAGS for all files
-* Mon Jan 15 2007 - lnussel@suse.de
+* Mon Jan 15 2007 lnussel@suse.de
- don't build xine plugin on older distributions
-* Thu Jan 04 2007 - seife@suse.de
+* Thu Jan 04 2007 seife@suse.de
- add epgsearch plugin
- add streamdev plugin
-* Wed Sep 27 2006 - lnussel@suse.de
+* Wed Sep 27 2006 lnussel@suse.de
- update vdr-xine to 0.7.9
-* Tue Sep 26 2006 - lnussel@suse.de
+* Tue Sep 26 2006 lnussel@suse.de
- build for vdr 1.4 only
- remove lcdproc plugin
- add cutalot plugin
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Thu Jan 19 2006 - lnussel@suse.de
+* Thu Jan 19 2006 lnussel@suse.de
- also build plugins for vdr13 (opensuse wishlist)
- update vdr-remote to 0.3.4 as 0.3.3 doesn't work with vdr13
-* Wed Jan 04 2006 - mhopf@suse.de
+* Wed Jan 04 2006 mhopf@suse.de
- update to vdr-xine-0.7.6
-* Thu Aug 25 2005 - lnussel@suse.de
+* Thu Aug 25 2005 lnussel@suse.de
- update to vdr-xine-0.7.5
-* Fri Aug 05 2005 - lnussel@suse.de
+* Fri Aug 05 2005 lnussel@suse.de
- update to vdr-xine-0.7.4
-* Fri May 27 2005 - yxu@suse.de
+* Fri May 27 2005 yxu@suse.de
- fixed missing declaration
-* Sun Mar 13 2005 - lnussel@suse.de
+* Mon Mar 14 2005 lnussel@suse.de
- disable printing excessive FIXME's to stderr
- prevent symlink attacks with grab command (CAN-2005-0071)
- pre-require vdr as the vdr user's uid is needed for file ownership
-* Mon Jan 31 2005 - lnussel@suse.de
+* Mon Jan 31 2005 lnussel@suse.de
- remove plugins I can't test anyways. Additional ones can be added
on request.
- update plugins xine-0.7.0, remote-0.3.3 and lcdproc-0.0.10
-* Tue Sep 21 2004 - ro@suse.de
+* Tue Sep 21 2004 ro@suse.de
- added one missing include stdlib.h in xine plugin src
-* Sun May 02 2004 - adrian@suse.de
+* Sun May 02 2004 adrian@suse.de
- add xine plugin
- disable plugins which do need the not existing libspopc package
-* Mon Oct 27 2003 - stepan@suse.de
+* Mon Oct 27 2003 stepan@suse.de
- remove plugins: dvd, bitstreamout, dxr3, tictactoe
- update plugins:
* clock (0.0.4)
@@ -353,17 +370,17 @@
* remote (0.2.0)
* streamdev (0.3.0) (formerly stream)
* vcd (0.0.5b)
-* Fri Jul 04 2003 - ro@suse.de
+* Fri Jul 04 2003 ro@suse.de
- fix neededforbuild after split of mad package
-* Wed Jun 04 2003 - coolo@suse.de
+* Wed Jun 04 2003 coolo@suse.de
- compile with latest dvb includes
- some file list massaging
-* Mon May 05 2003 - coolo@suse.de
+* Mon May 05 2003 coolo@suse.de
- little update to compile with 1.1.29
-* Sun Feb 16 2003 - stepan@suse.de
+* Sun Feb 16 2003 stepan@suse.de
- get rid of own Make.config
- fix spec file.
-* Fri Feb 14 2003 - stepan@suse.de
+* Fri Feb 14 2003 stepan@suse.de
- add bitstreamout plugin 0.42j
- add clock plugin 0.0.3
- add osdteletext plugin 0.1
@@ -377,7 +394,7 @@
- move configs to /etc/vdr/plugins
- move plugins to libdir/vdr/
- drop default config dir (done by vdr startup scripts)
-* Thu Jan 09 2003 - stepan@suse.de
+* Thu Jan 09 2003 stepan@suse.de
- use Make.config instead of patches
- update mplayer/mp3 plugin to 0.7.9
- update dxr3 plugin to 0.1.4
@@ -390,32 +407,32 @@
- add stream client plugin 0.0.1a
- add vdrc (filemanager) plugin 0.0.8
- enable tvtv plugin
-* Tue Nov 19 2002 - stepan@suse.de
+* Tue Nov 19 2002 stepan@suse.de
- update mplayer/mp3 plugin to 0.7.7
- update tetris plugin to 0.2.0
- update vdrcd plugin from 0.0.1 (was a typo) to 0.0.3
- add console-0.1.0
- add tvtv-0.1.0
- automate "build" section in spec file.
-* Tue Nov 12 2002 - stepan@suse.de
+* Tue Nov 12 2002 stepan@suse.de
- update tetris to 0.1.3
- update stream to 0.1.0
- add vdrcd 0.1.0
- add prefermenu 0.4.0
-* Tue Nov 05 2002 - stepan@suse.de
+* Tue Nov 05 2002 stepan@suse.de
- fix file list to include scripts and config
- include default parameter files
- update stream to 0.0.5
-* Mon Nov 04 2002 - stepan@suse.de
+* Mon Nov 04 2002 stepan@suse.de
- add mlcd plugin
- update vdrmail to 0.0.2
- update stream to 0.0.4
- update tetris to 0.1.2
- include scripts, config and manual from mp3/mplayer plugin
-* Sat Nov 02 2002 - stepan@suse.de
+* Sat Nov 02 2002 stepan@suse.de
- add new plugins: dxr3, email reader, streaming, tetris,
teletext
-* Sat Oct 26 2002 - stepam@suse.de
+* Sat Oct 26 2002 stepam@suse.de
- fix lib64 build :)
-* Mon Oct 21 2002 - stepan@suse.de
+* Mon Oct 21 2002 stepan@suse.de
- initial release
++++++ epgsearch-0.9.23-string.diff ++++++
Index: epgsearch-0.9.23/mail.c
===================================================================
--- epgsearch-0.9.23.orig/mail.c
+++ epgsearch-0.9.23/mail.c
@@ -362,7 +362,7 @@ void cMailConflictNotifier::SendConflict
std::set