diff --git a/ctalk/ctalk.patch b/ctalk/ctalk.patch index 214f94f151..7cf6806f12 100644 --- a/ctalk/ctalk.patch +++ b/ctalk/ctalk.patch @@ -1,6 +1,6 @@ -Index: ctalk-0.0.23/ctpp/Makefile.in ---- ctalk-0.0.23/ctpp/Makefile.in.orig 2007-09-17 23:57:31 +0200 -+++ ctalk-0.0.23/ctpp/Makefile.in 2007-09-18 07:49:32 +0200 +Index: ctalk-0.0.24/ctpp/Makefile.in +--- ctalk-0.0.24/ctpp/Makefile.in.orig 2007-09-17 23:57:31 +0200 ++++ ctalk-0.0.24/ctpp/Makefile.in 2007-09-18 07:49:32 +0200 @@ -121,7 +121,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -10,9 +10,9 @@ Index: ctalk-0.0.23/ctpp/Makefile.in LIBTOOL = @LIBTOOL@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ -Index: ctalk-0.0.23/ctpp/builtins.c ---- ctalk-0.0.23/ctpp/builtins.c.orig 2007-09-13 04:04:24 +0200 -+++ ctalk-0.0.23/ctpp/builtins.c 2007-09-18 07:49:32 +0200 +Index: ctalk-0.0.24/ctpp/builtins.c +--- ctalk-0.0.24/ctpp/builtins.c.orig 2007-09-13 04:04:24 +0200 ++++ ctalk-0.0.24/ctpp/builtins.c 2007-09-18 07:49:32 +0200 @@ -80,11 +80,12 @@ * config file included above. See the comments in * config/linux-gnu-x86.c @@ -39,9 +39,9 @@ Index: ctalk-0.0.23/ctpp/builtins.c +#endif return FALSE; } -Index: ctalk-0.0.23/ctpp/ccompat.c ---- ctalk-0.0.23/ctpp/ccompat.c.orig 2007-09-14 21:00:05 +0200 -+++ ctalk-0.0.23/ctpp/ccompat.c 2007-09-18 07:49:32 +0200 +Index: ctalk-0.0.24/ctpp/ccompat.c +--- ctalk-0.0.24/ctpp/ccompat.c.orig 2007-09-14 21:00:05 +0200 ++++ ctalk-0.0.24/ctpp/ccompat.c 2007-09-18 07:49:32 +0200 @@ -53,8 +53,10 @@ char cpp_subdir[FILENAME_MAX]; @@ -62,9 +62,9 @@ Index: ctalk-0.0.23/ctpp/ccompat.c /* Try to find out what the compiler target is. It may not be the same as the autoconf $host. -Index: ctalk-0.0.23/ctpp/i_opt.c ---- ctalk-0.0.23/ctpp/i_opt.c.orig 2007-09-13 04:04:24 +0200 -+++ ctalk-0.0.23/ctpp/i_opt.c 2007-09-18 07:49:32 +0200 +Index: ctalk-0.0.24/ctpp/i_opt.c +--- ctalk-0.0.24/ctpp/i_opt.c.orig 2007-09-13 04:04:24 +0200 ++++ ctalk-0.0.24/ctpp/i_opt.c 2007-09-18 07:49:32 +0200 @@ -30,6 +30,8 @@ #include #include @@ -74,9 +74,9 @@ Index: ctalk-0.0.23/ctpp/i_opt.c #include "ctpp.h" extern char source_file[FILENAME_MAX]; /* Declared in rtinfo.c. */ -Index: ctalk-0.0.23/lib/rtinfo.c ---- ctalk-0.0.23/lib/rtinfo.c.orig 2007-09-12 11:06:44 +0200 -+++ ctalk-0.0.23/lib/rtinfo.c 2007-09-18 07:49:32 +0200 +Index: ctalk-0.0.24/lib/rtinfo.c +--- ctalk-0.0.24/lib/rtinfo.c.orig 2007-09-12 11:06:44 +0200 ++++ ctalk-0.0.24/lib/rtinfo.c 2007-09-18 07:49:32 +0200 @@ -32,7 +32,7 @@ #include "parser.h" @@ -86,9 +86,9 @@ Index: ctalk-0.0.23/lib/rtinfo.c extern int daylight; RT_INFO rtinfo; -Index: ctalk-0.0.23/libctpp/lex.c ---- ctalk-0.0.23/libctpp/lex.c.orig 2007-09-13 04:04:26 +0200 -+++ ctalk-0.0.23/libctpp/lex.c 2007-09-18 07:49:32 +0200 +Index: ctalk-0.0.24/libctpp/lex.c +--- ctalk-0.0.24/libctpp/lex.c.orig 2007-09-13 04:04:26 +0200 ++++ ctalk-0.0.24/libctpp/lex.c 2007-09-18 07:49:32 +0200 @@ -26,6 +26,8 @@ #include #include @@ -98,9 +98,9 @@ Index: ctalk-0.0.23/libctpp/lex.c #include "ctpp.h" #include "typeof.h" #include "prtinfo.h" -Index: ctalk-0.0.23/src/Makefile.in ---- ctalk-0.0.23/src/Makefile.in.orig 2007-09-17 23:57:31 +0200 -+++ ctalk-0.0.23/src/Makefile.in 2007-09-18 07:54:46 +0200 +Index: ctalk-0.0.24/src/Makefile.in +--- ctalk-0.0.24/src/Makefile.in.orig 2007-09-17 23:57:31 +0200 ++++ ctalk-0.0.24/src/Makefile.in 2007-09-18 07:54:46 +0200 @@ -122,7 +122,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ diff --git a/ctalk/ctalk.spec b/ctalk/ctalk.spec index a6f8bcf935..40619d551b 100644 --- a/ctalk/ctalk.spec +++ b/ctalk/ctalk.spec @@ -23,7 +23,7 @@ ## # package versions -%define V_ctalk 0.0.23a +%define V_ctalk 0.0.24a %define V_ctpp 1.0.27 # package information @@ -37,7 +37,7 @@ Class: EVAL Group: Language License: GPL Version: %{V_ctalk} -Release: 20071211 +Release: 20071213 # list of sources Source0: http://www.ctalklang.org/files/ctalk-%{V_ctalk}.tar.gz @@ -81,22 +81,24 @@ AutoReqProv: no ( cd ctalk-* CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ + INSTALL="%{l_shtool} install -c" \ ./configure \ --prefix=%{l_prefix} \ --mandir=%{l_prefix}/man \ --infodir=%{l_prefix}/info \ --disable-shared - %{l_make} %{l_mflags -O} + %{l_make} %{l_mflags} ) || exit $? ( cd ctpp-* CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ + INSTALL="%{l_shtool} install -c" \ ./configure \ --prefix=%{l_prefix} \ --mandir=%{l_prefix}/man \ --infodir=%{l_prefix}/info \ --disable-shared - %{l_make} %{l_mflags -O} + %{l_make} %{l_mflags} ) || exit $? %install