packages: cdrtools/cdrtools-make.patch, cdrtools/cdrtools.spec - reverted

[amateja]

Author: amateja                      Date: Fri Nov 20 11:43:20 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- reverted

---- Files affected:
packages/cdrtools:
   cdrtools-make.patch (1.5 -> 1.6) , cdrtools.spec (1.145 -> 1.146) 

---- Diffs:

================================================================
Index: packages/cdrtools/cdrtools-make.patch
diff -u packages/cdrtools/cdrtools-make.patch:1.5 packages/cdrtools/cdrtools-make.patch:1.6
--- packages/cdrtools/cdrtools-make.patch:1.5	Fri Nov 20 12:34:28 2009
+++ packages/cdrtools/cdrtools-make.patch	Fri Nov 20 12:43:14 2009
@@ -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=
  

================================================================
Index: packages/cdrtools/cdrtools.spec
diff -u packages/cdrtools/cdrtools.spec:1.145 packages/cdrtools/cdrtools.spec:1.146
--- packages/cdrtools/cdrtools.spec:1.145	Fri Nov 20 12:34:28 2009
+++ packages/cdrtools/cdrtools.spec	Fri Nov 20 12:43:14 2009
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%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
@@ -13,7 +13,7 @@
 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
@@ -254,8 +254,6 @@
 
 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
@@ -292,7 +290,7 @@
 
 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
 
@@ -387,8 +385,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.145  2009/11/20 11:34:28  amateja
-./perl-Encode/perl-Encode.spec
+Revision 1.146  2009/11/20 11:43:14  amateja
+- reverted
 
 Revision 1.144  2009/10/16 10:16:42  amateja
 - reverted
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cdrtools/cdrtools-make.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cdrtools/cdrtools.spec?r1=1.145&r2=1.146&f=u