Hello community, here is the log from the commit of package vdr-plugins checked in at Tue Nov 6 23:28:08 CET 2007. -------- --- vdr-plugins/vdr-plugins.changes 2007-10-19 13:58:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/vdr-plugins/vdr-plugins.changes 2007-10-21 19:19:09.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Oct 21 18:16:25 CEST 2007 - lnussel@wachendorf.lan + +- update epgseach plugin to 0.9.23 +- fix installation of locale files for vdr 1.5 + +------------------------------------------------------------------- Old: ---- vdr-epgsearch-0.9.21.tgz New: ---- vdr-epgsearch-0.9.23.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vdr-plugins.spec ++++++ --- /var/tmp/diff_new_pack.bt3515/_old 2007-11-06 23:27:42.000000000 +0100 +++ /var/tmp/diff_new_pack.bt3515/_new 2007-11-06 23:27:42.000000000 +0100 @@ -14,7 +14,8 @@ %if 0%{?_without_xine:1} %define with_xine_default 0 %else -%if %suse_version > 1010 +# xine after 10.3 contains vdr-xine 0.7.12 +%if %suse_version > 1030 %define with_xine_default 1 %else %define with_xine_default 0 @@ -33,7 +34,7 @@ %endif %define with_vdr15 %{?_with_vdr15:1}%{!?_with_vdr15:%with_vdr15_default} # -BuildRequires: gcc-c++ pkg-config vdr xine-devel xine-lib +BuildRequires: gcc-c++ pkgconfig vdr xine-devel xine-lib %if %suse_version > 1020 BuildRequires: fdupes %endif @@ -50,7 +51,7 @@ Group: Productivity/Multimedia/Other AutoReqProv: on Version: 0.5 -Release: 239 +Release: 250 Summary: Plugins for the Video Disc Recorder VDR # Source0: vdr-cutalot-0.0.2a.tgz @@ -59,7 +60,7 @@ # the patch in the xine-lib package has to be updated before # updating this package. Source2: vdr-xine-0.7.12.tar.bz2 -Source3: http://people.freenet.de/cwieninger/vdr-epgsearch-0.9.21.tgz +Source3: http://people.freenet.de/cwieninger/vdr-epgsearch-0.9.23.tgz %define streamdev_version 20070921 Source4: http://streamdev.vdr-developer.org/snapshots/vdr-streamdev-%{streamdev_version}.tgz # @@ -119,16 +120,15 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 -pushd epgsearch-0.9.21 -#tar xzf %{SOURCE42} -touch skipvdr15 # broken atm +pushd epgsearch-0.9.23 +#touch skipvdr15 # broken atm popd pushd streamdev-%{streamdev_version} touch skipvdr15 # broken atm popd %build -plugins="cutalot-0.0.2a remote-0.3.4 epgsearch-0.9.21 streamdev-%{streamdev_version}" +plugins="cutalot-0.0.2a remote-0.3.4 epgsearch-0.9.23 streamdev-%{streamdev_version}" %if %with_xine plugins="xine-0.7.12 $plugins" %endif @@ -138,7 +138,7 @@ %endif for lE in "" %{vdr15str}; do pushd $lE$i - test -e skipvdr$lE || make %{?jobs:-j%jobs} all VDRDIR=/usr/include/vdr$lE LIBDIR=. + test -e skipvdr$lE || make %{?jobs:-j%jobs} all VDRDIR=/usr/include/vdr$lE LIBDIR=. LOCALEDIR=./locale popd done done @@ -169,6 +169,22 @@ %endif done } +installlocale() +{ +%if %with_vdr15 + if [ -d ../%{vdr15str}${PWD##*/}/locale ]; then + pushd ../%{vdr15str}${PWD##*/}/locale + install -d -m 755 %buildroot%_datadir/vdr%{vdr15str}/locale + for i in *_*; do + install -d -m 755 %buildroot%_datadir/vdr%{vdr15str}/locale/$i/LC_MESSAGES + install -m 644 $i/LC_MESSAGES/*.mo %buildroot%_datadir/vdr%{vdr15str}/locale/$i/LC_MESSAGES + done + popd + fi +%else + : +%endif +} # plugins pushd cutalot-0.0.2a installib cutalot @@ -188,9 +204,10 @@ install -m 644 data/* %{buildroot}/etc/vdr$lE/plugins/xine done install -m 755 xineplayer %{buildroot}%{_bindir} + installlocale popd %endif -pushd epgsearch-0.9.21 +pushd epgsearch-0.9.23 installib epgsearch installdoc epgsearch COPYING HISTORY chmod 644 scripts/* @@ -201,6 +218,7 @@ install -d -m 755 %{buildroot}/etc/vdr$lE/plugins/epgsearch install -m 644 conf/* %{buildroot}/etc/vdr$lE/plugins/epgsearch done + installlocale popd pushd streamdev-%{streamdev_version} installib streamdev-server @@ -216,6 +234,11 @@ %if %suse_version > 1020 %fdupes -s $RPM_BUILD_ROOT %endif +# locale files +echo '%%defattr (644, root, root, 755)' > vdr15.lang +find %{buildroot}%{_datadir}/vdr15/locale -type f -printf '%%P\n' | while read f; do + echo "%%lang(${f%%%%/*}) %{_datadir}/vdr15/locale/$f" +done >> vdr15.lang %clean rm -rf %{buildroot} @@ -226,7 +249,7 @@ %{fillup_only -n vdr15 -s plugins} %endif -%files +%files -f vdr15.lang %defattr(-,root,root) %attr(755,vdr,root) %dir /etc/vdr %attr(755,vdr,root) %dir /etc/vdr/plugins @@ -246,12 +269,16 @@ %if %with_vdr15 %attr(755,vdr,root) %dir /etc/vdr15 %attr(755,vdr,root) %dir /etc/vdr15/plugins +%attr(-,vdr,root) /etc/vdr15/plugins/epgsearch %dir %_libdir/vdr15 %_libdir/vdr15/libvdr* #%config(noreplace) /etc/vdr15/plugins/[^x]* /var/adm/fillup-templates/sysconfig.vdr15-plugins %endif %changelog +* 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 - update vdr-xine to 0.9.12 * Tue Oct 02 2007 - seife@suse.de ++++++ vdr-epgsearch-0.9.21.tgz -> vdr-epgsearch-0.9.23.tgz ++++++ ++++ 68523 lines of diff (skipped) ++++++ vdr-xine-0.7.12.diff ++++++ --- /var/tmp/diff_new_pack.bt3515/_old 2007-11-06 23:27:44.000000000 +0100 +++ /var/tmp/diff_new_pack.bt3515/_new 2007-11-06 23:27:44.000000000 +0100 @@ -25,15 +25,6 @@ # enable to fully support yaepg plugin #VDR_XINE_SET_VIDEO_WINDOW = 1 -@@ -109,7 +110,7 @@ $(DEPFILE): Makefile - ### Internationalization (I18N): - - PODIR = po --LOCALEDIR = $(VDRDIR)/locale -+LOCALEDIR = locale - I18Npo = $(wildcard $(PODIR)/*.po) - I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file)))) - I18Ndirs = $(notdir $(foreach file, $(I18Npo), $(basename $(file)))) Index: xine-0.7.12/xineLib.c =================================================================== --- xine-0.7.12/xineLib.c.orig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de