Packman Build Service PMBS

Changes of Revision 8

ldvd.spec Changed

@@ -1,7 +1,4 @@
 # vim: set ts=4 sw=4 et:
-%define name      ldvd
-%define version   2.0.2
-%define release   1.pm.1
 
 Name:           ldvd
 Summary:        Video-DVD backup tool with GUI
@@ -16,33 +13,16 @@
 Patch1:         ldvd-lang.diff
 Patch2:         ldvd-port_to_gtk2.patch
 Vendor:         Packman
-BuildRoot:      %{_tmppath}/%{name}-root
+Requires:       buffer
 Requires:       perl
 Requires:       perl-Gtk2
-Requires:       transcode >= 0.6.14
+Requires:       transcode
 Requires:       dvdauthor
-%if 0%{?suse_version} >= 1210
-BuildRequires:  genisoimage
-%else
-Requires:       /usr/bin/mkisofs
-%endif
+Requires:       mkisofs
 Requires:       dvd+rw-tools
-Requires:       mjpegtools >= 1.6.2
-Requires:       libdvdread >= 0.9.5
-BuildRequires:  libdvdread-devel >= 0.9.5
-BuildRequires:  perl-Gtk2
-BuildRequires:  transcode >= 0.6.14
-BuildRequires:  dvdauthor
-%if 0%{?suse_version} >= 1210
-BuildRequires:  genisoimage
-Patch3:         replace_mkisofs_with_genisoimage.patch
-%else
-BuildRequires:  mkisofs >= 1.15
-%endif
-BuildRequires:  dvd+rw-tools
-BuildRequires:  mjpegtools >= 1.6.2
-BuildRequires:  libdvdread >= 0.9.5
+Requires:       mjpegtools
 BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(dvdread)
 
 %description
 A tool to make backups from a Video-DVD with GUI.
@@ -52,28 +32,21 @@
 %patch0
 %patch1
 %patch2
-%if 0%{?suse_version} >= 1210
-%patch3 -p1
-%endif
-
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export CPPFLAGS="$RPM_OPT_FLAGS"
-%{__make} %{?jobs:-j%{jobs}}
+%make_build
 
 %install
-%{makeinstall} PREFIX=%{_prefix}
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications
-%{__install} -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/applications/
+%make_install PREFIX=%{_prefix}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/applications/
 %suse_update_desktop_file -i %{name}        AudioVideo AudioVideoEditing
 
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
-
 %files
-%defattr(-, root, root)
-%doc README.* COPYING
+%doc README.*
+%license COPYING
 %{_bindir}/*
 %{_datadir}/%{name}-%{version}
 %{_datadir}/applications/%{name}.desktop

replace_mkisofs_with_genisoimage.patch Deleted

@@ -1,85 +0,0 @@
-Wed Mar  7 23:18:43 CET 2012
-Philipp Seiler <p.seiler@linuxmail.org>
-
-Used to work with openSUSE 12.1 and later
-genisoimage should have the same syntax as mkisofs
-
-diff -upr ldvd-2.0.2-old/ldvd ldvd-2.0.2/ldvd
---- ldvd-2.0.2-old/ldvd	2006-03-01 16:29:55.000000000 +0100
-+++ ldvd-2.0.2/ldvd	2012-03-07 23:14:52.107101745 +0100
-@@ -115,7 +115,7 @@ $SETTINGS{'P_TCCAT'} = "tccat";
- $SETTINGS{'P_DVDAUTHOR'} = "dvdauthor";
- $SETTINGS{'P_SPUUNMUX'} = "spuunmux";
- $SETTINGS{'P_SPUMUX'} = "spumux";
--$SETTINGS{'P_MKISOFS'} = "mkisofs";
-+$SETTINGS{'P_GENISOIMAGE'} = "genisoimage";
- $SETTINGS{'P_GROWISOFS'} = "growisofs";
- 
- $SETTINGS{'NICE'} = 10;
-@@ -1437,8 +1437,8 @@ sub BURN_DVD ()
-   if ($SETTINGS{'BURN_MODE'} == 1) ## Image erstellen
-   { my $file = $br_entry->get_text ();
-     if ($file ne "" && -d $SETTINGS{'PATH'} . "/" . $DVD_INFO{'DISC_TITLE'} . "/dvd")
--    { CHECK_PROGRAM ($SETTINGS{'P_MKISOFS'});
--      COMMAND ($SETTINGS{'P_MKISOFS'} . " -V \'" . $entry_title->get_text () . "\' -dvd-video -udf -o $file " . $SETTINGS{'PATH'} . "/" 
-+    { CHECK_PROGRAM ($SETTINGS{'P_GENISOIMAGE'});
-+      COMMAND ($SETTINGS{'P_GENISOIMAGE'} . " -V \'" . $entry_title->get_text () . "\' -dvd-video -udf -o $file " . $SETTINGS{'PATH'} . "/" 
-        . $DVD_INFO{'DISC_TITLE'} . "/dvd");
-     }
-     else
-@@ -1519,7 +1519,7 @@ sub SAVE_SETTINGS ()
-   print CONF "P_DVDAUTHOR=" . $SETTINGS{'P_DVDAUTHOR'} . "\n";
-   print CONF "P_SPUUNMUX=" . $SETTINGS{'P_SPUUNMUX'} . "\n";
-   print CONF "P_SPUMUX=" . $SETTINGS{'P_SPUMUX'} . "\n";
--  print CONF "P_MKISOFS=" . $SETTINGS{'P_MKISOFS'} . "\n";
-+  print CONF "P_GENISOIMAGE=" . $SETTINGS{'P_GENISOIMAGE'} . "\n";
-   print CONF "P_GROWISOFS=" . $SETTINGS{'P_GROWISOFS'} . "\n";
-   print CONF "NICE=" . $SETTINGS{'NICE'} . "\n";
-   print CONF "TEST_RIP=" . $SETTINGS{'TEST_RIP'} . "\n";
-diff -upr ldvd-2.0.2-old/ldvd.conf ldvd-2.0.2/ldvd.conf
---- ldvd-2.0.2-old/ldvd.conf	2006-03-01 16:29:55.000000000 +0100
-+++ ldvd-2.0.2/ldvd.conf	2012-03-07 23:12:26.937507287 +0100
-@@ -12,6 +12,6 @@ P_TCCAT=tccat
- P_DVDAUTHOR=dvdauthor
- P_SPUUNMUX=spuunmux
- P_SPUMUX=spumux
--P_MKISOFS=mkisofs
-+P_GENISOIMAGE=genisoimage
- P_GROWISOFS=growisofs
- NICE=10
-diff -upr ldvd-2.0.2-old/ldvd.spec ldvd-2.0.2/ldvd.spec
---- ldvd-2.0.2-old/ldvd.spec	2006-03-01 16:29:55.000000000 +0100
-+++ ldvd-2.0.2/ldvd.spec	2012-03-07 23:17:06.274726937 +0100
-@@ -12,7 +12,7 @@ Requires: 	perl
- Requires: 	perl-Gtk-Perl
- Requires: 	transcode >= 0.6.14
- Requires: 	dvdauthor 
--Requires: 	mkisofs >= 1.15
-+Requires: 	genisoimage
- Requires: 	dvd+rw-tools
- Requires: 	buffer
- Requires: 	mjpegtools >= 1.6.2
-diff -upr ldvd-2.0.2-old/README.de ldvd-2.0.2/README.de
---- ldvd-2.0.2-old/README.de	2006-03-01 16:29:55.000000000 +0100
-+++ ldvd-2.0.2/README.de	2012-03-07 23:13:12.833379075 +0100
-@@ -33,7 +33,7 @@ Benoetigte Programme:
- - dvdauthor     >= 0.6.10 Programm zum erstellen von DVDs
-                 http://dvdauthor.sourceforge.net/
- 
--- mkisofs       >= 1.15 Programm zum Erstellen von Imagedateien
-+- genisoimage   Programm zum Erstellen von Imagedateien
-                 http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
- 
- - dvd+rw-tools  Zum Brennen der DVD (getestete Version: 5.17.4.8.6)
-diff -upr ldvd-2.0.2-old/README.en ldvd-2.0.2/README.en
---- ldvd-2.0.2-old/README.en	2006-03-01 16:29:55.000000000 +0100
-+++ ldvd-2.0.2/README.en	2012-03-07 23:13:37.349310586 +0100
-@@ -33,7 +33,7 @@ Needed programs:
- - dvdauthor     >= 0.6.10
-                 http://dvdauthor.sourceforge.net/
- 
--- mkisofs       >= 1.15 Tool to make Images
-+- genisoimage   Tool to make Images
-                 http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
- 
- - dvd+rw-tools  For bruning the DVD (tested: 5.17.4.8.6)