Andreas V. Meier:

package/rene/cdrdao/cdrdao.conf

@@ -32,10 +32,9 @@ cdrdao_main() {
 	cp h/* $root/usr/include/pccts
 	cd ..
 
-	patch -p0 < $confdir/disable-xdao.diff
 	eval ./configure $confopt
 	eval $MAKE ; eval $MAKE install
 }
 
 custmain="cdrdao_main"
-srctar="$pkg-$ver.src.tar.bz2"
+srctar="$pkg-$ver.tar.bz2"

package/rene/cdrdao/cdrdao.desc

@@ -40,9 +40,9 @@
 
 [L] GPL
 [S] Stable
-[V] 1.1.7
+[V] 1.1.8
 [P] X -----5---9 582.000
 
-[D] 3167841387 cdrdao-1.1.7.src.tar.gz http://dl.sourceforge.net/sourceforge/cdrdao/
+[D] 0 cdrdao-1.1.8.tar.gz http://dl.sourceforge.net/sourceforge/cdrdao/
 [D] 1992468110 pccts133mr.zip http://www.polhode.com/
 

package/rene/cdrdao/disable-xdao.diff

@@ -1,40 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/rene/cdrdao/disable-xdao.diff
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-I know that's not the right solution, but cdrdao is a great tool and we should not deliver 
-without it, as it's needed for S-VCDs and Audio-CDs. The xdao frontend seems to be broken
-with gettext/glibc-2.3/gcc-3.2 - already reported on sf.net
-    -- Nikolaus
-
---- Makefile.in.org	Sun Dec 29 02:16:00 2002
-+++ Makefile.in	Sun Dec 29 02:16:10 2002
-@@ -41,8 +41,8 @@
- #
- #
- #
--SUBDIRS = @pccts_target@ @scsilib_dir@ trackdb paranoia dao utils @xdao@
--SUBDIRSINST = trackdb dao utils @xdao@
-+SUBDIRS = @pccts_target@ @scsilib_dir@ trackdb paranoia dao utils
-+SUBDIRSINST = trackdb dao utils
- 
- all:
- 	for d in $(SUBDIRS) ; do  \