From: amateja Date: Fri, 16 Oct 2009 10:12:26 +0000 (+0000) Subject: - updated to 20090616 X-Git-Tag: auto/th/cdrtools-2_01_01-0_a71_1~11 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=6a5a279451917465bcaef4fe55632016f82562ca;p=packages%2Fcdrtools.git - updated to 20090616 Changed files: cdrtools-make.patch -> 1.3 cdrtools.spec -> 1.143 --- diff --git a/cdrtools-make.patch b/cdrtools-make.patch index 8918c84..1fac9bf 100644 --- a/cdrtools-make.patch +++ b/cdrtools-make.patch @@ -1,6 +1,6 @@ ---- 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 @@ +--- 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 @@ # LINUX_SRC_INCLUDE is used in RULES/*-linux-*cc*.rul # ########################################################################### @@ -13,14 +13,15 @@ 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= ########################################################################### # --- cdrtools-2.01.01/RULES/rules.cnf.orig 2008-08-01 20:04:08.000000000 +0200 -+++ cdrtools-2.01.01/RULES/rules.cnf 2008-10-06 22:18:00.000000000 +0200 ++++ cdrtools-2.01.01/RULES/rules.cnf 2009-10-13 09:28:29.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 0499270..ae2216e 100644 --- a/cdrtools.spec +++ b/cdrtools.spec @@ -1,4 +1,4 @@ -%define subver a59 +%define subver a66 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: 813ec0e673597ae3038521dd1e2cfcbf 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