upgrading package: ctalk 0.0.32a -> 0.0.33a

ctalk/ctalk.patch

@@ -1,6 +1,6 @@
-Index: ctalk-0.0.32/ctpp/Makefile.in
---- ctalk-0.0.32/ctpp/Makefile.in.orig	2007-09-17 23:57:31 +0200
-+++ ctalk-0.0.32/ctpp/Makefile.in	2007-09-18 07:49:32 +0200
+Index: ctalk-0.0.33/ctpp/Makefile.in
+--- ctalk-0.0.33/ctpp/Makefile.in.orig	2007-09-17 23:57:31 +0200
++++ ctalk-0.0.33/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.32/ctpp/Makefile.in
  LIBTOOL = @LIBTOOL@
  LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@
  LIB_MINOR_VERSION = @LIB_MINOR_VERSION@
-Index: ctalk-0.0.32/ctpp/builtins.c
---- ctalk-0.0.32/ctpp/builtins.c.orig	2007-09-13 04:04:24 +0200
-+++ ctalk-0.0.32/ctpp/builtins.c	2007-09-18 07:49:32 +0200
+Index: ctalk-0.0.33/ctpp/builtins.c
+--- ctalk-0.0.33/ctpp/builtins.c.orig	2007-09-13 04:04:24 +0200
++++ ctalk-0.0.33/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.32/ctpp/builtins.c
 +#endif
    return FALSE;
  }
-Index: ctalk-0.0.32/ctpp/ccompat.c
---- ctalk-0.0.32/ctpp/ccompat.c.orig	2007-09-14 21:00:05 +0200
-+++ ctalk-0.0.32/ctpp/ccompat.c	2007-09-18 07:49:32 +0200
+Index: ctalk-0.0.33/ctpp/ccompat.c
+--- ctalk-0.0.33/ctpp/ccompat.c.orig	2007-09-14 21:00:05 +0200
++++ ctalk-0.0.33/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.32/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.32/ctpp/i_opt.c
---- ctalk-0.0.32/ctpp/i_opt.c.orig	2007-09-13 04:04:24 +0200
-+++ ctalk-0.0.32/ctpp/i_opt.c	2007-09-18 07:49:32 +0200
+Index: ctalk-0.0.33/ctpp/i_opt.c
+--- ctalk-0.0.33/ctpp/i_opt.c.orig	2007-09-13 04:04:24 +0200
++++ ctalk-0.0.33/ctpp/i_opt.c	2007-09-18 07:49:32 +0200
 @@ -30,6 +30,8 @@
  #include <stdlib.h>
  #include <string.h>
@@ -74,9 +74,9 @@ Index: ctalk-0.0.32/ctpp/i_opt.c
  #include "ctpp.h"
  
  extern char source_file[FILENAME_MAX];  /* Declared in rtinfo.c. */
-Index: ctalk-0.0.32/lib/rtinfo.c
---- ctalk-0.0.32/lib/rtinfo.c.orig	2007-09-12 11:06:44 +0200
-+++ ctalk-0.0.32/lib/rtinfo.c	2007-09-18 07:49:32 +0200
+Index: ctalk-0.0.33/lib/rtinfo.c
+--- ctalk-0.0.33/lib/rtinfo.c.orig	2007-09-12 11:06:44 +0200
++++ ctalk-0.0.33/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.32/lib/rtinfo.c
  extern int daylight;
  
  RT_INFO rtinfo;
-Index: ctalk-0.0.32/libctpp/lex.c
---- ctalk-0.0.32/libctpp/lex.c.orig	2007-09-13 04:04:26 +0200
-+++ ctalk-0.0.32/libctpp/lex.c	2007-09-18 07:49:32 +0200
+Index: ctalk-0.0.33/libctpp/lex.c
+--- ctalk-0.0.33/libctpp/lex.c.orig	2007-09-13 04:04:26 +0200
++++ ctalk-0.0.33/libctpp/lex.c	2007-09-18 07:49:32 +0200
 @@ -26,6 +26,8 @@
  #include <string.h>
  #include <ctype.h>
@@ -98,9 +98,9 @@ Index: ctalk-0.0.32/libctpp/lex.c
  #include "ctpp.h"
  #include "typeof.h"
  #include "prtinfo.h"
-Index: ctalk-0.0.32/src/Makefile.in
---- ctalk-0.0.32/src/Makefile.in.orig	2007-09-17 23:57:31 +0200
-+++ ctalk-0.0.32/src/Makefile.in	2007-09-18 07:54:46 +0200
+Index: ctalk-0.0.33/src/Makefile.in
+--- ctalk-0.0.33/src/Makefile.in.orig	2007-09-17 23:57:31 +0200
++++ ctalk-0.0.33/src/Makefile.in	2007-09-18 07:54:46 +0200
 @@ -122,7 +122,7 @@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@

ctalk/ctalk.spec

@@ -22,7 +22,7 @@
 ##
 
 #   package versions
-%define       V_ctalk 0.0.32a
+%define       V_ctalk 0.0.33a
 %define       V_ctpp  1.0.27
 
 #   package information
@@ -36,7 +36,7 @@ Class:        EVAL
 Group:        Language
 License:      GPL
 Version:      %{V_ctalk}
-Release:      20080101
+Release:      20080108
 
 #   list of sources
 Source0:      http://www.ctalklang.org/files/ctalk-%{V_ctalk}.tar.gz
@@ -73,14 +73,17 @@ AutoReqProv:  no
     %setup -q -c
     %setup -q -T -D -a 1
     %patch -p0
-    cp ctpp-*/install-sh ctalk-*/install-sh
-    chmod a+x ctalk-*/install-sh
+    for dir in ctpp-* ctalk-*; do
+        ( echo "#!/bin/sh"
+          echo "%{l_shtool} install \${1+\"\$@\"}"
+        ) >$dir/install-sh
+        chmod a+x $dir/install-sh
+    done
 
 %build
     ( cd ctalk-*
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
-      INSTALL="%{l_shtool} install -c" \
       ./configure \
           --prefix=%{l_prefix} \
           --mandir=%{l_prefix}/man \
@@ -91,7 +94,6 @@ AutoReqProv:  no
     ( cd ctpp-*
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
-      INSTALL="%{l_shtool} install -c" \
       ./configure \
           --prefix=%{l_prefix} \
           --mandir=%{l_prefix}/man \