- reverted

Changed files:
    cdrtools-make.patch -> 1.6
    cdrtools.spec -> 1.146

diff --git a/cdrtools-make.patch b/cdrtools-make.patch
index d6d7e0b9f159c6bea20655a1bf4033664c5e7277..8918c840ad56def9e8e38f02a105b048b2d42212 100644 (file)
--- a/cdrtools-make.patch
+++ b/cdrtools-make.patch
@@ -1,16 +1,19 @@
---- cdrtools-2.01.01/DEFAULTS/Defaults.linux.orig      2009-11-03 09:34:11.000000000 +0100
-+++ cdrtools-2.01.01/DEFAULTS/Defaults.linux   2009-11-03 09:35:52.000000000 +0100
-@@ -44,12 +44,11 @@
- 
- _LINUX_SRC_INCLUDE=   $(_UNIQ)$(MAY_LINUX_SRC_INCLUDE)
- __LINUX_SRC_INCLUDE=  $(_LINUX_SRC_INCLUDE:$(_UNIQ)=$(LINUX_INCL_PATH))
+--- cdrtools-2.01.01/DEFAULTS/Defaults.linux.orig      2007-05-08 16:56:55.000000000 +0200
++++ cdrtools-2.01.01/DEFAULTS/Defaults.linux   2008-05-28 18:12:17.188195788 +0200
+@@ -33,15 +33,11 @@
+ # LINUX_SRC_INCLUDE is used in RULES/*-linux-*cc*.rul
+ #
+ ###########################################################################
+-LINUX_INCL_PATH=      /usr/src/linux/include
+-
+-_LINUX_SRC_INCLUDE=   $(_UNIQ)$(MAY_LINUX_SRC_INCLUDE)
+-__LINUX_SRC_INCLUDE=  $(_LINUX_SRC_INCLUDE:$(_UNIQ)=$(LINUX_INCL_PATH))
 -LINUX_SRC_INCLUDE=      $(__LINUX_SRC_INCLUDE:$(_UNIQ)no%=%)
 +LINUX_SRC_INCLUDE=
  
  DEFINCDIRS=   $(SRCROOT)/include
 -LDPATH=               -L/opt/schily/lib
--#RUNPATH=     -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
--RUNPATH=      -R$(INS_BASE)/lib -R/opt/schily/lib
+-RUNPATH=      -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
 +LDPATH=
 +RUNPATH=
  

diff --git a/cdrtools.spec b/cdrtools.spec
index 60b7990abe630ca058682f99f8c916f1f3284489..0499270ccf67e8a31444273e55a04eb9314c5a33 100644 (file)
--- a/cdrtools.spec
+++ b/cdrtools.spec
@@ -1,4 +1,4 @@
-%define                subver  a67
+%define                subver  a59
 Summary:       A command line CD/DVD-Recorder
 Summary(es.UTF-8):     Un programa de grabación de CD/DVD
 Summary(pl.UTF-8):     Program do nagrywania płyt CD/DVD
@@ -12,7 +12,7 @@ Epoch:                5
 License:       GPL v2 (mkisofs), LGPL v2.1 (cdda2wav), CDDL v1.0 (the rest)
 Group:         Applications/System
 Source0:       ftp://ftp.berlios.de/pub/cdrecord/alpha/%{name}-%{version}%{subver}.tar.bz2
-# Source0-md5: 0aa1533bee9ec53f80378d92f30dbf46
+# Source0-md5: a5bd27c5916889098dacdacd393c99e5
 Patch0:                %{name}-config.patch
 Patch2:                %{name}-man.patch
 Patch3:                %{name}-make.patch
@@ -253,8 +253,6 @@ ln -sf i586-linux-cc.rul RULES/x86_64-linux-cc.rul
 
 sed -i -e "s/-o \$(INSUSR) -g \$(INSGRP)//g" RULES/rules.prg
 
-sed -i -e "s/AC_RCHECK_FUNCS/AC_CHECK_FUNCS/g" autoconf/configure*
-
 %build
 sed -i -e 's#/usr/bin/gm4#%{_bindir}/m4#g' autoconf/autoconf
 cd conf
@@ -291,7 +289,7 @@ install cdda2wav/cdda2ogg   $RPM_BUILD_ROOT%{_bindir}/
 
 install include/schily/*.h     $RPM_BUILD_ROOT%{_includedir}/schily
 install incs/*/align.h         $RPM_BUILD_ROOT%{_includedir}/schily
-install include/*/avoffset.h   $RPM_BUILD_ROOT%{_includedir}/schily
+install incs/*/avoffset.h      $RPM_BUILD_ROOT%{_includedir}/schily
 install incs/*/xconfig.h       $RPM_BUILD_ROOT%{_includedir}/schily
 install libscg/scg/*.h         $RPM_BUILD_ROOT%{_includedir}/schily/scg