Author: juran Update of /cvs/free/rpms/lxdvdrip/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv14270 Modified Files: .cvsignore lxdvdrip-makefile.patch lxdvdrip.spec sources Removed Files: lxdvdrip-compile.patch Log Message: - update to 1.74 - keep dvdbackup from lxdvdrip-1.70 due to requirement on new libdvdread - clean up rpmlint errors Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/lxdvdrip/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Aug 2008 18:13:21 -0000 1.2 +++ .cvsignore 22 Feb 2009 10:24:23 -0000 1.3 @@ -1 +1,2 @@ -lxdvdrip-1.70.tgz +lxdvdrip-1.74.tar.gz +dvdbackup.tar.bz2 lxdvdrip-makefile.patch: Index: lxdvdrip-makefile.patch =================================================================== RCS file: /cvs/free/rpms/lxdvdrip/devel/lxdvdrip-makefile.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lxdvdrip-makefile.patch 19 Aug 2008 18:13:21 -0000 1.1 +++ lxdvdrip-makefile.patch 22 Feb 2009 10:24:23 -0000 1.2 @@ -1,6 +1,7 @@ ---- Makefile.orig 2007-12-21 09:21:40.000000000 +0100 -+++ Makefile 2007-12-21 09:27:01.000000000 +0100 -@@ -1,11 +1,13 @@ +diff -up lxdvdrip/Makefile.orig lxdvdrip/Makefile +--- lxdvdrip/Makefile.orig 2009-01-31 19:29:57.000000000 +0200 ++++ lxdvdrip/Makefile 2009-02-21 15:43:23.000000000 +0200 +@@ -1,11 +1,14 @@ INSTALLDIR = /usr/local -HINWEIS0 = 'Bitte Konfigdatei in /etc mit Changelog abgleichen' -HINWEIS1 = 'Check the configuration file in /etc with the Changelog' @@ -10,16 +11,17 @@ +MANDIR= +DATADIR= +SYSCONFDIR= ++ all: -- gcc -g -lm -ldvdread -ldvdnav -lpthread -o lxdvdrip lxdvdrip.c streamanalyze.c ifo.c dvdinfo.c dvdbackup.c dvdcell.c systools.c vaporize.c dvdtools.c dvdcopy.c requant.c cputest.c tcmemcpy.c +- gcc -g -lm -ldvdread -ldvdnav -lpthread -o lxdvdrip lxdvdrip.c streamanalyze.c ifo.c dvdinfo.c dvdbackup.c dvdcell.c systools.c vaporize.c dvdtools.c dvdcopy.c requant.c cputest.c tcmemcpy.c dvdformat.c badsect.c mpeg2dec.c - gcc -g -lm -o lxac3scan lxac3scan.c -+ gcc -g $(CFLAGS) -lm -ldvdread -ldvdnav -lpthread -o lxdvdrip lxdvdrip.c streamanalyze.c ifo.c dvdinfo.c dvdbackup.c dvdcell.c systools.c vaporize.c dvdtools.c dvdcopy.c requant.c cputest.c tcmemcpy.c -+ gcc -g $(CFLAGS) -lm -o lxac3scan lxac3scan.c ++ gcc -g $(CFLAGS) -lm -ldvdread -ldvdnav -lpthread -o lxdvdrip lxdvdrip.c streamanalyze.c ifo.c dvdinfo.c dvdbackup.c dvdcell.c systools.c vaporize.c dvdtools.c dvdcopy.c requant.c cputest.c tcmemcpy.c dvdformat.c badsect.c mpeg2dec.c ++ gcc -g $(CLAGS) -lm -o lxac3scan lxac3scan.c cd vamps && make && cd .. cd dvdbackup && make && cd .. - cd buffer && make && cd .. -@@ -17,23 +19,15 @@ + cd requant && make && cd .. +@@ -19,25 +22,17 @@ clean: cd buffer && make clean && cd .. install: @@ -35,14 +37,15 @@ + cp lxac3scan $(INSTALLDIR)/$(BINDIR) + cp lxdvdrip.1 $(INSTALLDIR)/$(MANDIR)/man1 + cp lxdvdrip.wav $(INSTALLDIR)/$(DATADIR) -+ cp lxdvdrip.conf $(INSTALLDIR)/$(SYSCONFDIR) ++ install -m 644 lxdvdrip.conf $(INSTALLDIR)/$(SYSCONFDIR) cd vamps && make install && cd .. cd dvdbackup && make install && cd .. + cd requant && make install && cd .. cd buffer && make install && cd .. - if test -f /etc/lxdvdrip.conf; then echo $(HINWEIS0); fi; - if test -f /etc/lxdvdrip.conf; then echo $(HINWEIS1); fi; - if test -f /etc/lxdvdrip.conf; then echo $(HINWEIS2); else cp lxdvdrip.conf /etc; fi; -- + -uninstall: - rm $(INSTALLDIR)/bin/lxdvdrip - rm $(INSTALLDIR)/bin/lxac3scan @@ -51,4 +54,5 @@ - rm $(INSTALLDIR)/bin/vamps_lxdvdrip - rm $(INSTALLDIR)/bin/play_cell_lxdvdrip - rm $(INSTALLDIR)/bin/dvdbackup_lxdvdrip +- rm $(INSTALLDIR)/bin/requant_lxdvdrip - rm $(INSTALLDIR)/bin/buffer_lxdvdrip Index: lxdvdrip.spec =================================================================== RCS file: /cvs/free/rpms/lxdvdrip/devel/lxdvdrip.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lxdvdrip.spec 18 Nov 2008 18:53:57 -0000 1.3 +++ lxdvdrip.spec 22 Feb 2009 10:24:23 -0000 1.4 @@ -1,14 +1,14 @@ Name: lxdvdrip -Version: 1.70 -Release: 4%{?dist} +Version: 1.74 +Release: 1%{?dist} Summary: A command line tool to rip&burn a video DVD Group: Applications/Multimedia -License: GPL +License: GPLv2 URL: http://lxdvdrip.berlios.de/ -Source0: http://download.berlios.de/lxdvdrip/lxdvdrip-1.70.tgz +Source0: http://download.berlios.de/lxdvdrip/lxdvdrip-1.74.tar.gz +Source1: dvdbackup.tar.bz2 Patch0: lxdvdrip-makefile.patch -Patch1: lxdvdrip-compile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libdvdread-devel >= 4.1.3 libdvdnav-devel Requires: dvdauthor @@ -26,8 +26,11 @@ %prep %setup -q -n lxdvdrip -%patch0 -%patch1 +%patch0 -p1 -b .makefile + +rm -fR dvdbackup +tar -xjf %{SOURCE1} +chmod 644 doc-pak/lxdvdrip.conf.* %build make CFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags} @@ -40,7 +43,6 @@ DATADIR=%{_datadir}/%{name}-%{version} SYSCONFDIR=%{_sysconfdir} \ PREFIX=$RPM_BUILD_ROOT%{_usr} INSTBIN=$RPM_BUILD_ROOT%{_bindir} - %clean rm -rf $RPM_BUILD_ROOT @@ -50,10 +52,15 @@ %doc doc-pak/README.* doc-pak/TODO %{_bindir}/* %{_mandir}/man1/* -%{_datadir}/* +%{_datadir}/lxdvdrip* %config(noreplace) %{_sysconfdir}/lxdvdrip.conf %changelog +* Sat Feb 21 2009 David Juran <david(a)juran.se&gt; - 1.74-1 +- update to 1.74 +- keep dvdbackup from lxdvdrip-1.70 due to requirement on new libdvdread +-clean up rpmlint errors + * Thu Nov 18 2008 David Juran <david(a)juran.se&gt; - 1.70-4 - dvdread changed the header structure back. Dropping patch Index: sources =================================================================== RCS file: /cvs/free/rpms/lxdvdrip/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Aug 2008 18:13:21 -0000 1.2 +++ sources 22 Feb 2009 10:24:23 -0000 1.3 @@ -1 +1,2 @@ -73c7bec3bba1ad28bf78ec9dfba94598 lxdvdrip-1.70.tgz +211d644316ccf1fe98619e8af466b6f7 lxdvdrip-1.74.tar.gz +45b09907dca1b8f3d7f61d9c3cbaded5 dvdbackup.tar.bz2 --- lxdvdrip-compile.patch DELETED ---