From 89092d6d43a4cc5c5303a0e2df650bb21d4fb427 Mon Sep 17 00:00:00 2001 From: amateja Date: Fri, 20 Nov 2009 11:34:28 +0000 Subject: [PATCH] ./perl-Encode/perl-Encode.spec Changed files: cdrtools-make.patch -> 1.5 cdrtools.spec -> 1.145 --- cdrtools-make.patch | 19 ++++++++----------- cdrtools.spec | 8 +++++--- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/cdrtools-make.patch b/cdrtools-make.patch index 8918c84..d6d7e0b 100644 --- a/cdrtools-make.patch +++ b/cdrtools-make.patch @@ -1,19 +1,16 @@ ---- 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)) +--- 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)) -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 -R$(OLIBSDIR) +-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib +LDPATH= +RUNPATH= diff --git a/cdrtools.spec b/cdrtools.spec index 0499270..60b7990 100644 --- a/cdrtools.spec +++ b/cdrtools.spec @@ -1,4 +1,4 @@ -%define subver a59 +%define subver a67 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: a5bd27c5916889098dacdacd393c99e5 +# Source0-md5: 0aa1533bee9ec53f80378d92f30dbf46 Patch0: %{name}-config.patch Patch2: %{name}-man.patch Patch3: %{name}-make.patch @@ -253,6 +253,8 @@ 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 @@ -289,7 +291,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 incs/*/avoffset.h $RPM_BUILD_ROOT%{_includedir}/schily +install include/*/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 -- 2.44.0