Mailinglist Archive: opensuse-commit (2130 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package vdr-plugins
checked in at Tue Apr 1 13:00:14 CEST 2008.

--------
--- vdr-plugins/vdr-plugins.changes     2008-02-18 14:54:40.000000000 +0100
+++ /mounts/work_src_done/STABLE/vdr-plugins/vdr-plugins.changes        
2008-03-31 11:08:23.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Mar 31 11:08:16 CEST 2008 - lnussel@xxxxxxx
+
+- fix build for vdr 1.6
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ vdr-plugins.spec ++++++
--- /var/tmp/diff_new_pack.UN7946/_old  2008-04-01 12:59:57.000000000 +0200
+++ /var/tmp/diff_new_pack.UN7946/_new  2008-04-01 12:59:57.000000000 +0200
@@ -24,11 +24,12 @@
 %endif
 %define with_xine %{?_with_xine:1}%{!?_with_xine:%with_xine_default}
 #
+# XXX: rename this to vdr-unstable one day
 %if 0%{?_without_vdr15:1}
 %define with_vdr15_default 0
 %else
 %if 0%{?opensuse_bs}
-%define with_vdr15_default 1
+%define with_vdr15_default 0
 %else
 %define with_vdr15_default 0
 %endif
@@ -55,7 +56,7 @@
 Group:          Productivity/Multimedia/Other
 AutoReqProv:    on
 Version:        0.5
-Release:        289
+Release:        307
 Summary:        Plugins for the Video Disc Recorder VDR
 #
 Source0:        vdr-cutalot-0.0.2a.tgz
@@ -86,6 +87,7 @@
 Patch8:         epgsearch-0.9.23-string.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         vdrapi = %{vdrapiversion}
+PreReq:         %fillup_prereq
 
 %description
 This package contains the following plugins for the video disc recorder
@@ -127,7 +129,7 @@
 %patch7 -p1
 %patch8 -p0
 #
-touch streamdev-%{streamdev_version}/skipvdr15 # broken atm
+touch streamdev-%{streamdev_version}/skipvdr # broken atm
 #
 plugins="cutalot-0.0.2a remote-0.3.4 epgsearch-0.9.23 
streamdev-%{streamdev_version}"
 %if %with_xine
@@ -146,9 +148,9 @@
 cat >> Makefile <<'EOF'
 all: $(SUBDIRS) $(SUBDIRS15)
 $(SUBDIRS):
-       $(MAKE) -C $@ all VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=.
+       $(MAKE) -C $@ all VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
 $(SUBDIRS15):
-       $(MAKE) -C $@ all VDRDIR=/usr/include/vdr15 LIBDIR=. LOCALEDIR=.
+       $(MAKE) -C $@ all VDRDIR=/usr/include/vdr15 LIBDIR=. LOCALEDIR=locale
 .PHONY: all $(SUBDIRS) $(SUBDIRS15)
 EOF
 
@@ -183,19 +185,13 @@
 }
 installlocale()
 {
-%if %with_vdr15
-       if [ -d ../%{vdr15str}${PWD##*/}/locale ]; then
-               pushd ../%{vdr15str}${PWD##*/}/locale
-               install -d -m 755 %buildroot%_datadir/vdr%{vdr15str}/locale
+       cd locale
+       install -d -m 755 %buildroot%_datadir/vdr/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
+               install -d -m 755 %buildroot%_datadir/vdr/locale/$i/LC_MESSAGES
+               install -m 644 $i/LC_MESSAGES/*.mo 
%buildroot%_datadir/vdr/locale/$i/LC_MESSAGES
                done
-               popd
-       fi
-%else
-       :
-%endif
+       cd ..
 }
 # plugins
 pushd cutalot-0.0.2a
@@ -233,11 +229,13 @@
     done
     installlocale
 popd
+%if 0
 pushd streamdev-%{streamdev_version}
     installib streamdev-server
     installib streamdev-client
     installdoc streamdev COPYING PROTOCOL README HISTORY 
streamdevhosts.conf.example
 popd
+%endif
 # sysconfig
 install -d -m 755 %{buildroot}/var/adm/fillup-templates
 install -m 644 %{SOURCE50} 
%{buildroot}/var/adm/fillup-templates/sysconfig.vdr-plugins
@@ -248,10 +246,10 @@
 %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
+echo '%%defattr (644, root, root, 755)' > vdr.lang
+find %{buildroot}%{_datadir}/vdr/locale -type f -printf '%%P\n' | while read 
f; do
+        echo "%%lang(${f%%%%/*}) %{_datadir}/vdr/locale/$f"
+done >> vdr.lang
 
 %clean
 rm -rf %{buildroot}
@@ -262,7 +260,7 @@
 %{fillup_only -n vdr15 -s plugins}
 %endif
 
-%files -f vdr15.lang
+%files -f vdr.lang
 %defattr(-,root,root)
 %attr(755,vdr,root) %dir /etc/vdr
 %attr(755,vdr,root) %dir /etc/vdr/plugins
@@ -290,6 +288,8 @@
 %endif
 
 %changelog
+* Mon Mar 31 2008 lnussel@xxxxxxx
+- fix build for vdr 1.6
 * Mon Feb 18 2008 lnussel@xxxxxxx
 - fix build of epgsearch with vdr 1.5.15
 - also install additional plugins that are part of epgsearch



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



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx