commit jtools

22 May 2006

Hello community,

here is the log from the commit of package jtools
checked in at Tue May 23 01:10:26 CEST 2006.

--------

--- jtools/jtools.changes	2006-02-28 18:46:32.000000000 +0100
+++ jtools/jtools.changes	2006-05-22 21:50:00.000000000 +0200
@@ -1,0 +2,6 @@
+Mon May 22 21:47:13 CEST 2006 - schwab@suse.de
+
+- Use RPM_OPT_FLAGS.
+- Don't strip binaries.
+
+-------------------------------------------------------------------

New:
----
  jtools.return.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ jtools.spec ++++++
--- /var/tmp/diff_new_pack.oD9lvW/_old	2006-05-23 01:10:21.000000000 +0200
+++ /var/tmp/diff_new_pack.oD9lvW/_new	2006-05-23 01:10:21.000000000 +0200
@@ -18,10 +18,11 @@
 Autoreqprov:    on
 Provides:       locale(ja)
 Version:        1.0
-Release:        561
+Release:        570
 URL:            http://www.oreilly.com/people/authors/lunde/j_tools.html
 Source0:        jtools.bz2
 Patch0:         jtools.suse.patch
+Patch1:         jtools.return.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Ken Lunde's Japanese Code Manipulation Tools
 #Summary(ja): 
@@ -57,6 +58,7 @@
 %prep
 %setup0 -n jtools
 %patch0 -p1
+%patch1
 head -n 104 jconv.c > README.jconv
 head -n 46 jchar.c > README.jchar
 head -n 96 jcode.c > README.jcode
@@ -67,17 +69,14 @@
 CC=gcc
 for i in jconv jcode jchar jgrep
 do
-    CFLAGS="$RPM_OPT_FLAGS" ${CC} -o $i $i.c
+    ${CC} $RPM_OPT_FLAGS -o $i $i.c
 done
 
 %install
-if [ ! "x" = "x$RPM_BUILD_ROOT" ] ; then
-   install -d m755 $RPM_BUILD_ROOT
-fi
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 for i in jconv jcode jchar jgrep
 do
-    install -m755 -s $i $RPM_BUILD_ROOT/usr/bin/$i
+    install -m755 $i $RPM_BUILD_ROOT/usr/bin/$i
 done
 install -m755 ./cjkvconv.pl $RPM_BUILD_ROOT/usr/bin/cjkvconv
 
@@ -96,6 +95,9 @@
 /usr/bin/cjkvconv
 
 %changelog -n jtools
+* Mon May 22 2006 - schwab@suse.de
+- Use RPM_OPT_FLAGS.
+- Don't strip binaries.
 * Tue Feb 28 2006 - mfabian@suse.de
 - add "Provides: locale(ja)".
 * Wed Jan 25 2006 - mls@suse.de


++++++ jtools.return.patch ++++++
--- jchar.c
+++ jchar.c
@@ -46,8 +46,8 @@
 
 #ifdef THINK_C
 #include <console.h>
-#include <stdlib.h>
 #endif
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
--- jcode.c
+++ jcode.c
@@ -96,8 +96,8 @@
 
 #ifdef THINK_C
 #include <console.h>
-#include <stdlib.h>
 #endif
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -498,6 +498,8 @@
       strcpy(ko,DEFAULT_OKO);
       return DEFAULT_O;
     }
+    else
+      abort();
   }
 }
 
@@ -894,6 +896,8 @@
     return (data - ASCII_ZERO);
   else if (data >= 'A' && data <= 'F')
     return (data - 55);
+  else
+    abort();
 }
 
 int convert2code(int p1,int p2,int incode)
--- jconv.c
+++ jconv.c
@@ -104,8 +104,8 @@
 
 #ifdef THINK_C
 #include <console.h>
-#include <stdlib.h>
 #endif
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -516,6 +516,8 @@
       strcpy(extension,DEFAULT_RS);
       return DEFAULT_R;
     }
+    else
+      abort();
   }
 }
 
--- jgrep.c
+++ jgrep.c
@@ -119,8 +119,8 @@
 programs.
 */
 
-/* #include <console.h>
-#include <stdlib.h> */
+/* #include <console.h> */
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)