diff --git a/cdrdao-1.1.7-endianness.patch b/cdrdao-1.1.7-endianness.patch new file mode 100644 index 0000000..846b2f3 --- /dev/null +++ b/cdrdao-1.1.7-endianness.patch @@ -0,0 +1,10 @@ +--- cdrdao-1.1.7/scsilib/include/btorder.h.endianness 2004-01-20 13:53:42.000000000 +0100 ++++ cdrdao-1.1.7/scsilib/include/btorder.h 2004-01-20 13:55:24.000000000 +0100 +@@ -100,6 +100,7 @@ + # endif + + # if defined(__i386__) || defined(__i386) || defined(i386) || \ ++ defined(__ia64__) || defined(__ia64) || defined(ia64) || \ + defined(__alpha__) || defined(__alpha) || defined(alpha) || \ + defined(__arm__) || defined(__arm) || defined(arm) + # define _BIT_FIELDS_LTOH diff --git a/cdrdao.spec b/cdrdao.spec index da20d29..cad800e 100644 --- a/cdrdao.spec +++ b/cdrdao.spec @@ -1,16 +1,17 @@ Summary: Writes audio CD-Rs in disk-at-once (DAO) mode. Name: cdrdao Version: 1.1.7 -Release: 7 +Release: 8.atapi.1 License: GPL Group: Applications/System URL: http://unc.dl.sourceforge.net/sourceforge/cdrdao/cdrdao-1.1.7.src.tar.bz2 #URL: http://cdrdao.sourceforge.net/download.html Source0: %{name}-%{version}.src.tar.bz2 Source1: xcdrdao.desktop -Patch0: cdrdao-1.1.15-endianness.patch -#Patch1: cdrdao-1.1.5-c++.patch -Patch2: cdrdao-1.1.5-EXCL.patch +Patch0: cdrdao-1.1.7-atapi.patch +Patch1: cdrdao-1.1.7-endianness.patch +Patch2: cdrdao-1.1.7-O_EXCL.patch +Patch3: cdrdao-1.1.7-scsi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: pccts >= 1.33mr22 @@ -26,16 +27,12 @@ of pre-gaps, the pause areas between tracks. %prep %setup -q -%patch0 -p0 -b .endianness -#%patch1 -p1 -b .c++ -%patch2 -p1 -b .excl - +%patch0 -p1 -b .atapi +%patch1 -p1 -b .endianness +%patch2 -p1 -b .oexcl +%patch3 -p1 -b .scsi %build cd scsilib -ln -s i686-linux-gcc.rul RULES/ia64-linux-gcc.rul -ln -s i686-linux-cc.rul RULES/ia64-linux-cc.rul -ln -s i686-linux-gcc.rul RULES/s390-linux-gcc.rul -ln -s i686-linux-cc.rul RULES/s390-linux-cc.rul ln -s i686-linux-gcc.rul RULES/s390x-linux-gcc.rul ln -s i686-linux-cc.rul RULES/s390x-linux-cc.rul ln -s i686-linux-cc.rul RULES/ppc64-linux-cc.rul @@ -46,8 +43,8 @@ rm -f mkisofs/README.compression.zisofs-support-hpa find . |xargs chmod a+r find . -name \*.mk|xargs perl -pi -e 's/INSDIR=\s*lib\s*$/INSDIR=%{_lib}\n/g' cd conf -aclocal -libtoolize --copy --force +#aclocal +#libtoolize --copy --force cd ../.. %configure --prefix=%{_prefix}\ --with-pcctsbin=%{_prefix}/bin \ @@ -76,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/*/* %changelog +* Mon Jan 26 2004 Harald Hoyer 1.1.7-8.atapi.1 +- added ATAPI: support + * Wed Jun 04 2003 Elliot Lee - rebuilt