packages: cdrtools/cdrtools-make.patch, cdrtools/cdrtools.spec - reverted
amateja
amateja at pld-linux.org
Fri Oct 16 12:16:48 CEST 2009
Author: amateja Date: Fri Oct 16 10:16:48 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- reverted
---- Files affected:
packages/cdrtools:
cdrtools-make.patch (1.3 -> 1.4) , cdrtools.spec (1.143 -> 1.144)
---- Diffs:
================================================================
Index: packages/cdrtools/cdrtools-make.patch
diff -u packages/cdrtools/cdrtools-make.patch:1.3 packages/cdrtools/cdrtools-make.patch:1.4
--- packages/cdrtools/cdrtools-make.patch:1.3 Fri Oct 16 12:12:26 2009
+++ packages/cdrtools/cdrtools-make.patch Fri Oct 16 12:16:42 2009
@@ -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)" \
================================================================
Index: packages/cdrtools/cdrtools.spec
diff -u packages/cdrtools/cdrtools.spec:1.143 packages/cdrtools/cdrtools.spec:1.144
--- packages/cdrtools/cdrtools.spec:1.143 Fri Oct 16 12:12:26 2009
+++ packages/cdrtools/cdrtools.spec Fri Oct 16 12:16:42 2009
@@ -1,5 +1,5 @@
# $Revision$, $Date$
-%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
@@ -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: 813ec0e673597ae3038521dd1e2cfcbf
+# 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.143 2009/10/16 10:12:26 amateja
-- updated to 20090616
+Revision 1.144 2009/10/16 10:16:42 amateja
+- reverted
Revision 1.142 2009/05/04 17:04:16 amateja
- updated to a59
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cdrtools/cdrtools-make.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cdrtools/cdrtools.spec?r1=1.143&r2=1.144&f=u
More information about the pld-cvs-commit
mailing list