Author: martinkg Update of /cvs/free/rpms/vdr-mp3/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9599/F-18 Modified Files: .cvsignore sources vdr-mp3.spec Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/vdr-mp3/F-18/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Oct 2012 11:04:05 -0000 1.4 +++ .cvsignore 10 Oct 2012 15:31:01 -0000 1.5 @@ -1 +1,2 @@ -vdr-mp3.spec +mplayer.sh-0.8.7.tar.gz +vdr-mp3-0.10.2.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/vdr-mp3/F-18/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Oct 2012 11:04:05 -0000 1.4 +++ sources 10 Oct 2012 15:31:02 -0000 1.5 @@ -1 +1,2 @@ -fb2984645d01fcbe75b57fca21283cc4 vdr-mp3.spec +cc2e48d4787b7ee739a0a8bb5b8c9fb2 mplayer.sh-0.8.7.tar.gz +66fd37827326776c223a0fdd0ad3811e vdr-mp3-0.10.2.tar.gz Index: vdr-mp3.spec =================================================================== RCS file: /cvs/free/rpms/vdr-mp3/F-18/vdr-mp3.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- vdr-mp3.spec 19 May 2012 18:57:41 -0000 1.8 +++ vdr-mp3.spec 10 Oct 2012 15:31:02 -0000 1.9 @@ -5,7 +5,7 @@ Name: vdr-mp3 Version: 0.10.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Sound playback plugin for VDR Group: Applications/Multimedia @@ -27,7 +27,7 @@ Patch6: %{name}-0.10.2-fsf-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: vdr-devel >= 1.6.0-41 +BuildRequires: vdr-devel >= 1.7.30 BuildRequires: libsndfile-devel >= 1.0.0 BuildRequires: libvorbis-devel BuildRequires: %{__perl} @@ -71,7 +71,7 @@ 's|"/var/cache/images/mp3"|"%{vdr_cachedir}/mp3/images"|' \ data-mp3.c README %{__perl} -pi -e \ - 's|"/video/plugins/DVD-VCD"|"%{vdr_datadir}/DVD-VCD"| ; + 's|"/video/plugins/DVD-VCD"|"%{vdr_resdir}/DVD-VCD"| ; s|^MPLAYER=.*|MPLAYER="%{_bindir}/mplayer"|' \ mplayer.sh.conf for f in HISTORY MANUAL README ; do @@ -83,7 +83,7 @@ %build make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr WITH_OSS_OUTPUT=1 \ libvdr-mp3.so libvdr-mplayer.so -echo "%{vdr_datadir}/DVD-VCD;DVD or VCD;0" > mplayersources.conf +echo "%{vdr_resdir}/DVD-VCD;DVD or VCD;0" > mplayersources.conf %install @@ -113,9 +113,9 @@ # MPlayer files install -pm 755 libvdr-mplayer.so.%{vdr_apiversion} $RPM_BUILD_ROOT%{vdr_plugindir} -install -dm 755 $RPM_BUILD_ROOT%{vdr_datadir}/DVD-VCD -touch $RPM_BUILD_ROOT%{vdr_datadir}/DVD-VCD/{DVD,VCD} -chmod 644 $RPM_BUILD_ROOT%{vdr_datadir}/DVD-VCD/* +install -dm 755 $RPM_BUILD_ROOT%{vdr_resdir}/DVD-VCD +touch $RPM_BUILD_ROOT%{vdr_resdir}/DVD-VCD/{DVD,VCD} +chmod 644 $RPM_BUILD_ROOT%{vdr_resdir}/DVD-VCD/* install -pm 644 mplayersources.conf mplayer.sh.conf \ $RPM_BUILD_ROOT%{vdr_configdir}/plugins install -pm 755 mplayer.sh $RPM_BUILD_ROOT%{vdr_plugindir}/bin/mplayer.sh @@ -169,12 +169,15 @@ %{vdr_plugindir}/bin/mediasources.sh %{vdr_plugindir}/bin/mount.sh %{vdr_plugindir}/bin/mplayer*.sh -%{vdr_datadir}/DVD-VCD/ +%{vdr_resdir}/DVD-VCD/ %defattr(-,%{vdr_user},root,-) %ghost %{vdr_vardir}/global.mplayer.resume %changelog +* Wed Oct 3 2012 Martin Gansser <linux4martin(a)gmx.de&gt; - 0.10.2-5 +- Adapt to VDR 1.7.30. + * Sat May 19 2012 Martin Gansser <linux4martin(a)gmx.de&gt; - 0.10.2-4 - reset the release tag to 1 for release update