Packman Build Service PMBS

Changes of Revision 9

lxdvdrip.spec Changed

@@ -5,8 +5,6 @@
 # Packmanpackagedesc: <p>lxdvdrip is a tool to make a copy from a Video DVD for private use. It automates the process of ripping, authoring, preview and burning a DVD.</p>
 # Packmanpackagedesc_de: <p>lxdvdrip ist ein Kommandozeilenprogramm zur Anlage einer Kopie einer Video-DVD zur privaten Nutzung. Es automatisiert den Prozess des rippens, zusammenstellens, der Vorschau und des Brennens der DVD.</p>
 
-# norootforbuild
-
 Name:           lxdvdrip
 Summary:        Video-DVD backup tool
 Summary(de):    Video-DVD Backup Programm
@@ -15,21 +13,20 @@
 URL:            http://sourceforge.net/p/lxdvdrip/home/Homepage/
 Version:        1.77
 Release:        1
-Source0:        lxdvdrip-%{version}.tar.bz2
+Source0:        lxdvdrip-%version.tar.bz2
 Patch0:         lxdvdrip_conf.diff
 Patch1:         lxdvdrip.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Requires:       cdrecord
 Requires:       dvdauthor
 Requires:       dvdbackup
 Requires:       dvd+rw-tools
-Requires:       dvdwizard >= 0.4.2
-Requires:       libdvdread3 >= 0.9.7
+Requires:       dvdwizard
+Requires:       libdvdread3
 Requires:       lsdvd
 Requires:       mpgtx
-Requires:       MPlayer >= 0.90
+Requires:       MPlayer
 Requires:       /usr/bin/mkisofs
-Requires:       transcode >= 1.1.0
+Requires:       transcode
 Requires:       vobcopy
 BuildRequires:  gcc
 BuildRequires:  libdvdread3-devel
@@ -44,71 +41,60 @@
 Video-DVD zur privaten Nutzung. Es automatisiert den Prozess des rippens,
 autoren, der Vorschau und des Brennens der DVD.
 
-
-
 %prep
-%setup -n %{name}
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1 -n %name
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -DLARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
-export CPPFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -DLARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
-%ifarch ppc ppc64
-sed -i -e "s/\/\/ #define STAT /#define __ppc__ /g" requant/requant_lxdvdrip.c
-%endif
-gcc -std=gnu99 $RPM_OPT_FLAGS -c -o lxdvdrip.o lxdvdrip.c
-gcc -std=gnu99 $RPM_OPT_FLAGS -c -o streamanalyze.o streamanalyze.c
-gcc -std=gnu99 $RPM_OPT_FLAGS -c -o ifo.o ifo.c
-gcc -std=gnu99 $RPM_OPT_FLAGS -c -o dvdinfo.o dvdinfo.c
-gcc -std=gnu99 $RPM_OPT_FLAGS -c -o dvdbackup.o dvdbackup.c
-gcc -std=gnu99 $RPM_OPT_FLAGS -c -o dvdcell.o dvdcell.c
-gcc -std=gnu99 $RPM_OPT_FLAGS -c -o systools.o systools.c
-gcc -std=gnu99 $RPM_OPT_FLAGS -c -o vaporize.o vaporize.c
-gcc -std=gnu99 $RPM_OPT_FLAGS -c -o dvdtools.o dvdtools.c
-gcc -std=gnu99 $RPM_OPT_FLAGS -c -o dvdcopy.o dvdcopy.c
-gcc -std=gnu99 $RPM_OPT_FLAGS -c -o requant.o requant.c
-gcc -std=gnu99 $RPM_OPT_FLAGS -c -o cputest.o cputest.c
-gcc -std=gnu99 $RPM_OPT_FLAGS -c -o tcmemcpy.o tcmemcpy.c
-gcc -std=gnu99 $RPM_OPT_FLAGS -c -o dvdformat.o dvdformat.c
-gcc -std=gnu99 $RPM_OPT_FLAGS -c -o badsect.o badsect.c
-gcc -std=gnu99 $RPM_OPT_FLAGS -c -o mpeg2dec.o mpeg2dec.c
-gcc -std=gnu99 $RPM_OPT_FLAGS -o lxdvdrip lxdvdrip.o streamanalyze.o ifo.o dvdinfo.o dvdbackup.o dvdcell.o systools.o vaporize.o dvdtools.o dvdcopy.o requant.o cputest.o tcmemcpy.o dvdformat.o badsect.o mpeg2dec.o -lm -ldvdread -lpthread
-gcc -std=gnu99 $RPM_OPT_FLAGS -c -o lxac3scan.o lxac3scan.c
-gcc -std=gnu99 $RPM_OPT_FLAGS -o lxac3scan lxac3scan.o -g -lm
+export CFLAGS='%optflags -D_LARGEFILE_SOURCE -DLARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64'
+export CPPFLAGS='%optflags -D_LARGEFILE_SOURCE -DLARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64'
+gcc -std=gnu99 %optflags -c -o lxdvdrip.o lxdvdrip.c
+gcc -std=gnu99 %optflags -c -o streamanalyze.o streamanalyze.c
+gcc -std=gnu99 %optflags -c -o ifo.o ifo.c
+gcc -std=gnu99 %optflags -c -o dvdinfo.o dvdinfo.c
+gcc -std=gnu99 %optflags -c -o dvdbackup.o dvdbackup.c
+gcc -std=gnu99 %optflags -c -o dvdcell.o dvdcell.c
+gcc -std=gnu99 %optflags -c -o systools.o systools.c
+gcc -std=gnu99 %optflags -c -o vaporize.o vaporize.c
+gcc -std=gnu99 %optflags -c -o dvdtools.o dvdtools.c
+gcc -std=gnu99 %optflags -c -o dvdcopy.o dvdcopy.c
+gcc -std=gnu99 %optflags -c -o requant.o requant.c
+gcc -std=gnu99 %optflags -c -o cputest.o cputest.c
+gcc -std=gnu99 %optflags -c -o tcmemcpy.o tcmemcpy.c
+gcc -std=gnu99 %optflags -c -o dvdformat.o dvdformat.c
+gcc -std=gnu99 %optflags -c -o badsect.o badsect.c
+gcc -std=gnu99 %optflags -c -o mpeg2dec.o mpeg2dec.c
+gcc -std=gnu99 %optflags -o lxdvdrip lxdvdrip.o streamanalyze.o ifo.o dvdinfo.o dvdbackup.o dvdcell.o systools.o vaporize.o dvdtools.o dvdcopy.o requant.o cputest.o tcmemcpy.o dvdformat.o badsect.o mpeg2dec.o -lm -ldvdread -lpthread
+gcc -std=gnu99 %optflags -c -o lxac3scan.o lxac3scan.c
+gcc -std=gnu99 %optflags -o lxac3scan lxac3scan.o -g -lm
 cd vamps && make && cd ..
 cd dvdbackup && make && cd ..
 cd requant && make && cd ..
 cd mbuffer && make && cd ..
 
 %install
-%{__rm} -rf CVS
-%{__rm} -rf doc-pak/CVS
-%{__install} -d -m 0755 %{buildroot}%{_bindir}
-%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}
-%{__install} -d -m 0755 %{buildroot}%{_datadir}
-%{__install} -d -m 0755 %{buildroot}%{_mandir}/man1
-%{__install} -m 0755 lxdvdrip %{buildroot}/%{_bindir}/
-%{__install} -m 0755 lxac3scan %{buildroot}/%{_bindir}/
-%{__install} -m 0755 vamps/vamps_lxdvdrip %{buildroot}/%{_bindir}/
-%{__install} -m 0755 vamps/play_cell_lxdvdrip %{buildroot}/%{_bindir}/
-%{__install} -m 0755 dvdbackup/dvdbackup_lxdvdrip %{buildroot}/%{_bindir}/
-%{__install} -m 0755 requant/requant_lxdvdrip %{buildroot}/%{_bindir}/
-%{__install} -m 0755 mbuffer/mbuffer_lxdvdrip %{buildroot}/%{_bindir}/
-%{__install} -m 0644 doc-pak/lxdvdrip.conf.DE %{buildroot}%{_sysconfdir}/lxdvdrip.conf
-%{__install} -m 0644 lxdvdrip.wav %{buildroot}%{_datadir}/
-%{__install} -m 0644 lxdvdrip.1 %{buildroot}%{_mandir}/man1/
+rm -rf CVS
+rm -rf doc-pak/CVS
+install -d -m 0755 %buildroot%_bindir
+install -d -m 0755 %buildroot%_sysconfdir
+install -d -m 0755 %buildroot%_datadir
+install -d -m 0755 %buildroot%_mandir/man1
+install -m 0755 lxdvdrip %buildroot/%_bindir/
+install -m 0755 lxac3scan %buildroot/%_bindir/
+install -m 0755 vamps/vamps_lxdvdrip %buildroot/%_bindir/
+install -m 0755 vamps/play_cell_lxdvdrip %buildroot/%_bindir/
+install -m 0755 dvdbackup/dvdbackup_lxdvdrip %buildroot/%_bindir/
+install -m 0755 requant/requant_lxdvdrip %buildroot/%_bindir/
+install -m 0755 mbuffer/mbuffer_lxdvdrip %buildroot/%_bindir/
+install -m 0644 doc-pak/lxdvdrip.conf.DE %buildroot%_sysconfdir/lxdvdrip.conf
+install -m 0644 lxdvdrip.wav %buildroot%_datadir/
+install -m 0644 lxdvdrip.1 %buildroot%_mandir/man1/
 chmod 644 doc-pak/*
 
-%clean
-[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
-
 %files
-%defattr(-, root, root)
 %doc doc-pak/*
-%config(noreplace) %{_sysconfdir}/lxdvdrip.conf
-%{_bindir}/*
-%{_datadir}/lxdvdrip.wav
-%{_mandir}/man1/lxdvdrip.*
+%config(noreplace) %_sysconfdir/lxdvdrip.conf
+%_bindir/*
+%_datadir/lxdvdrip.wav
+%_mandir/man1/lxdvdrip.*
 
 %changelog

lxdvdrip_conf_new.diff Deleted

@@ -1,36 +0,0 @@
---- doc-pak/lxdvdrip.conf.DE.orig	2011-10-21 20:51:44.000000000 +0200
-+++ doc-pak/lxdvdrip.conf.DE	2011-11-24 11:57:03.940463719 +0100
-@@ -54,13 +54,13 @@
- 
- # Device fuer DVD-Leselaufwerk.
- # Entspricht "-dl=".
--dvdleser=/dev/sr0
-+dvdleser=/dev/dvd
- 
- # Device fuer DVD-Brenner.
- # Beim Brennen mit "growisofs" ist zumeist "/dev/sr0" die richtige Wahl.
- # Bei "wodim" zumeist "0,0,0", testen mit "wodim -scanbus".
- # Entspricht "-db=".
--dvdbrenner=/dev/sr0
-+dvdbrenner=/dev/dvd
- 
- # Filmverzeichnis. In diesem Unterverzeichnis legt "dvdauthor" die 
- # DVD Struktur an.
-@@ -118,7 +118,7 @@
- # Moegliche Werte: vamps, vamps_menu, mplayer, transcode, trans_par,
- # (Transcode parallel), vlc, vlc_par, copy, partcopy.
- # Entspricht "-st=".
--streamtool=vamps
-+streamtool=vamps_lxdvdrip
- 
- # Sicherheitsabfrage zum Einlegen Rohling vor Brennen?
- # 0=nein, Brennen startet direkt, 1=ja, Pause.
-@@ -214,7 +214,7 @@
- transcode_name=transcode
- lxac3scan_name=lxac3scan
- nice_name=nice
--lxdvdrip_wav_name=/usr/local/share/lxdvdrip.wav
-+lxdvdrip_wav_name=/usr/share/lxdvdrip.wav
- 
- # Nice-Level fuer Programmgruppen
- # nice_rip fuer das Rippen (tccat, mplayer, spuunmux, vamps_play_cell)