rpms/vdr-mp3/F-17 vdr-mp3-0.10.2-Makefile.patch, NONE, 1.1 vdr-mp3-0.10.2-fsf-fix.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vdr-mp3.spec, 1.7, 1.8

Sat May 19 20:53:39 CEST 2012

Author: martinkg

Update of /cvs/free/rpms/vdr-mp3/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17177/F-17

Modified Files:
	.cvsignore sources vdr-mp3.spec 
Added Files:
	vdr-mp3-0.10.2-Makefile.patch vdr-mp3-0.10.2-fsf-fix.patch 
Log Message:


vdr-mp3-0.10.2-Makefile.patch:
 Makefile |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE vdr-mp3-0.10.2-Makefile.patch ---
--- mp3-0.10.2/Makefile.orig	2012-05-11 23:41:20.963758554 +0200
+++ mp3-0.10.2/Makefile	2012-05-11 23:37:45.748768802 +0200
@@ -80,13 +80,13 @@
 
 ### The version number of VDR (taken from VDR's "config.h"):
 
-VDRVERSION := $(shell sed -ne '/define VDRVERSION/ s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/include/vdr/config.h)
-APIVERSION := $(shell sed -ne '/define APIVERSION/ s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/include/vdr/config.h)
+VDRVERSION := $(shell sed -ne '/define VDRVERSION/ s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSION := $(shell sed -ne '/define APIVERSION/ s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
 ifeq ($(strip $(APIVERSION)),)
    APIVERSION = $(VDRVERSION)
 endif
-VDRVERSNUM := $(shell sed -ne '/define VDRVERSNUM/ s/^.[a-zA-Z ]*\([0-9]*\) .*$$/\1/p' $(VDRDIR)/include/vdr/config.h)
-APIVERSNUM := $(shell sed -ne '/define APIVERSNUM/ s/^.[a-zA-Z ]*\([0-9]*\) .*$$/\1/p' $(VDRDIR)/include/vdr/config.h)
+VDRVERSNUM := $(shell sed -ne '/define VDRVERSNUM/ s/^.[a-zA-Z ]*\([0-9]*\) .*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSNUM := $(shell sed -ne '/define APIVERSNUM/ s/^.[a-zA-Z ]*\([0-9]*\) .*$$/\1/p' $(VDRDIR)/config.h)
 ifeq ($(strip $(APIVERSNUM)),)
    APIVERSNUM = $(VDRVERSNUM)
 endif
@@ -98,7 +98,7 @@
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES += -I$(INCDIR)/vdr/
 DEFINES  += -D_GNU_SOURCE -DAPIVERSNUM=$(APIVERSNUM)
 
 ### The object files (add further files here):
@@ -154,7 +154,7 @@
 I18Nmsgs  := $(addprefix $(LOCALEDIR)/,$(addsuffix /LC_MESSAGES/$(I18Nmo),$(I18Npots)))
 I18Nmsgs2 := $(addprefix $(LOCALEDIR)/,$(addsuffix /LC_MESSAGES/$(I18Nmo2),$(I18Npots)))
 
-HASLOCALE = $(shell grep -l 'I18N_DEFAULT_LOCALE' $(VDRDIR)/include/vdr/i18n.h)
+HASLOCALE = $(shell grep -l 'I18N_DEFAULT_LOCALE' $(INCDIR)/vdr/i18n.h)
 ifeq ($(strip $(HASLOCALE)),)
   COM_OBJS += i18n.o
 endif

vdr-mp3-0.10.2-fsf-fix.patch:
 COPYING |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE vdr-mp3-0.10.2-fsf-fix.patch ---
--- mp3-0.10.2/COPYING.orig	2012-05-05 17:54:21.646516046 +0200
+++ mp3-0.10.2/COPYING	2012-05-05 17:57:49.785534163 +0200
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+                       51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 
 Also add information on how to contact you by electronic and paper mail.


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vdr-mp3/F-17/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Aug 2008 18:46:44 -0000	1.2
+++ .cvsignore	19 May 2012 18:53:39 -0000	1.3
@@ -1,2 +1,2 @@
 mplayer.sh-0.8.7.tar.gz
-vdr-mp3-0.10.1.tar.gz
+vdr-mp3-0.10.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-mp3/F-17/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Aug 2008 18:46:44 -0000	1.2
+++ sources	19 May 2012 18:53:39 -0000	1.3
@@ -1,2 +1,2 @@
 cc2e48d4787b7ee739a0a8bb5b8c9fb2  mplayer.sh-0.8.7.tar.gz
-ca43583a7ccc9491bf24362dd6bebf4b  vdr-mp3-0.10.1.tar.gz
+66fd37827326776c223a0fdd0ad3811e  vdr-mp3-0.10.2.tar.gz


Index: vdr-mp3.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-mp3/F-17/vdr-mp3.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vdr-mp3.spec	2 Mar 2012 15:11:16 -0000	1.7
+++ vdr-mp3.spec	19 May 2012 18:53:39 -0000	1.8
@@ -3,18 +3,9 @@
 #   - patch to allow playing audio files (currently insists to find video)
 #   - audio CD support?
 
-%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%define configdir %(vdr-config --configdir  2>/dev/null || echo ERROR)
-%define videodir  %(vdr-config --videodir   2>/dev/null || echo ERROR)
-%define datadir   %(vdr-config --datadir    2>/dev/null || echo ERROR)
-%define cachedir  %(vdr-config --cachedir   2>/dev/null || echo ERROR)
-%define vardir    %(vdr-config --vardir     2>/dev/null || echo ERROR)
-%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
-%define vdr_user  %(vdr-config --user       2>/dev/null || echo ERROR)
-
 Name:           vdr-mp3
-Version:        0.10.1
-Release:        10%{?dist}
+Version:        0.10.2
+Release:        4%{?dist}
 Summary:        Sound playback plugin for VDR
 
 Group:          Applications/Multimedia
@@ -32,15 +23,17 @@
 Patch2:         %{name}-mplayer.sh-identify.patch
 Patch3:         %{name}-mplayer.sh-0.8.7-defaults.patch
 Patch4:         %{name}-0.10.1-no-debug.patch
+Patch5:         %{name}-0.10.2-Makefile.patch
+Patch6:         %{name}-0.10.2-fsf-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  vdr-devel >= 1.4.0
+BuildRequires:  vdr-devel >= 1.6.0-41
 BuildRequires:  libsndfile-devel >= 1.0.0
 BuildRequires:  libvorbis-devel
 BuildRequires:  %{__perl}
 BuildRequires:  libmad-devel
 BuildRequires:  libid3tag-devel
-Requires:       vdr(abi) = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
 Requires:       netpbm-progs
 Requires:       mjpegtools >= 1.8.0
 Requires:       file
@@ -53,8 +46,8 @@
 Summary:        MPlayer plugin for VDR
 Group:          Applications/Multimedia
 BuildRequires:  %{__perl}
-Requires:       vdr(abi) = %{apiver}
-Requires:       mplayer >= 1.0-0.lvn.0.19.pre7
+Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
+Requires:       mplayer >= 1.0
 
 %description -n vdr-mplayer
 The MPlayer plugin adds the ability to call MPlayer from within VDR,
@@ -69,87 +62,85 @@
 %patch2
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 %{__perl} -pi -e \
-  's|CFGFIL=.*|CFGFIL="%{configdir}/plugins/mplayer.sh.conf"|' \
+  's|CFGFIL=.*|CFGFIL="%{vdr_configdir}/plugins/mplayer.sh.conf"|' \
   mplayer.sh
 %{__perl} -pi -e \
-  's|"/var/cache/images/mp3"|"%{cachedir}/mp3/images"|' \
+  's|"/var/cache/images/mp3"|"%{vdr_cachedir}/mp3/images"|' \
   data-mp3.c README
 %{__perl} -pi -e \
-  's|"/video/plugins/DVD-VCD"|"%{datadir}/DVD-VCD"| ;
+  's|"/video/plugins/DVD-VCD"|"%{vdr_datadir}/DVD-VCD"| ;
    s|^MPLAYER=.*|MPLAYER="%{_bindir}/mplayer"|' \
   mplayer.sh.conf
 for f in HISTORY MANUAL README ; do
   iconv -f iso-8859-1 -t utf-8 $f > $f.utf-8 ; mv $f.utf-8 $f
 done
-sed -e 's|/var/lib/vdr|%{vardir}|' %{SOURCE4} > %{name}-mplayer.conf
+sed -e 's|/var/lib/vdr|%{vdr_vardir}|' %{SOURCE4} > %{name}-mplayer.conf
 
 
 %build
 make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr WITH_OSS_OUTPUT=1 \
     libvdr-mp3.so libvdr-mplayer.so
-echo "%{datadir}/DVD-VCD;DVD or VCD;0" > mplayersources.conf
+echo "%{vdr_datadir}/DVD-VCD;DVD or VCD;0" > mplayersources.conf
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # Common dirs
-install -dm 755 $RPM_BUILD_ROOT%{plugindir}
-install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins
-install -dm 755 $RPM_BUILD_ROOT%{plugindir}/bin
+install -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir}
+install -dm 755 $RPM_BUILD_ROOT%{vdr_configdir}/plugins
+install -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir}/bin
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d
 
 # Common files
-install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{plugindir}/bin/mediasources.sh
+install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{vdr_plugindir}/bin/mediasources.sh
 install -pm 755 examples/mount.sh.example \
-  $RPM_BUILD_ROOT%{plugindir}/bin/mount.sh
+  $RPM_BUILD_ROOT%{vdr_plugindir}/bin/mount.sh
 
 # MP3 files
-install -pm 755 libvdr-mp3.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
-install -pm 644 %{SOURCE6} $RPM_BUILD_ROOT%{configdir}/plugins/mp3sources.conf
+install -pm 755 libvdr-mp3.so.%{vdr_apiversion} $RPM_BUILD_ROOT%{vdr_plugindir}
+install -pm 644 %{SOURCE6} $RPM_BUILD_ROOT%{vdr_configdir}/plugins/mp3sources.conf
 install -pm 755 examples/image_convert.sh.example \
-  $RPM_BUILD_ROOT%{plugindir}/bin/image_convert.sh
-%{__perl} -pe 's|/var/cache/vdr/|%{cachedir}/|' %{SOURCE3} \
+  $RPM_BUILD_ROOT%{vdr_plugindir}/bin/image_convert.sh
+%{__perl} -pe 's|/var/cache/vdr/|%{vdr_cachedir}/|' %{SOURCE3} \
   > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/mp3.conf
 chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/mp3.conf
-install -dm 755 $RPM_BUILD_ROOT%{cachedir}/mp3/images
-i=$RPM_BUILD_ROOT%{cachedir}/mp3/id3info.cache ; > $i ; chmod 644 $i
+install -dm 755 $RPM_BUILD_ROOT%{vdr_cachedir}/mp3/images
+i=$RPM_BUILD_ROOT%{vdr_cachedir}/mp3/id3info.cache ; > $i ; chmod 644 $i
 
 # MPlayer files
-install -pm 755 libvdr-mplayer.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
-install -dm 755 $RPM_BUILD_ROOT%{datadir}/DVD-VCD
-touch $RPM_BUILD_ROOT%{datadir}/DVD-VCD/{DVD,VCD}
-chmod 644 $RPM_BUILD_ROOT%{datadir}/DVD-VCD/*
+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 -pm 644 mplayersources.conf mplayer.sh.conf \
-  $RPM_BUILD_ROOT%{configdir}/plugins
-install -pm 755 mplayer.sh $RPM_BUILD_ROOT%{plugindir}/bin/mplayer.sh
-install -pm 755 %{SOURCE5} $RPM_BUILD_ROOT%{plugindir}/bin/mplayer-minimal.sh
+  $RPM_BUILD_ROOT%{vdr_configdir}/plugins
+install -pm 755 mplayer.sh $RPM_BUILD_ROOT%{vdr_plugindir}/bin/mplayer.sh
+install -pm 755 %{SOURCE5} $RPM_BUILD_ROOT%{vdr_plugindir}/bin/mplayer-minimal.sh
 install -pm 644 %{name}-mplayer.conf \
   $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/mplayer.conf
-install -dm 755 $RPM_BUILD_ROOT%{vardir}
-i=$RPM_BUILD_ROOT%{vardir}/global.mplayer.resume ; > $i ; chmod 644 $i
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -dm 755 $RPM_BUILD_ROOT%{vdr_vardir}
+i=$RPM_BUILD_ROOT%{vdr_vardir}/global.mplayer.resume ; > $i ; chmod 644 $i
 
 
 %post
 if [ $1 -eq 1 ] ; then
-  %{plugindir}/bin/mediasources.sh \
-    >> %{configdir}/plugins/mp3sources.conf || :
+  %{vdr_plugindir}/bin/mediasources.sh \
+    >> %{vdr_configdir}/plugins/mp3sources.conf || :
 else
   r=global.mplayer.resume
-  if [ -f %{videodir}/$r -a ! -f %{vardir}/$r ] ; then
-    mv %{videodir}/$r %{vardir}/$r
+  if [ -f %{vdr_videodir}/$r -a ! -f %{vdr_vardir}/$r ] ; then
+    mv %{vdr_videodir}/$r %{vdr_vardir}/$r
   fi
 fi
 
 %post -n vdr-mplayer
 if [ $1 -eq 1 ] ; then
-  %{plugindir}/bin/mediasources.sh \
-    >> %{configdir}/plugins/mplayersources.conf || :
+  %{vdr_plugindir}/bin/mediasources.sh \
+    >> %{vdr_configdir}/plugins/mplayersources.conf || :
 fi
 
 
@@ -157,33 +148,46 @@
 %defattr(-,root,root,-)
 %doc COPYING HISTORY MANUAL README examples/mount.sh.example
 %doc examples/mp3sources.conf.example examples/network.sh.example
-%config(noreplace) %{configdir}/plugins/mp3sources.conf
+%config(noreplace) %{vdr_configdir}/plugins/mp3sources.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/mp3.conf
-%{plugindir}/libvdr-mp3.so.%{apiver}
-%{plugindir}/bin/image_convert.sh
-%{plugindir}/bin/mediasources.sh
-%{plugindir}/bin/mount.sh
+%{vdr_plugindir}/libvdr-mp3.so.%{vdr_apiversion}
+%{vdr_plugindir}/bin/image_convert.sh
+%{vdr_plugindir}/bin/mediasources.sh
+%{vdr_plugindir}/bin/mount.sh
 %defattr(-,%{vdr_user},root,-)
-%dir %{cachedir}/mp3/
-%dir %{cachedir}/mp3/images/
-%ghost %{cachedir}/mp3/id3info.cache
+%dir %{vdr_cachedir}/mp3/
+%dir %{vdr_cachedir}/mp3/images/
+%ghost %{vdr_cachedir}/mp3/id3info.cache
 
 %files -n vdr-mplayer
 %defattr(-,root,root,-)
 %doc COPYING HISTORY MANUAL README examples/mplayer.sh.example
 %doc examples/mount.sh.example
-%config(noreplace) %{configdir}/plugins/mplayer*.conf
+%config(noreplace) %{vdr_configdir}/plugins/mplayer*.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/mplayer.conf
-%{plugindir}/libvdr-mplayer.so.%{apiver}
-%{plugindir}/bin/mediasources.sh
-%{plugindir}/bin/mount.sh
-%{plugindir}/bin/mplayer*.sh
-%{datadir}/DVD-VCD/
+%{vdr_plugindir}/libvdr-mplayer.so.%{vdr_apiversion}
+%{vdr_plugindir}/bin/mediasources.sh
+%{vdr_plugindir}/bin/mount.sh
+%{vdr_plugindir}/bin/mplayer*.sh
+%{vdr_datadir}/DVD-VCD/
 %defattr(-,%{vdr_user},root,-)
-%ghost %{vardir}/global.mplayer.resume
+%ghost %{vdr_vardir}/global.mplayer.resume
 
 
 %changelog
+* Sat May 19 2012 Martin Gansser <linux4martin at gmx.de> - 0.10.2-4
+- reset the release tag to 1 for release update
+
+* Tue May 15 2012 Martin Gansser <linux4martin at gmx.de> - 0.10.2-3
+- added correct permissions for vdr_vardir and vdr_cachedir
+
+* Mon May 14 2012 Martin Gansser <linux4martin at gmx.de> - 0.10.2-2
+- more cleanups
+- fixed the use of vdr macros
+
+* Sun May 13 2012 Martin Gansser <linux4martin at gmx.de> - 0.10.2-1
+- Rebuilt for new release
+
 * Fri Mar 02 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.10.1-10
 - Rebuilt for c++ ABI breakage
 
