rpms/FreeWnn/devel FreeWnn-1.1.1-a020-wnntouch.patch, 1.1, 1.2 FreeWnn-1.10-smpmake.patch, 1.1, 1.2 FreeWnn.spec, 1.3, 1.4 sources, 1.1, 1.2 FreeWnn-fPIC.patch, 1.1, NONE FreeWnn-jlib-js-arraybounds-80669.patch, 1.1, NONE FreeWnn-pod-searchdesc-args-110750.patch, 1.1, NONE

Jens Petersen (petersen) fedora-extras-commits at redhat.com
Fri Sep 22 07:48:43 UTC 2006 

Author: petersen

Update of /cvs/extras/rpms/FreeWnn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7117

Modified Files:
	FreeWnn-1.1.1-a020-wnntouch.patch FreeWnn-1.10-smpmake.patch 
	FreeWnn.spec sources 
Removed Files:
	FreeWnn-fPIC.patch FreeWnn-jlib-js-arraybounds-80669.patch 
	FreeWnn-pod-searchdesc-args-110750.patch 
Log Message:
- update to pl21
- set version to 1.1.1 to be consistent with upstream number
- bump epoch to 2
- update url and source location to sourceforge.jp
- FreeWnn-fPIC.patch, FreeWnn-jlib-js-arraybounds-80669.patch, and
  FreeWnn-pod-searchdesc-args-110750.patch no longer needed
- update FreeWnn-1.1.1-a020-wnntouch.patch and FreeWnn-1.10-smpmake.patch


FreeWnn-1.1.1-a020-wnntouch.patch:

Index: FreeWnn-1.1.1-a020-wnntouch.patch
===================================================================
RCS file: /cvs/extras/rpms/FreeWnn/devel/FreeWnn-1.1.1-a020-wnntouch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FreeWnn-1.1.1-a020-wnntouch.patch	13 Jun 2005 08:43:06 -0000	1.1
+++ FreeWnn-1.1.1-a020-wnntouch.patch	22 Sep 2006 07:48:42 -0000	1.2
@@ -1,33 +1,33 @@
---- FreeWnn-1.10-pl020/Wnn/pubdicplus/Makefile.in~	2002-05-28 01:33:51.000000000 +0900
-+++ FreeWnn-1.10-pl020/Wnn/pubdicplus/Makefile.in	2004-03-20 17:15:39.000000000 +0900
+--- FreeWnn-1.1.1-a021/Wnn/pubdicplus/Makefile.in~	2002-05-28 01:33:51.000000000 +0900
++++ FreeWnn-1.1.1-a021/Wnn/pubdicplus/Makefile.in	2004-03-20 17:15:39.000000000 +0900
 @@ -38,7 +38,7 @@
-        INCLUDES = -I$(TOP)
-            ATOD = $(WNNJUTILSRC)/atod
-            ATOF = $(WNNJUTILSRC)/atof
--       WNNTOUCH = $(WNNJUTILSRC)/wnntouch
-+       WNNTOUCH = echo Skipping
+        INCLUDES = -I$(top_builddir)
+            ATOD = $(WNNJUTILOBJ)/atod
+            ATOF = $(WNNJUTILOBJ)/atof
+-       WNNTOUCH = $(WNNJUTILOBJ)/wnntouch
++       WNNTOUCH = echo Skipping: $(WNNJUTILOBJ)/wnntouch
            HINSI = @HINSI_DATA@
         FZK_FLAG =
  
---- FreeWnn-1.10-pl020/Wnn/wnncons/dic/Makefile.in~	2001-08-14 22:43:21.000000000 +0900
-+++ FreeWnn-1.10-pl020/Wnn/wnncons/dic/Makefile.in	2004-03-20 17:18:35.000000000 +0900
+--- FreeWnn-1.1.1-a021/Wnn/wnncons/dic/Makefile.in~	2001-08-14 22:43:21.000000000 +0900
++++ FreeWnn-1.1.1-a021/Wnn/wnncons/dic/Makefile.in	2004-03-20 17:18:35.000000000 +0900
 @@ -36,7 +36,7 @@
  LOCAL_INSTFLAGS = -o $(WNNOWNER)
  
             ATOD = $(WNNJUTILSRC)/atod
 -       WNNTOUCH = $(WNNJUTILSRC)/wnntouch
-+       WNNTOUCH = echo Skipping
++       WNNTOUCH = echo Skipping $(WNNJUTILSRC)/wnntouch
            HINSI = @HINSI_DATA@
  
  LINKS = tankan2.u tankan3.u
---- FreeWnn-1.10-pl020/Contrib/dic/gerodic/Makefile.in~	2001-08-14 22:43:20.000000000 +0900
-+++ FreeWnn-1.10-pl020/Contrib/dic/gerodic/Makefile.in	2004-03-20 17:23:56.000000000 +0900
+--- FreeWnn-1.1.1-a021/Contrib/dic/gerodic/Makefile.in~	2001-08-14 22:43:20.000000000 +0900
++++ FreeWnn-1.1.1-a021/Contrib/dic/gerodic/Makefile.in	2004-03-20 17:23:56.000000000 +0900
 @@ -49,7 +49,7 @@
  ATOD=${WNNJUTILSRC}/atod
  
  #WNNTOUCH=${WNNBINDIR}/wnntouch
 -WNNTOUCH=${WNNJUTILSRC}/wnntouch
-+WNNTOUCH=echo Skipping
++WNNTOUCH=echo Skipping ${WNNJUTILSRC}/wnntouch
  
  #HINSI=${JWNNWNNDIR}/hinsi.data
  HINSI=${PUBDICPLUSSRC}/hinsi.data

FreeWnn-1.10-smpmake.patch:

Index: FreeWnn-1.10-smpmake.patch
===================================================================
RCS file: /cvs/extras/rpms/FreeWnn/devel/FreeWnn-1.10-smpmake.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FreeWnn-1.10-smpmake.patch	13 Jun 2005 08:43:06 -0000	1.1
+++ FreeWnn-1.10-smpmake.patch	22 Sep 2006 07:48:42 -0000	1.2
@@ -6,7 +6,7 @@
  
 -std.fzk: fzk.master-.c $(FZK_SRC)
 +%.fzk: fzk.master-.c $(FZK_SRC)
- 	$(CPP) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |$$)' | $(ATOF) -h $(HINSI) $@
+ 	$(CPP) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
  
 -full.fzk: $(FZK_SRC)
 -	$(MAKE) FZK_FLAG=-DKANSAI std.fzk


Index: FreeWnn.spec
===================================================================
RCS file: /cvs/extras/rpms/FreeWnn/devel/FreeWnn.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FreeWnn.spec	2 Mar 2006 07:58:18 -0000	1.3
+++ FreeWnn.spec	22 Sep 2006 07:48:42 -0000	1.4
@@ -1,16 +1,15 @@
-%define patchlevel 020
-%define upstreamversion 1.1.1
-%define tarballversion 1.10
+%define patchlevel 021
+%define majorversion 1.1.1
 
 Summary: A Japanese character set conversion system.
 Name: FreeWnn
-Version: %{tarballversion}pl%{patchlevel}
-Release: 7%{?dist}
-Epoch: 1
+Version: %{majorversion}_a%{patchlevel}
+Release: 1%{?dist}
+Epoch: 2
 Group: Applications/System
 License: Distributable
-URL: http://www.freewnn.org/
-Source0: ftp://ftp.freewnn.org/pub/FreeWnn/alpha/%{name}-%{upstreamversion}-a%{patchlevel}.tar.bz2
+URL: http://freewnn.sourceforge.jp/
+Source0: http://dl.sourceforge.jp/freewnn/17724/%{name}-%{majorversion}-a%{patchlevel}.tar.bz2
 Source1: FreeWnn.init
 Patch0: FreeWnn-fsstnd.patch
 Patch1: FreeWnn-ja-a017.patch
@@ -20,16 +19,13 @@
 #Patch5: FreeWnn-ia64.patch
 #Patch6: FreeWnn-shared.patch
 Patch7: FreeWnn-reuid.patch
-Patch8: FreeWnn-fPIC.patch
 Patch9: FreeWnn-nosbit.patch
 #Patch10: FreeWnn-dirlimit.patch
 #Patch11: FreeWnn-nonstrip.patch
 #Patch12: FreeWnn-1.1.1-unix.patch
-Patch13: FreeWnn-jlib-js-arraybounds-80669.patch
 Patch14: FreeWnn-1.1.1-fork-61907.patch
 #Patch15: FreeWnn-1.1.1-a017-jutils-shlib-89068.patch
 Patch16: FreeWnn-1.1.1-a020-wnntouch.patch
-Patch17: FreeWnn-pod-searchdesc-args-110750.patch
 Patch18: FreeWnn-1.10-smpmake.patch
 Patch19: FreeWnn-1.10-pl020-jserver-64bit-128387.patch
 Prereq: /sbin/chkconfig, grep, textutils, shadow-utils
@@ -67,7 +63,7 @@
 %define wnndir %{_localstatedir}/lib/wnn
 
 %prep
-%setup -q -n %{name}-%{tarballversion}-pl%{patchlevel}
+%setup -q -n %{name}-%{majorversion}-a%{patchlevel}
 %patch0 -p2
 %patch1 -p2
 %patch2 -p1
@@ -75,16 +71,13 @@
 #%%patch5 -p2 -b .ia64
 #%%patch6 -p2 -b .shlib
 %patch7 -p1 -b .reuid
-%patch8 -p1 -b .fPIC
 %patch9 -p1 -b .nosbit
 #%%patch10 -p2 -b .dl
 #%%patch11 -p2 -b .nonstrip
 #%%patch12 -p1 -b .unix
-%patch13 -p2 -b .bounds
 %patch14 -p1 -b .fork
 #%%patch15 -p2 -b .static
 %patch16 -p1 -b .wnntouch
-%patch17 -p1 -b .args
 %patch18 -p1 -b .smpmake
 %patch19 -p1 -b .64bit
 
@@ -242,6 +235,15 @@
 %attr(755,root,root) %{_libdir}/libwnn.so.0.0.0
 
 %changelog
+* Fri Sep 22 2006 Jens Petersen <petersen at redhat.com> - 2:1.1.1_a021-1
+- update to pl21
+- set version to 1.1.1 to be consistent with upstream number
+- bump epoch to 2
+- update url and source location to sourceforge.jp
+- FreeWnn-fPIC.patch, FreeWnn-jlib-js-arraybounds-80669.patch, and
+  FreeWnn-pod-searchdesc-args-110750.patch no longer needed
+- update FreeWnn-1.1.1-a020-wnntouch.patch and FreeWnn-1.10-smpmake.patch
+
 * Thu Mar  2 2006 Jens Petersen <petersen at redhat.com> - 1:1.10pl020-7
 - rebuild for FE5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/FreeWnn/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jun 2005 08:43:06 -0000	1.1
+++ sources	22 Sep 2006 07:48:42 -0000	1.2
@@ -1 +1 @@
-c00549415cdb08c1f35240dccf8dab20  FreeWnn-1.1.1-a020.tar.bz2
+7e15ab385932d58e3743400d303a05e6  FreeWnn-1.1.1-a021.tar.bz2


--- FreeWnn-fPIC.patch DELETED ---


--- FreeWnn-jlib-js-arraybounds-80669.patch DELETED ---


--- FreeWnn-pod-searchdesc-args-110750.patch DELETED ---

More information about the scm-commits mailing list