diff --git a/.cvsignore b/.cvsignore
index bb058b4..f7d24b7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cdrdao-1.1.7.src.tar.bz2
+cdrdao-1.1.8.tar.gz
diff --git a/cdrdao-1.1.7-endianness.patch b/cdrdao-1.1.7-endianness.patch
deleted file mode 100644
index 846b2f3..0000000
--- a/cdrdao-1.1.7-endianness.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 cad800e..2afdefc 100644
--- a/cdrdao.spec
+++ b/cdrdao.spec
@@ -1,17 +1,15 @@
 Summary: Writes audio CD-Rs in disk-at-once (DAO) mode.
 Name: cdrdao
-Version: 1.1.7
-Release: 8.atapi.1
+Version: 1.1.8
+Release: 2
 License: GPL
-Group: Applications/System
-URL: http://unc.dl.sourceforge.net/sourceforge/cdrdao/cdrdao-1.1.7.src.tar.bz2
+Group: Applications/Multimedia
+URL: http://unc.dl.sourceforge.net/sourceforge/cdrdao/cdrdao-%{version}.tar.gz
 #URL: http://cdrdao.sourceforge.net/download.html
-Source0: %{name}-%{version}.src.tar.bz2
+Source0: %{name}-%{version}.tar.gz
 Source1: xcdrdao.desktop
-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
+Patch4: cdrdao-1.1.8-trackdb.patch
+Patch5: cdrdao-1.1.8-cast.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pccts >= 1.33mr22 
 
@@ -27,37 +25,19 @@ of pre-gaps, the pause areas between tracks.
 
 %prep
 %setup -q
-%patch0 -p1 -b .atapi
-%patch1 -p1 -b .endianness
-%patch2 -p1 -b .oexcl
-%patch3 -p1 -b .scsi
+%patch4 -p0 -b .trackdb
+%patch5 -p1 -b .cast
+
 %build
-cd scsilib
-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
-ln -s i686-linux-gcc.rul RULES/ppc64-linux-gcc.rul
-ln -s i686-linux-cc.rul RULES/x86_64-linux-cc.rul
-ln -s i686-linux-gcc.rul RULES/x86_64-linux-gcc.rul
-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
-cd ../..
 %configure --prefix=%{_prefix}\
             --with-pcctsbin=%{_prefix}/bin \
-            --with-pcctsinc=%{_prefix}/include/pccts
-
+            --with-pcctsinc=%{_prefix}/include/pccts \
+	    --with-scglib-inc=/usr/include/schily \
+	    --with-scglib-lib=/usr/%{_lib}
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System
-
-#install -m 0644 $RPM_SOURCE_DIR/xcdrdao.desktop\
-#	$RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System
 
 %makeinstall
 
@@ -66,13 +46,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc testtocs COPYING INSTALL README cdrdao.lsm
+%doc COPYING INSTALL README 
 %{_bindir}/*
-%dir %{_datadir}/cdrdao
-%{_datadir}/cdrdao/*
+#%dir %{_datadir}/cdrdao
+#%{_datadir}/cdrdao/*
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 20 2004 Harald Hoyer <harald@redhat.com> - 1.1.8-1
+- fixed ambigous operator cast
+
+* Wed Feb 18 2004 Harald Hoyer <harald@redhat.com> - 1.1.8-1
+- use scsilib from cdrecord-devel
+
+* Mon Feb 16 2004 Harald Hoyer <harald@redhat.com> - 1.1.8-1
+- version 1.1.8
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
 * Mon Jan 26 2004 Harald Hoyer <harald@redhat.de> 1.1.7-8.atapi.1
 - added ATAPI: support
 
diff --git a/sources b/sources
index 07ba4b5..3ce8d48 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a85c0fa006ad3af64b76fd86b10b2ad4  cdrdao-1.1.7.src.tar.bz2
+10cfd445fa628fb32dacf02e555fdbba  cdrdao-1.1.8.tar.gz