rpm/fwnn
SHA256
1
0
Fork 0
forked from pool/fwnn
Code Pull Requests Activity

Accepting request 682983 from home:Mitsutoshi:branches:M17N

Browse Source 
- Update to FreeWnn-1.1.1-a023.1:
  * Deal with "Reproducible Buids".
    See <https://osdn.net/projects/freewnn/ticket/38482>.
- Remove FreeWnn-trad_cpp.patch: doesn't seem to need. 
- Added systemd support: Replaced sysv init files by systemd
  service files.
  [bsc#1116014,fwnn.service,fcwnn.service,fkwnn.service,
   ftwnn.service]

OBS-URL: https://build.opensuse.org/request/show/682983
OBS-URL: https://build.opensuse.org/package/show/M17N/fwnn?expand=0&rev=25
This commit is contained in:
Mitsutoshi NAKANO 2019-03-09 08:37:15 +00:00 committed by Git OBS Bridge
parent d2f69015eb
commit 88f68ee90c
3 changed files with 2 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
FreeWnn-trad_cpp.patch
View File

@ -1,60 +0,0 @@
Index: FreeWnn-1.1.1-a023/Wnn/pubdicplus/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/pubdicplus/Makefile.in
+++ FreeWnn-1.1.1-a023/Wnn/pubdicplus/Makefile.in
@@ -325,7 +325,7 @@ fzk.master-.c: fzk.master
$(LN) $? $@
std.fsrc: fzk.master-.c $(FZK_SRC)
- $(FZK_PP) fzk.master-.c > $@
+ $(CPP) -traditional-cpp $(FZK_FLAGS) fzk.master-.c > $@
full.fsrc: fzk.master-.c $(FZK_SRC)
$(FZK_PP) -DKANSAI fzk.master-.c > $@
Index: FreeWnn-1.1.1-a023/cWnn/cdic/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/cWnn/cdic/Makefile.in
+++ FreeWnn-1.1.1-a023/cWnn/cdic/Makefile.in
@@ -64,10 +64,10 @@ all:: $(ALLTGT)
$(DICS): $(HINSI)
$(FULL):: $(FZK_SRCS) con.master-.c
- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
+ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
$(FULLR):: $(FZK_SRCS) con.masterR-.c
- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
+ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
# To avoid circular dependency, we don't use 'con.master?.c'
con.master-.c: con.master
Index: FreeWnn-1.1.1-a023/cWnn/tdic/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/cWnn/tdic/Makefile.in
+++ FreeWnn-1.1.1-a023/cWnn/tdic/Makefile.in
@@ -64,10 +64,10 @@ all:: $(ALLTGT)
$(DICS): $(HINSI)
$(FULL):: $(FZK_SRCS) con.master-.c
- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
+ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
$(FULLR):: $(FZK_SRCS) con.masterR-.c
- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
+ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) con.masterR-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
# To avoid circular dependency, we don't use 'con.master?.c'
con.master-.c: con.master
Index: FreeWnn-1.1.1-a023/kWnn/kdic/Makefile.in
===================================================================
--- FreeWnn-1.1.1-a023.orig/kWnn/kdic/Makefile.in
+++ FreeWnn-1.1.1-a023/kWnn/kdic/Makefile.in
@@ -62,7 +62,7 @@ all:: $(ALLTGT)
$(DICS): $(HINSI)
$(FULL):: $(FZK_SRCS) fzk.master-.c
- $(FZK_PP) -I$(srcdir) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
+ $(CPP) -traditional-cpp -I$(srcdir) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
# To avoid circular dependency, we don't use 'fzk.master.c'
fzk.master-.c: fzk.master

4
fwnn.changes
View File

@ -1,10 +1,10 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Mar 9 06:51:50 UTC 2019 - bkbin005@rinku.zaq.ne.jp Sat Mar 9 07:51:43 UTC 2019 - bkbin005@rinku.zaq.ne.jp
- Update to FreeWnn-1.1.1-a023.1: - Update to FreeWnn-1.1.1-a023.1:
* Deal with "Reproducible Buids". * Deal with "Reproducible Buids".
See <https://osdn.net/projects/freewnn/ticket/38482>. See <https://osdn.net/projects/freewnn/ticket/38482>.
- Disable FreeWnn-trad_cpp.patch: doesn't seem to need. - Remove FreeWnn-trad_cpp.patch: doesn't seem to need.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 7 13:22:01 UTC 2019 - josef.moellers@suse.com Thu Mar 7 13:22:01 UTC 2019 - josef.moellers@suse.com

2
fwnn.spec
View File

@ -43,7 +43,6 @@ Patch1: FreeWnn-ja.patch
Patch2: FreeWnn-noroot.patch Patch2: FreeWnn-noroot.patch
Patch7: FreeWnn-s390x.patch Patch7: FreeWnn-s390x.patch
Patch8: FreeWnn-warnings.patch Patch8: FreeWnn-warnings.patch
##Patch14: FreeWnn-trad_cpp.patch # doesn't seem to need
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: tcpd-devel BuildRequires: tcpd-devel
@ -209,7 +208,6 @@ client programs that use the Korean Input System, Free kWnn.
%patch2 -p1 %patch2 -p1
%patch7 -p2 -b .s390x %patch7 -p2 -b .s390x
%patch8 %patch8
# %%patch14 -p1
#%%setup -b 1 -n Xsi # add include-files for Xwnmo #%%setup -b 1 -n Xsi # add include-files for Xwnmo
# SuSE setlocale patch, try to set LC_CTYPE if LC_ALL fails (Xwnmo) and # SuSE setlocale patch, try to set LC_CTYPE if LC_ALL fails (Xwnmo) and
#...................................................................... #......................................................................