upgrading package: ctalk 0.0.25a -> 0.0.26a

ctalk/ctalk.patch

@@ -1,6 +1,6 @@
-Index: ctalk-0.0.25/ctpp/Makefile.in
---- ctalk-0.0.25/ctpp/Makefile.in.orig	2007-09-17 23:57:31 +0200
-+++ ctalk-0.0.25/ctpp/Makefile.in	2007-09-18 07:49:32 +0200
+Index: ctalk-0.0.26/ctpp/Makefile.in
+--- ctalk-0.0.26/ctpp/Makefile.in.orig	2007-09-17 23:57:31 +0200
++++ ctalk-0.0.26/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.25/ctpp/Makefile.in
  LIBTOOL = @LIBTOOL@
  LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@
  LIB_MINOR_VERSION = @LIB_MINOR_VERSION@
-Index: ctalk-0.0.25/ctpp/builtins.c
---- ctalk-0.0.25/ctpp/builtins.c.orig	2007-09-13 04:04:24 +0200
-+++ ctalk-0.0.25/ctpp/builtins.c	2007-09-18 07:49:32 +0200
+Index: ctalk-0.0.26/ctpp/builtins.c
+--- ctalk-0.0.26/ctpp/builtins.c.orig	2007-09-13 04:04:24 +0200
++++ ctalk-0.0.26/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.25/ctpp/builtins.c
 +#endif
    return FALSE;
  }
-Index: ctalk-0.0.25/ctpp/ccompat.c
---- ctalk-0.0.25/ctpp/ccompat.c.orig	2007-09-14 21:00:05 +0200
-+++ ctalk-0.0.25/ctpp/ccompat.c	2007-09-18 07:49:32 +0200
+Index: ctalk-0.0.26/ctpp/ccompat.c
+--- ctalk-0.0.26/ctpp/ccompat.c.orig	2007-09-14 21:00:05 +0200
++++ ctalk-0.0.26/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.25/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.25/ctpp/i_opt.c
---- ctalk-0.0.25/ctpp/i_opt.c.orig	2007-09-13 04:04:24 +0200
-+++ ctalk-0.0.25/ctpp/i_opt.c	2007-09-18 07:49:32 +0200
+Index: ctalk-0.0.26/ctpp/i_opt.c
+--- ctalk-0.0.26/ctpp/i_opt.c.orig	2007-09-13 04:04:24 +0200
++++ ctalk-0.0.26/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.25/ctpp/i_opt.c
  #include "ctpp.h"
  
  extern char source_file[FILENAME_MAX];  /* Declared in rtinfo.c. */
-Index: ctalk-0.0.25/lib/rtinfo.c
---- ctalk-0.0.25/lib/rtinfo.c.orig	2007-09-12 11:06:44 +0200
-+++ ctalk-0.0.25/lib/rtinfo.c	2007-09-18 07:49:32 +0200
+Index: ctalk-0.0.26/lib/rtinfo.c
+--- ctalk-0.0.26/lib/rtinfo.c.orig	2007-09-12 11:06:44 +0200
++++ ctalk-0.0.26/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.25/lib/rtinfo.c
  extern int daylight;
  
  RT_INFO rtinfo;
-Index: ctalk-0.0.25/libctpp/lex.c
---- ctalk-0.0.25/libctpp/lex.c.orig	2007-09-13 04:04:26 +0200
-+++ ctalk-0.0.25/libctpp/lex.c	2007-09-18 07:49:32 +0200
+Index: ctalk-0.0.26/libctpp/lex.c
+--- ctalk-0.0.26/libctpp/lex.c.orig	2007-09-13 04:04:26 +0200
++++ ctalk-0.0.26/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.25/libctpp/lex.c
  #include "ctpp.h"
  #include "typeof.h"
  #include "prtinfo.h"
-Index: ctalk-0.0.25/src/Makefile.in
---- ctalk-0.0.25/src/Makefile.in.orig	2007-09-17 23:57:31 +0200
-+++ ctalk-0.0.25/src/Makefile.in	2007-09-18 07:54:46 +0200
+Index: ctalk-0.0.26/src/Makefile.in
+--- ctalk-0.0.26/src/Makefile.in.orig	2007-09-17 23:57:31 +0200
++++ ctalk-0.0.26/src/Makefile.in	2007-09-18 07:54:46 +0200
 @@ -122,7 +122,7 @@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -110,9 +110,15 @@ Index: ctalk-0.0.25/src/Makefile.in
  LIBTOOL = @LIBTOOL@
  LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@
  LIB_MINOR_VERSION = @LIB_MINOR_VERSION@
+<<<<<<< ctalk.patch
+Index: ctpp-1.0.26/ctpp/Makefile.in
+--- ctpp-1.0.26/ctpp/Makefile.in.orig	2007-09-12 14:36:28 +0200
++++ ctpp-1.0.26/ctpp/Makefile.in	2007-09-18 07:49:32 +0200
+=======
 Index: ctpp-1.0.27/ctpp/Makefile.in
 --- ctpp-1.0.27/ctpp/Makefile.in.orig	2007-09-12 14:36:28 +0200
 +++ ctpp-1.0.27/ctpp/Makefile.in	2007-09-18 07:49:32 +0200
+>>>>>>> 1.25
 @@ -121,7 +121,7 @@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -122,9 +128,15 @@ Index: ctpp-1.0.27/ctpp/Makefile.in
  LIBTOOL = @LIBTOOL@
  LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@
  LIB_MINOR_VERSION = @LIB_MINOR_VERSION@
+<<<<<<< ctalk.patch
+Index: ctpp-1.0.26/ctpp/builtins.c
+--- ctpp-1.0.26/ctpp/builtins.c.orig	2007-09-04 06:14:05 +0200
++++ ctpp-1.0.26/ctpp/builtins.c	2007-09-18 07:49:32 +0200
+=======
 Index: ctpp-1.0.27/ctpp/builtins.c
 --- ctpp-1.0.27/ctpp/builtins.c.orig	2007-09-04 06:14:05 +0200
 +++ ctpp-1.0.27/ctpp/builtins.c	2007-09-18 07:49:32 +0200
+>>>>>>> 1.25
 @@ -80,11 +80,12 @@
     *  config file included above.  See the comments in 
     *  config/linux-gnu-x86.c
@@ -151,9 +163,15 @@ Index: ctpp-1.0.27/ctpp/builtins.c
 +#endif
    return FALSE;
  }
+<<<<<<< ctalk.patch
+Index: ctpp-1.0.26/ctpp/ccompat.c
+--- ctpp-1.0.26/ctpp/ccompat.c.orig	2007-09-04 06:14:05 +0200
++++ ctpp-1.0.26/ctpp/ccompat.c	2007-09-18 07:49:32 +0200
+=======
 Index: ctpp-1.0.27/ctpp/ccompat.c
 --- ctpp-1.0.27/ctpp/ccompat.c.orig	2007-09-04 06:14:05 +0200
 +++ ctpp-1.0.27/ctpp/ccompat.c	2007-09-18 07:49:32 +0200
+>>>>>>> 1.25
 @@ -53,8 +53,10 @@
  
  char cpp_subdir[FILENAME_MAX];
@@ -174,9 +192,15 @@ Index: ctpp-1.0.27/ctpp/ccompat.c
  
    /* Try to find out what the compiler target is.  It may not 
       be the same as the autoconf $host.
+<<<<<<< ctalk.patch
+Index: ctpp-1.0.26/ctpp/i_opt.c
+--- ctpp-1.0.26/ctpp/i_opt.c.orig	2007-08-27 03:18:27 +0200
++++ ctpp-1.0.26/ctpp/i_opt.c	2007-09-18 07:49:32 +0200
+=======
 Index: ctpp-1.0.27/ctpp/i_opt.c
 --- ctpp-1.0.27/ctpp/i_opt.c.orig	2007-08-27 03:18:27 +0200
 +++ ctpp-1.0.27/ctpp/i_opt.c	2007-09-18 07:49:32 +0200
+>>>>>>> 1.25
 @@ -30,6 +30,8 @@
  #include <stdlib.h>
  #include <string.h>
@@ -186,9 +210,15 @@ Index: ctpp-1.0.27/ctpp/i_opt.c
  #include "ctpp.h"
  
  extern char source_file[FILENAME_MAX];  /* Declared in rtinfo.c. */
+<<<<<<< ctalk.patch
+Index: ctpp-1.0.26/libctpp/lex.c
+--- ctpp-1.0.26/libctpp/lex.c.orig	2007-08-27 03:04:06 +0200
++++ ctpp-1.0.26/libctpp/lex.c	2007-09-18 07:49:32 +0200
+=======
 Index: ctpp-1.0.27/libctpp/lex.c
 --- ctpp-1.0.27/libctpp/lex.c.orig	2007-08-27 03:04:06 +0200
 +++ ctpp-1.0.27/libctpp/lex.c	2007-09-18 07:49:32 +0200
+>>>>>>> 1.25
 @@ -26,6 +26,8 @@
  #include <string.h>
  #include <ctype.h>

ctalk/ctalk.spec

@@ -23,7 +23,7 @@
 ##
 
 #   package versions
-%define       V_ctalk 0.0.25a
+%define       V_ctalk 0.0.26a
 %define       V_ctpp  1.0.27
 
 #   package information