From 23db6ff35a19d69fa1173f079e5b5f4a2a0c261e Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 20 Sep 2007 15:30:53 +0000 Subject: [PATCH] - fixed rhbz#248262 - switched to alternatives --- cdrkit.spec | 71 ++++++++++++++++++++++++++++++++------- genisoimage-dlength.patch | 21 ++++++++++++ 2 files changed, 79 insertions(+), 13 deletions(-) create mode 100644 genisoimage-dlength.patch diff --git a/cdrkit.spec b/cdrkit.spec index 5dc1859..d1d49ed 100644 --- a/cdrkit.spec +++ b/cdrkit.spec @@ -1,11 +1,14 @@ Summary: A collection of CD/DVD utilities Name: cdrkit Version: 1.1.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/System URL: http://cdrkit.org/ Source: http://debburn.alioth.debian.org/cdrkit-%{version}.tar.gz + +Patch1: genisoimage-dlength.patch + BuildRequires: cmake libcap-devel zlib-devel perl BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,6 +23,9 @@ Obsoletes: dvdrecord <= 0:0.1.5 Provides: dvdrecord = 0:0.1.5.1 Obsoletes: cdrecord < 9:2.01-12 Provides: cdrecord = 9:2.01-12 +Requires(preun): %{_sbindir}/alternatives +Requires(post): %{_sbindir}/alternatives +Requires(postun): %{_sbindir}/alternatives %description -n wodim Wodim is an application for creating audio and data CDs. Wodim @@ -32,6 +38,9 @@ Group: Applications/System Obsoletes: mkisofs < 9:2.01-12 Provides: mkisofs = 9:2.01-12 Requires: perl >= 4:5.8.1 +Requires(preun): %{_sbindir}/alternatives +Requires(post): %{_sbindir}/alternatives +Requires(postun): %{_sbindir}/alternatives %description -n genisoimage The genisoimage program is used as a pre-mastering program; i.e., it @@ -49,6 +58,9 @@ Group: Applications/Multimedia Summary: A utility for sampling/copying .wav files from digital audio CDs Obsoletes: cdda2wav < 9:2.01-12 Provides: cdda2wav = 9:2.01-12 +Requires(preun): %{_sbindir}/alternatives +Requires(post): %{_sbindir}/alternatives +Requires(postun): %{_sbindir}/alternatives %description -n icedax Icedax is a sampling utility for CD-ROM drives that are capable of @@ -59,6 +71,7 @@ rates. Icedax can also be used as a CD player. %prep %setup -q +%patch1 -p1 -b .dlength find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g' find doc -type f -print0 | xargs -0 chmod a-x @@ -78,27 +91,58 @@ make VERBOSE=1 %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT cd fedora make install DESTDIR=$RPM_BUILD_ROOT -ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkisofs -ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkhybrid -ln -s icedax $RPM_BUILD_ROOT%{_bindir}/cdda2wav -ln -s wodim $RPM_BUILD_ROOT%{_bindir}/cdrecord -ln -s wodim $RPM_BUILD_ROOT%{_bindir}/dvdrecord -ln -s readom $RPM_BUILD_ROOT%{_bindir}/readcd perl -pi -e 's#^require v5.8.1;##g' $RPM_BUILD_ROOT%{_bindir}/dirsplit %clean rm -rf $RPM_BUILD_ROOT +%post -n wodim +%{_sbindir}/alternatives --install %{_bindir}/cdrecord cdrecord \ + %{_bindir}/wodim 50 \ + --slave %{_mandir}/man1/cdrecord.1.gz cdrecord-cdrecordman \ + %{_mandir}/man1/wodim.1.gz \ + --slave %{_bindir}/dvdrecord cdrecord-dvdrecord %{_bindir}/wodim \ + --slave %{_mandir}/man1/dvdrecord.1.gz cdrecord-dvdrecordman \ + %{_mandir}/man1/wodim.1.gz \ + --slave %{_bindir}/readcd cdrecord-readcd %{_bindir}/readom \ + --slave %{_mandir}/man1/readcd.1.gz cdrecord-readcdman \ + %{_mandir}/man1/readcd.1.gz + +%preun -n wodim +if [ $1 = 0 ]; then + %{_sbindir}/alternatives --remove cdrecord %{_bindir}/wodim +fi + +%post -n genisoimage +%{_sbindir}/alternatives --install %{_bindir}/mkisofs mkisofs \ + %{_bindir}/genisoimage 50 \ + --slave %{_mandir}/man1/mkisofs.1.gz mkisofs-mkisofsman \ + %{_mandir}/man1/genisoimage.1.gz \ + --slave %{_bindir}/mkhybrid mkisofs-mkhybrid %{_bindir}/genisoimage + +%preun -n genisoimage +if [ $1 = 0 ]; then + %{_sbindir}/alternatives --remove mkisofs %{_bindir}/genisoimage +fi + +%post -n icedax +%{_sbindir}/alternatives --install %{_bindir}/cdda2wav cdda2wav \ + %{_bindir}/icedax 50 \ + --slave %{_mandir}/man1/cdda2wav.1.gz cdda2wav-cdda2wavman \ + %{_mandir}/man1/icedax.1.gz + +%preun -n icedax +if [ $1 = 0 ]; then + %{_sbindir}/alternatives --remove cdda2wav %{_bindir}/icedax +fi + %files -n wodim %defattr(-,root,root) %doc Changelog COPYING FAQ FORK START %doc doc/READMEs doc/wodim %{_bindir}/devdump %{_bindir}/wodim -%{_bindir}/cdrecord -%{_bindir}/dvdrecord %{_bindir}/readom -%{_bindir}/readcd %{_sbindir}/netscsid %{_mandir}/man1/devdump.* %{_mandir}/man1/wodim.* @@ -108,7 +152,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc doc/icedax COPYING %{_bindir}/icedax -%{_bindir}/cdda2wav %{_bindir}/cdda2mp3 %{_bindir}/cdda2ogg %{_mandir}/man1/icedax.* @@ -118,8 +161,6 @@ rm -rf $RPM_BUILD_ROOT %files -n genisoimage %defattr(-,root,root) %doc doc/genisoimage COPYING -%{_bindir}/mkisofs -%{_bindir}/mkhybrid %{_bindir}/genisoimage %{_bindir}/isodebug %{_bindir}/isodump @@ -139,6 +180,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/readmult.* %changelog +* Thu Sep 20 2007 Harald Hoyer - 1.1.6-3 +- fixed rhbz#248262 +- switched to alternatives + * Fri Aug 17 2007 Harald Hoyer - 1.1.6-2 - changed license to GPLv2 diff --git a/genisoimage-dlength.patch b/genisoimage-dlength.patch new file mode 100644 index 0000000..d2bfacd --- /dev/null +++ b/genisoimage-dlength.patch @@ -0,0 +1,21 @@ +diff -ur cdrkit-1.1.6/genisoimage/tree.c cdrkit-1.1.2/genisoimage/tree.c +--- cdrkit-1.1.6/genisoimage/tree.c 2007-09-20 16:05:13.000000000 +0200 ++++ cdrkit-1.1.2/genisoimage/tree.c 2007-09-20 16:04:52.000000000 +0200 +@@ -1596,12 +1602,10 @@ + !S_ISFIFO(lstatbuf.st_mode) && !S_ISSOCK(lstatbuf.st_mode) && + !S_ISLNK(lstatbuf.st_mode) && !S_ISREG(lstatbuf.st_mode) && + !S_ISDIR(lstatbuf.st_mode)) { +- if ( ! (this_dir == root && strcmp(short_name, "..") == 0)) { +- fprintf(stderr, +- "Unknown file type (%s) %s - ignoring and continuing.\n", +- filetype((int) lstatbuf.st_mode), whole_path); +- return (0); +- } ++ fprintf(stderr, ++ "Unknown file type (%s) %s - ignoring and continuing.\n", ++ filetype((int) lstatbuf.st_mode), whole_path); ++ return (0); + } + /* Who knows what trash this is - ignore and continue */ + +