- reverted

Changed files:
    cdrtools-make.patch -> 1.4
    cdrtools.spec -> 1.144

diff --git a/cdrtools-make.patch b/cdrtools-make.patch
index 1fac9bf4ea8f1661a99d43676e2833b31afe31c4..8918c840ad56def9e8e38f02a105b048b2d42212 100644 (file)
--- a/cdrtools-make.patch
+++ b/cdrtools-make.patch
@@ -1,6 +1,6 @@
---- cdrtools-2.01.01/DEFAULTS/Defaults.linux.orig      2009-06-04 23:10:45.000000000 +0200
-+++ cdrtools-2.01.01/DEFAULTS/Defaults.linux   2009-10-13 09:23:44.000000000 +0200
-@@ -40,16 +40,11 @@
+--- 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
  #
  ###########################################################################
@@ -13,15 +13,14 @@
  
  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=
  
  ###########################################################################
  #
 --- cdrtools-2.01.01/RULES/rules.cnf.orig      2008-08-01 20:04:08.000000000 +0200
-+++ cdrtools-2.01.01/RULES/rules.cnf   2009-10-13 09:28:29.000000000 +0200
++++ cdrtools-2.01.01/RULES/rules.cnf   2008-10-06 22:18:00.000000000 +0200
 @@ -61,7 +61,7 @@
                cd $(OINCSDIR); \
                CONFIG_NOFAIL=TRUE CC="$(XCC_COM)" CFLAGS="$(CFLAGS)" \

diff --git a/cdrtools.spec b/cdrtools.spec
index ae2216ef867a8d8b14258fe054985615332b6dff..0499270ccf67e8a31444273e55a04eb9314c5a33 100644 (file)
--- a/cdrtools.spec
+++ b/cdrtools.spec
@@ -1,4 +1,4 @@
-%define                subver  a66
+%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: 813ec0e673597ae3038521dd1e2cfcbf
+# 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