September 2015 - openSUSE Commits - openSUSE Mailing Lists

commit tesseract-ocr for openSUSE:Factory
by root＠hilbert.suse.de 19 Sep '15

19 Sep '15

Hello community, here is the log from the commit of package tesseract-ocr for openSUSE:Factory checked in at 2015-09-19 06:55:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tesseract-ocr (Old) and /work/SRC/openSUSE:Factory/.tesseract-ocr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tesseract-ocr" Changes: -------- --- /work/SRC/openSUSE:Factory/tesseract-ocr/tesseract-ocr.changes 2015-09-02 00:36:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tesseract-ocr.new/tesseract-ocr.changes 2015-09-19 06:55:04.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 14 18:22:13 UTC 2015 - asterios.dramis(a)gmail.com + +- Fix Recommends: entry to tesseract-ocr-traineddata-american. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tesseract-ocr.spec ++++++ --- /var/tmp/diff_new_pack.oInRqt/_old 2015-09-19 06:55:05.000000000 +0200 +++ /var/tmp/diff_new_pack.oInRqt/_new 2015-09-19 06:55:05.000000000 +0200 @@ -31,7 +31,7 @@ BuildRequires: gcc-c++ BuildRequires: liblept-devel BuildRequires: pkg-config -Recommends: tesseract-traineddata-american +Recommends: tesseract-ocr-traineddata-american BuildRoot: %{_tmppath}/%{name}-%{version}-build %description

1 0

commit fwnn for openSUSE:Factory
by root＠hilbert.suse.de 19 Sep '15

19 Sep '15

Hello community, here is the log from the commit of package fwnn for openSUSE:Factory checked in at 2015-09-19 06:54:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fwnn (Old) and /work/SRC/openSUSE:Factory/.fwnn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fwnn" Changes: -------- --- /work/SRC/openSUSE:Factory/fwnn/fwnn.changes 2013-08-22 10:53:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fwnn.new/fwnn.changes 2015-09-19 06:55:00.000000000 +0200 @@ -1,0 +2,30 @@ +Wed Sep 16 10:11:56 UTC 2015 - werner(a)suse.de + +- Some cleanups like + + use the same owner for /var/lib/wnn as the package canna does + + mark configuration files as configuration files + + avoid warning due missed header files + +------------------------------------------------------------------- +Sat Sep 12 08:31:21 UTC 2015 - i(a)marguerite.su + +- update to 1.1.1-a023 + * Merge modificaion used in OpenSUSE packages by new member, + Mitsutoshi NAKANO. Added explicit function prototype and + cast in many places, so we reduced unpredictable effect + on 64bit environment. + * As a consequence of this change, #define of WNN_CREATE / + WNN_NO_CREATE in jl_dic_create() is also changed. We + believe no change is needed for client build, but please + report if you have problems. + * Exit status of jserver changed on receiving some signals + (ex. SIGTERM). (Not well documented.) + * Fixed problem for parallel build (ex. make -jXX) on pubdic+. +- drop patch: FreeWnn-sighandler.patch, upstreamed +- drop patch: FreeWnn-include.patch, upstreamed +- drop patch: FreeWnn-prototypes.patch, upstreamed +- drop patch: FreeWnn-prototypes_msg.patch, upstreamed +- drop patch: FreeWnn-1.1.1-a022.dif, upstreamed +- drop patch: FreeWnn-prototypes_3.patch, upstreamed + +------------------------------------------------------------------- Old: ---- FreeWnn-1.1.1-a022.dif FreeWnn-1.1.1-a022.tar.bz2 FreeWnn-include.patch FreeWnn-prototypes.patch FreeWnn-prototypes_3.patch FreeWnn-prototypes_msg.patch FreeWnn-sighandler.patch New: ---- FreeWnn-1.1.1-a023.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fwnn.spec ++++++ ++++ 806 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/fwnn/fwnn.spec ++++ and /work/SRC/openSUSE:Factory/.fwnn.new/fwnn.spec ++++++ FreeWnn-ja.patch ++++++ --- /var/tmp/diff_new_pack.EzZShK/_old 2015-09-19 06:55:01.000000000 +0200 +++ /var/tmp/diff_new_pack.EzZShK/_new 2015-09-19 06:55:01.000000000 +0200 @@ -1,6 +1,8 @@ ---- FreeWnn-1.1.1-a022.orig/Wnn/etc/msg.c 2005-04-11 00:26:37.000000000 +0900 -+++ FreeWnn-1.1.1-a022/Wnn/etc/msg.c 2013-08-06 12:27:33.133572652 +0900 -@@ -412,12 +412,12 @@ +Index: FreeWnn-1.1.1-a023/Wnn/etc/msg.c +=================================================================== +--- FreeWnn-1.1.1-a023.orig/Wnn/etc/msg.c ++++ FreeWnn-1.1.1-a023/Wnn/etc/msg.c +@@ -412,12 +412,12 @@ main () { struct msg_cat *cd; @@ -16,8 +18,10 @@ printf (msg_get (cd, 100, "message not found\n", "zh_CN"), "abc"); } #endif /* not_use */ ---- FreeWnn-1.1.1-a022.orig/Wnn/include/jd_sock.h 2005-04-11 00:26:37.000000000 +0900 -+++ FreeWnn-1.1.1-a022/Wnn/include/jd_sock.h 2013-08-06 11:47:16.078413575 +0900 +Index: FreeWnn-1.1.1-a023/Wnn/include/jd_sock.h +=================================================================== +--- FreeWnn-1.1.1-a023.orig/Wnn/include/jd_sock.h ++++ FreeWnn-1.1.1-a023/Wnn/include/jd_sock.h @@ -57,7 +57,7 @@ #ifdef JAPANESE /* Japanese */ # define WNN_PORT_IN (0x5701) @@ -27,7 +31,7 @@ # define SERVERNAME "wnn4" # define MESSAGE_FILE "jserver.msg" #else /* JAPANESE */ -@@ -88,7 +88,7 @@ +@@ -88,7 +88,7 @@ static char *sockname = "/tmp/kd_sockV4" # define WNN_PORT_IN (0x5701) static char *sockname = "/tmp/jd_sockV4"; /* for jserver */ @@ -36,32 +40,38 @@ # define SERVERNAME "wnn4" # define MESSAGE_FILE "jserver.msg" #endif /* KOREAN */ ---- FreeWnn-1.1.1-a022.orig/Wnn/include/jslib.h 2008-10-26 19:27:53.000000000 +0900 -+++ FreeWnn-1.1.1-a022/Wnn/include/jslib.h 2013-08-06 11:49:04.110854622 +0900 -@@ -400,8 +400,8 @@ +Index: FreeWnn-1.1.1-a023/Wnn/include/jslib.h +=================================================================== +--- FreeWnn-1.1.1-a023.orig/Wnn/include/jslib.h ++++ FreeWnn-1.1.1-a023/Wnn/include/jslib.h +@@ -412,8 +412,8 @@ struct wnn_file_head /* JSLIB function declaration */ -#define js_open(server, timeout) js_open_lang(server, "ja_JP", timeout) -#define js_connect(server,env_name) js_connect_lang(server, env_name, "ja_JP") -+#define js_open(server, timeout) js_open_lang((server), "ja", (timeout)) -+#define js_connect(server,env_name) js_connect_lang((server), (env_name), "ja") ++#define js_open(server, timeout) js_open_lang(server, "ja", timeout) ++#define js_connect(server,env_name) js_connect_lang(server, env_name, "ja") - #ifndef FRWNN_PARAMS - /* ---- FreeWnn-1.1.1-a022.orig/Wnn/include/msg.h 2005-04-11 00:26:37.000000000 +0900 -+++ FreeWnn-1.1.1-a022/Wnn/include/msg.h 2013-08-06 12:12:08.301743383 +0900 -@@ -62,7 +62,7 @@ + + extern WNN_JSERVER_ID *js_open_lang FRWNN_PARAMS((const register char *server, const register char *lang, register int timeout)); +Index: FreeWnn-1.1.1-a023/Wnn/include/msg.h +=================================================================== +--- FreeWnn-1.1.1-a023.orig/Wnn/include/msg.h ++++ FreeWnn-1.1.1-a023/Wnn/include/msg.h +@@ -62,7 +62,7 @@ struct msg_cat /* #define DEF_LANG "C" */ -#define DEF_LANG "ja_JP" +#define DEF_LANG "ja" - extern struct msg_cat *msg_open (); - extern char *msg_get (); ---- FreeWnn-1.1.1-a022.orig/Wnn/include/wnn_config.h 2005-04-11 00:26:37.000000000 +0900 -+++ FreeWnn-1.1.1-a022/Wnn/include/wnn_config.h 2013-08-06 12:01:00.836647352 +0900 + #if __STDC__ + #define FRWNN_PARAMS(paramlist) paramlist +Index: FreeWnn-1.1.1-a023/Wnn/include/wnn_config.h +=================================================================== +--- FreeWnn-1.1.1-a023.orig/Wnn/include/wnn_config.h ++++ FreeWnn-1.1.1-a023/Wnn/include/wnn_config.h @@ -44,7 +44,7 @@ #define WNN_CSERVER_ENV "CSERVER" #define WNN_KSERVER_ENV "KSERVER" @@ -98,8 +108,10 @@ #endif /* HINSIDATA_FILE */ #define USR_DIC_DIR_VAR "@USR" ---- FreeWnn-1.1.1-a022.orig/Wnn/jd/serverdefs 2001-06-15 02:55:32.000000000 +0900 -+++ FreeWnn-1.1.1-a022/Wnn/jd/serverdefs 2013-08-06 12:01:50.642348650 +0900 +Index: FreeWnn-1.1.1-a023/Wnn/jd/serverdefs +=================================================================== +--- FreeWnn-1.1.1-a023.orig/Wnn/jd/serverdefs ++++ FreeWnn-1.1.1-a023/Wnn/jd/serverdefs @@ -30,7 +30,7 @@ ; @@ -109,9 +121,11 @@ japanese jserver /tmp/jd_sockV4 wnn4 22273 nihongo jserver /tmp/jd_sockV4 wnn4 22273 zh_CN cserver /tmp/cd_sockV4 wnn4_Cn 22289 ---- FreeWnn-1.1.1-a022.orig/Wnn/jlib/jl.c 2005-04-11 00:26:37.000000000 +0900 -+++ FreeWnn-1.1.1-a022/Wnn/jlib/jl.c 2013-08-06 12:02:48.422128059 +0900 -@@ -456,7 +456,7 @@ +Index: FreeWnn-1.1.1-a023/Wnn/jlib/jl.c +=================================================================== +--- FreeWnn-1.1.1-a023.orig/Wnn/jlib/jl.c ++++ FreeWnn-1.1.1-a023/Wnn/jlib/jl.c +@@ -460,7 +460,7 @@ jl_connect_lang (env_n, server_n, lang, if (!lang || !*lang) { /* Sorry! Default is Japanese. :-) */ ++++++ FreeWnn-noroot.patch ++++++ --- /var/tmp/diff_new_pack.EzZShK/_old 2015-09-19 06:55:01.000000000 +0200 +++ /var/tmp/diff_new_pack.EzZShK/_new 2015-09-19 06:55:01.000000000 +0200 @@ -1,6 +1,8 @@ ---- FreeWnn-1.1.1-a022.orig/Contrib/dic/gerodic/Makefile.in 2006-05-29 01:37:02.000000000 +0900 -+++ FreeWnn-1.1.1-a022/Contrib/dic/gerodic/Makefile.in 2013-08-06 15:15:41.127790480 +0900 -@@ -70,9 +70,7 @@ +Index: FreeWnn-1.1.1-a023/Contrib/dic/gerodic/Makefile.in +=================================================================== +--- FreeWnn-1.1.1-a023.orig/Contrib/dic/gerodic/Makefile.in ++++ FreeWnn-1.1.1-a023/Contrib/dic/gerodic/Makefile.in +@@ -70,9 +70,7 @@ $(OBJ): $(SRC) install:: ${OBJ} @if [ -d $(DESTDIR)$(GERODIR) ]; then set +x; \ else (set -x; $(MKDIRHIER) $(DESTDIR)$(GERODIR)); fi @@ -11,9 +13,11 @@ clean:: $(RM) ${OBJ} ---- FreeWnn-1.1.1-a022.orig/Wnn/jserver/Makefile.in 2010-07-11 19:18:17.000000000 +0900 -+++ FreeWnn-1.1.1-a022/Wnn/jserver/Makefile.in 2013-08-06 15:18:17.033652766 +0900 -@@ -36,7 +36,7 @@ +Index: FreeWnn-1.1.1-a023/Wnn/jserver/Makefile.in +=================================================================== +--- FreeWnn-1.1.1-a023.orig/Wnn/jserver/Makefile.in ++++ FreeWnn-1.1.1-a023/Wnn/jserver/Makefile.in +@@ -36,7 +36,7 @@ include @top_builddir@/makerule.mk top_builddir = @top_builddir@ INSTALL = @INSTALL@ $(INSTALLFLAGS) @@ -22,9 +26,20 @@ JSERVERDEFINES = -DJSERVER -DWRITE_CHECK INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir) -I$(srcdir) ---- FreeWnn-1.1.1-a022.orig/Wnn/jutil/Makefile.in 2011-04-18 01:29:50.000000000 +0900 -+++ FreeWnn-1.1.1-a022/Wnn/jutil/Makefile.in 2013-08-06 15:20:07.397700941 +0900 -@@ -37,7 +37,7 @@ +@@ -104,7 +104,7 @@ instserver:: install + install:: jserver + @if [ -d $(DESTDIR)$(JWNNSBINDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNSBINDIR)); fi +- $(LT_INSTALL) $(INSTPGMFLAGS) $(INSTUIDFLAGS) $(LOCAL_INSTFLAGS) jserver $(DESTDIR)$(JWNNSBINDIR)/`echo jserver | sed '$(transform)'` ++ $(LT_INSTALL) $(INSTPGMFLAGS) $(INSTBINFLAGS) $(LOCAL_INSTFLAGS) jserver $(DESTDIR)$(JWNNSBINDIR)/`echo jserver | sed '$(transform)'` + + $(OBJ0) : $(SRC0) + $(CC) -c $(CFLAGS) $(SERVERINITDEF) $(SOLINGERDEFS) $(srcdir)/`basename $@ .o`.c +Index: FreeWnn-1.1.1-a023/Wnn/jutil/Makefile.in +=================================================================== +--- FreeWnn-1.1.1-a023.orig/Wnn/jutil/Makefile.in ++++ FreeWnn-1.1.1-a023/Wnn/jutil/Makefile.in +@@ -37,7 +37,7 @@ top_builddir = @top_builddir@ INSTALL = @INSTALL@ $(INSTALLFLAGS) LT_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) LT_LD = $(LIBTOOL) --mode=link $(CCLINK) @@ -33,9 +48,11 @@ INCLUDES = -I$(top_builddir) @EXTWNNJINC@ -I$(WNNINCLUDESRC) DEFINES = $(WNNDEFINES) $(WNNLANGDEF) ---- FreeWnn-1.1.1-a022.orig/Wnn/pubdicplus/Makefile.in 2010-02-23 02:06:54.000000000 +0900 -+++ FreeWnn-1.1.1-a022/Wnn/pubdicplus/Makefile.in 2013-08-06 15:24:05.010279338 +0900 -@@ -35,7 +35,7 @@ +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 +@@ -35,7 +35,7 @@ top_builddir = @top_builddir@ WNNJUTILOBJ = $(top_builddir)/Wnn/jutil INSTALL = @INSTALL@ $(INSTALLFLAGS) @@ -44,7 +61,7 @@ INCLUDES = -I$(top_builddir) ATOD = $(WNNJUTILOBJ)/atod -@@ -377,8 +377,7 @@ +@@ -281,8 +281,7 @@ instserver:: install install:: @case '${MFLAGS}' in *[i]*) set +e;; esac; @for i in $(JWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \ @@ -54,9 +71,11 @@ done install:: $(DIC) ---- FreeWnn-1.1.1-a022.orig/Wnn/wnncons/dic/Makefile.in 2001-08-14 22:43:21.000000000 +0900 -+++ FreeWnn-1.1.1-a022/Wnn/wnncons/dic/Makefile.in 2013-08-06 15:36:30.150639065 +0900 -@@ -33,7 +33,7 @@ +Index: FreeWnn-1.1.1-a023/Wnn/wnncons/dic/Makefile.in +=================================================================== +--- FreeWnn-1.1.1-a023.orig/Wnn/wnncons/dic/Makefile.in ++++ FreeWnn-1.1.1-a023/Wnn/wnncons/dic/Makefile.in +@@ -33,7 +33,7 @@ include @top_srcdir@/makerule.mk top_builddir = ../../.. INSTALL = @INSTALL@ $(INSTALLFLAGS) @@ -65,7 +84,16 @@ ATOD = $(WNNJUTILSRC)/atod WNNTOUCH = $(WNNJUTILSRC)/wnntouch -@@ -86,7 +86,7 @@ +@@ -75,7 +75,7 @@ install:: + @case '${MFLAGS}' in *[i]*) set +e;; esac; + @for i in $(JWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \ + set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i; \ +- chown $(WNNOWNER) $(DESTDIR)$$i); fi \ ++ ); fi \ + done + + install:: $(DICS) +@@ -86,7 +86,7 @@ install:: $(DICS) set +x; \ else (set -x; \ $(INSTALL) $(INSTDATFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(JWNNWNNCONSDICDIR); \ @@ -74,9 +102,11 @@ done depend:: ---- FreeWnn-1.1.1-a022.orig/Xwnmo/xjutil/Makefile.in 2001-08-14 22:43:21.000000000 +0900 -+++ FreeWnn-1.1.1-a022/Xwnmo/xjutil/Makefile.in 2013-08-06 15:39:43.115076499 +0900 -@@ -26,7 +26,7 @@ +Index: FreeWnn-1.1.1-a023/Xwnmo/xjutil/Makefile.in +=================================================================== +--- FreeWnn-1.1.1-a023.orig/Xwnmo/xjutil/Makefile.in ++++ FreeWnn-1.1.1-a023/Xwnmo/xjutil/Makefile.in +@@ -26,7 +26,7 @@ include @top_srcdir@/makerule.mk top_builddir = ../.. INSTALL = @INSTALL@ $(INSTALLFLAGS) @@ -85,9 +115,11 @@ INCLUDES = -I. $(XWNMOINCLUDES) -I$(XWNMOSRC) ---- FreeWnn-1.1.1-a022.orig/Xwnmo/xwnmo/Makefile.in 2001-08-14 22:43:21.000000000 +0900 -+++ FreeWnn-1.1.1-a022/Xwnmo/xwnmo/Makefile.in 2013-08-06 15:40:43.929300312 +0900 -@@ -26,7 +26,7 @@ +Index: FreeWnn-1.1.1-a023/Xwnmo/xwnmo/Makefile.in +=================================================================== +--- FreeWnn-1.1.1-a023.orig/Xwnmo/xwnmo/Makefile.in ++++ FreeWnn-1.1.1-a023/Xwnmo/xwnmo/Makefile.in +@@ -26,7 +26,7 @@ include @top_srcdir@/makerule.mk top_builddir = ../.. INSTALL = @INSTALL@ $(INSTALLFLAGS) @@ -96,9 +128,11 @@ INCLUDES = $(XWNMOINCLUDES) ---- FreeWnn-1.1.1-a022.orig/cWnn/cdic/Makefile.in 2010-02-23 02:06:54.000000000 +0900 -+++ FreeWnn-1.1.1-a022/cWnn/cdic/Makefile.in 2013-08-06 15:44:21.202520151 +0900 -@@ -32,7 +32,7 @@ +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 +@@ -32,7 +32,7 @@ top_builddir = @top_builddir@ CWNNJUTILOBJ = $(top_builddir)/cWnn/jutil INSTALL = @INSTALL@ $(INSTALLFLAGS) @@ -107,7 +141,7 @@ ATOD = $(CWNNJUTILOBJ)/catod ATOF = $(CWNNJUTILOBJ)/catof -@@ -86,8 +86,7 @@ +@@ -86,8 +86,7 @@ instserver:: install install:: @case '${MFLAGS}' in *[i]*) set +e;; esac; @for i in $(CWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \ @@ -117,20 +151,24 @@ done install:: $(ALLTGT) ---- FreeWnn-1.1.1-a022.orig/cWnn/jserver/Makefile.in 2010-07-11 19:18:17.000000000 +0900 -+++ FreeWnn-1.1.1-a022/cWnn/jserver/Makefile.in 2013-08-06 15:46:36.258366587 +0900 -@@ -38,7 +38,7 @@ +Index: FreeWnn-1.1.1-a023/cWnn/jserver/Makefile.in +=================================================================== +--- FreeWnn-1.1.1-a023.orig/cWnn/jserver/Makefile.in ++++ FreeWnn-1.1.1-a023/cWnn/jserver/Makefile.in +@@ -39,7 +39,7 @@ INSTALL = @INSTALL@ $(INSTALLFLAGS) JSERVERDEFINES = -DJSERVER -DWRITE_CHECK - INCLUDES = -I$(CWNNINCLUDESRC) -I$(top_builddir) + INCLUDES = -I$(CWNNINCLUDESRC) -I$(top_builddir) -I$(srcdir) DEFINES = $(CWNNDEFINES) $(JSERVERDEFINES) $(WNNTERM) $(CWNNLANGDEF) -LOCAL_INSTFLAGS = $(INSTUIDFLAGS) -o $(WNNOWNER) +LOCAL_INSTFLAGS = SERVERINITDEF = -DSERVER_INIT_FILE=\"/$(CWNNLANG)/cserverrc\" HINSIDEFINE = -DHINSIDATA_FILE=\"/$(CWNNLANG)/cixing.data\" TSERVERINITDEF = -DSERVER_INIT_FILE=\"/$(TWNNLANG)/tserverrc\" ---- FreeWnn-1.1.1-a022.orig/cWnn/jutil/Makefile.in 2011-04-18 01:29:50.000000000 +0900 -+++ FreeWnn-1.1.1-a022/cWnn/jutil/Makefile.in 2013-08-06 15:48:15.404717460 +0900 -@@ -36,7 +36,7 @@ +Index: FreeWnn-1.1.1-a023/cWnn/jutil/Makefile.in +=================================================================== +--- FreeWnn-1.1.1-a023.orig/cWnn/jutil/Makefile.in ++++ FreeWnn-1.1.1-a023/cWnn/jutil/Makefile.in +@@ -36,7 +36,7 @@ top_builddir = @top_builddir@ INSTALL = @INSTALL@ $(INSTALLFLAGS) LT_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) LT_LD = $(LIBTOOL) --mode=link $(CCLINK) @@ -139,9 +177,11 @@ INCLUDES = -I$(top_builddir) @EXTCWNNJINC@ -I$(CWNNINCLUDESRC) DEFINES = $(CWNNDEFINES) $(CWNNLANGDEF) ---- FreeWnn-1.1.1-a022.orig/cWnn/tdic/Makefile.in 2010-02-23 02:06:54.000000000 +0900 -+++ FreeWnn-1.1.1-a022/cWnn/tdic/Makefile.in 2013-08-06 15:50:08.039375445 +0900 -@@ -32,7 +32,7 @@ +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 +@@ -32,7 +32,7 @@ top_builddir = @top_builddir@ CWNNJUTILOBJ = $(top_builddir)/cWnn/jutil INSTALL = @INSTALL@ @@ -150,7 +190,7 @@ ATOD = $(CWNNJUTILOBJ)/catod ATOF = $(CWNNJUTILOBJ)/catof -@@ -86,8 +86,7 @@ +@@ -86,8 +86,7 @@ instserver:: install install:: @case '${MFLAGS}' in *[i]*) set +e;; esac; @for i in $(TWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \ @@ -160,9 +200,11 @@ done install:: $(ALLTGT) ---- FreeWnn-1.1.1-a022.orig/kWnn/jserver/Makefile.in 2010-07-11 19:18:17.000000000 +0900 -+++ FreeWnn-1.1.1-a022/kWnn/jserver/Makefile.in 2013-08-06 16:04:30.457591366 +0900 -@@ -38,7 +38,7 @@ +Index: FreeWnn-1.1.1-a023/kWnn/jserver/Makefile.in +=================================================================== +--- FreeWnn-1.1.1-a023.orig/kWnn/jserver/Makefile.in ++++ FreeWnn-1.1.1-a023/kWnn/jserver/Makefile.in +@@ -38,7 +38,7 @@ INSTALL = @INSTALL@ JSERVERDEFINES = -DJSERVER -DWRITE_CHECK INCLUDES = -I$(KWNNJSERVERSRC) -I$(KWNNINCLUDESRC) -I$(top_builddir) DEFINES = $(KWNNDEFINES) $(JSERVERDEFINES) $(WNNTERM) $(KWNNLANGDEF) @@ -171,20 +213,11 @@ SERVERINITDEF = -DSERVER_INIT_FILE=\"/$(KWNNLANG)/kserverrc\" HINSIDEFINE = -DHINSIDATA_FILE=\"/$(KWNNLANG)/hinsi.data\" WRAPLIB = @WRAPLIB@ ---- FreeWnn-1.1.1-a022.orig/kWnn/jutil/Makefile.in 2011-04-18 01:29:50.000000000 +0900 -+++ FreeWnn-1.1.1-a022/kWnn/jutil/Makefile.in 2013-08-06 16:07:46.321957315 +0900 -@@ -39,7 +39,7 @@ - - INCLUDES = -I$(top_builddir) @EXTKWNNJINC@ -I$(KWNNINCLUDESRC) - DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) --LOCAL_INSTFLAGS = -o $(WNNOWNER) -+LOCAL_INSTFLAGS = - HINSIDEFINE = -DHINSIDATA_FILE=\"/$(KWNNLANG)/hinsi.data\" - - CLIENTPROGRAMS = kwddel kwdreg ---- FreeWnn-1.1.1-a022.orig/kWnn/kdic/Makefile.in 2010-02-23 02:06:55.000000000 +0900 -+++ FreeWnn-1.1.1-a022/kWnn/kdic/Makefile.in 2013-08-06 16:34:59.173587868 +0900 -@@ -32,7 +32,7 @@ +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 +@@ -32,7 +32,7 @@ top_builddir = @top_builddir@ KWNNJUTILOBJ = $(top_builddir)/kWnn/jutil INSTALL = @INSTALL@ @@ -193,7 +226,7 @@ ATOD = $(KWNNJUTILOBJ)/katod ATOF = $(KWNNJUTILOBJ)/katof -@@ -77,8 +77,7 @@ +@@ -77,8 +77,7 @@ instserver:: install install:: @case '${MFLAGS}' in *[i]*) set +e;; esac; @for i in $(KWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \ @@ -203,3 +236,16 @@ done install:: $(ALLTGT) +Index: FreeWnn-1.1.1-a023/kWnn/jutil/Makefile.in +=================================================================== +--- FreeWnn-1.1.1-a023.orig/kWnn/jutil/Makefile.in ++++ FreeWnn-1.1.1-a023/kWnn/jutil/Makefile.in +@@ -39,7 +39,7 @@ LT_LD = $(LIBTOOL) --mode=link + + INCLUDES = -I$(top_builddir) @EXTKWNNJINC@ -I$(KWNNINCLUDESRC) + DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) ++LOCAL_INSTFLAGS = + HINSIDEFINE = -DHINSIDATA_FILE=\"/$(KWNNLANG)/hinsi.data\" + + CLIENTPROGRAMS = kwddel kwdreg ++++++ FreeWnn-trad_cpp.patch ++++++ --- /var/tmp/diff_new_pack.EzZShK/_old 2015-09-19 06:55:01.000000000 +0200 +++ /var/tmp/diff_new_pack.EzZShK/_new 2015-09-19 06:55:01.000000000 +0200 @@ -1,18 +1,21 @@ ---- FreeWnn-1.1.1-a022.bak/Wnn/pubdicplus/Makefile.in 2013-08-07 06:08:05.039178998 +0900 -+++ FreeWnn-1.1.1-a022/Wnn/pubdicplus/Makefile.in 2013-08-07 00:37:02.866652685 +0900 -@@ -421,7 +421,7 @@ +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.fzk: fzk.master-.c $(FZK_SRC) -- $(FZK_PP) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ -+ $(CPP) -traditional-cpp $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ - - full.fzk: $(FZK_SRC) - $(MAKE) FZK_FLAG=-DKANSAI std.fzk -diff -ur FreeWnn-1.1.1-a022.bak/cWnn/cdic/Makefile.in FreeWnn-1.1.1-a022/cWnn/cdic/Makefile.in ---- FreeWnn-1.1.1-a022.bak/cWnn/cdic/Makefile.in 2013-08-07 06:08:05.110178385 +0900 -+++ FreeWnn-1.1.1-a022/cWnn/cdic/Makefile.in 2013-08-07 00:39:21.716718581 +0900 -@@ -64,10 +64,10 @@ + 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 @@ -25,9 +28,11 @@ # To avoid circular dependency, we don't use 'con.master?.c' con.master-.c: con.master ---- FreeWnn-1.1.1-a022.bak/cWnn/tdic/Makefile.in 2013-08-07 06:08:05.139178134 +0900 -+++ FreeWnn-1.1.1-a022/cWnn/tdic/Makefile.in 2013-08-07 00:43:26.207005663 +0900 -@@ -64,10 +64,10 @@ +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 @@ -40,9 +45,11 @@ # To avoid circular dependency, we don't use 'con.master?.c' con.master-.c: con.master ---- FreeWnn-1.1.1-a022.bak/kWnn/kdic/Makefile.in 2013-08-07 06:08:05.151178030 +0900 -+++ FreeWnn-1.1.1-a022/kWnn/kdic/Makefile.in 2013-08-07 00:44:57.500267277 +0900 -@@ -62,7 +62,7 @@ +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 ++++++ FreeWnn-warnings.patch ++++++ --- /var/tmp/diff_new_pack.EzZShK/_old 2015-09-19 06:55:01.000000000 +0200 +++ /var/tmp/diff_new_pack.EzZShK/_new 2015-09-19 06:55:01.000000000 +0200 @@ -18,3 +18,16 @@ /* pw_d pw_h err mes */ return (-1); if (js_dic_info (jl_env (buf), dic_no, &ret) < 0) +--- Wnn/etc/pwd.c ++++ Wnn/etc/pwd.c 2015-09-16 10:04:15.545979775 +0000 +@@ -51,6 +51,10 @@ + #include "commonhd.h" + #include "jslib.h" + #include "wnn_os.h" ++#else ++#include <string.h> ++#include <strings.h> ++#include <time.h> + #endif /* !JS */ + + #ifdef JS ++++++ rcfcwnn ++++++ --- /var/tmp/diff_new_pack.EzZShK/_old 2015-09-19 06:55:01.000000000 +0200 +++ /var/tmp/diff_new_pack.EzZShK/_new 2015-09-19 06:55:01.000000000 +0200 @@ -11,6 +11,7 @@ # Required-Stop: $network $remote_fs $named # Default-Start: 3 5 # Default-Stop: +# Short-Description: Free Wnn (mainland) Chinese Server # Description: Free Wnn (mainland) Chinese Server, for input of simplified Chinese ### END INIT INFO ++++++ rcfkwnn ++++++ --- /var/tmp/diff_new_pack.EzZShK/_old 2015-09-19 06:55:01.000000000 +0200 +++ /var/tmp/diff_new_pack.EzZShK/_new 2015-09-19 06:55:01.000000000 +0200 @@ -11,6 +11,7 @@ # Required-Stop: $network $remote_fs $named # Default-Start: 3 5 # Default-Stop: +# Short-Description: Free Wnn Korean Server # Description: Free Wnn Korean Server, for input of Korean ### END INIT INFO ++++++ rcftwnn ++++++ --- /var/tmp/diff_new_pack.EzZShK/_old 2015-09-19 06:55:01.000000000 +0200 +++ /var/tmp/diff_new_pack.EzZShK/_new 2015-09-19 06:55:01.000000000 +0200 @@ -11,6 +11,7 @@ # Required-Stop: $network $remote_fs $named # Default-Start: 3 5 # Default-Stop: +# Short-Description: Free Wnn Taiwan-Chinese Server # Description: Free Wnn Taiwan-Chinese Server, for input of traditional Chinese ### END INIT INFO ++++++ rcfwnn ++++++ --- /var/tmp/diff_new_pack.EzZShK/_old 2015-09-19 06:55:01.000000000 +0200 +++ /var/tmp/diff_new_pack.EzZShK/_new 2015-09-19 06:55:01.000000000 +0200 @@ -11,6 +11,7 @@ # Required-Stop: $network $remote_fs $named # Default-Start: 3 5 # Default-Stop: +# Short-Description: Free Wnn Kanji Server # Description: Free Wnn Kanji Server used for input of Japanese ### END INIT INFO

1 0

commit wireshark for openSUSE:Factory
by root＠hilbert.suse.de 19 Sep '15

19 Sep '15

Hello community, here is the log from the commit of package wireshark for openSUSE:Factory checked in at 2015-09-19 06:54:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wireshark (Old) and /work/SRC/openSUSE:Factory/.wireshark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wireshark" Changes: -------- --- /work/SRC/openSUSE:Factory/wireshark/wireshark.changes 2015-08-13 18:10:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wireshark.new/wireshark.changes 2015-09-19 06:54:56.000000000 +0200 @@ -7 +7 @@ - wnpa-sec-2015-21 + wnpa-sec-2015-21 CVE-2015-6241 @@ -9 +9 @@ - wnpa-sec-2015-22 + wnpa-sec-2015-22 CVE-2015-6242 @@ -11 +11 @@ - wnpa-sec-2015-23 + wnpa-sec-2015-23 CVE-2015-6243 @@ -13 +13 @@ - wnpa-sec-2015-24 + wnpa-sec-2015-24 CVE-2015-6244 @@ -15 +15 @@ - wnpa-sec-2015-25 + wnpa-sec-2015-25 CVE-2015-6245 @@ -17 +17 @@ - wnpa-sec-2015-26 + wnpa-sec-2015-26 CVE-2015-6246 @@ -19 +19 @@ - wnpa-sec-2015-27 + wnpa-sec-2015-27 CVE-2015-6247 @@ -21 +21 @@ - wnpa-sec-2015-28 + wnpa-sec-2015-28 CVE-2015-6248 @@ -23 +23 @@ - wnpa-sec-2015-29 + wnpa-sec-2015-29 CVE-2015-6249 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit scim-pinyin for openSUSE:Factory
by root＠hilbert.suse.de 19 Sep '15

19 Sep '15

Hello community, here is the log from the commit of package scim-pinyin for openSUSE:Factory checked in at 2015-09-19 06:54:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-pinyin (Old) and /work/SRC/openSUSE:Factory/.scim-pinyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scim-pinyin" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-pinyin/scim-pinyin.changes 2012-09-15 17:30:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scim-pinyin.new/scim-pinyin.changes 2015-09-19 06:54:53.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Sep 12 18:18:07 UTC 2015 - i(a)marguerite.su + +- do not build with skim, which is dead +- remove scim-chinese Provides/Obsoletes, no package required it +- remove PreReq, useless +- remove gconf schemas install bits, useless +- obsoletes the removed subpackage + +------------------------------------------------------------------- Old: ---- scim-pinyin-0.5.92.tar.xz New: ---- scim-pinyin-scim-pinyin-0.5.92.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-pinyin.spec ++++++ --- /var/tmp/diff_new_pack.JhgDhS/_old 2015-09-19 06:54:54.000000000 +0200 +++ /var/tmp/diff_new_pack.JhgDhS/_new 2015-09-19 06:54:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim-pinyin # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,121 +16,55 @@ # -%define scim_gtk3 1 -%if %suse_version > 1120 -%bcond_with skim -%else -%bcond_without skim -%endif - Name: scim-pinyin -BuildRequires: gcc-c++ -BuildRequires: scim-devel -%if %{with skim} -BuildRequires: kdelibs3-devel -BuildRequires: qt3-devel -BuildRequires: skim -%endif -BuildRequires: xz Version: 0.5.92 Release: 0 -PreReq: gconf2 libxml2 orbit2 glib2 -Obsoletes: scim-chinese -Provides: scim-chinese -Url: http://www.scim-im.org/ -# CVS repository: -# cvs -d:pserver:anonymous@scim.cvs.sourceforge.net:/cvsroot/scim login -# cvs -z3 -d:pserver:anonymous@scim.cvs.sourceforge.net:/cvsroot/scim co scim-pinyin -Source0: %{name}-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Intelligent Pinyin input module for Smart Chinese/Common Input Method platform +Summary: Smart pinyin IM engine for SCIM platform License: GPL-2.0+ Group: System/I18n/Chinese +Url: https://github.com/scim-im/scim-pinyin +Source: https://github.com/scim-im/%{name}/archive/%{name}-%{version}/%{name}-%{nam… +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: pkg-config +BuildRequires: scim-devel +Obsoletes: %{name}-skim <= %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Intelligent Pinyin input module for Smart Chinese/Common Input Method -platform - -%if %{with skim} - -%package -n scim-pinyin-skim -Summary: skim setup module for scim-pinyin -Group: System/I18n/Chinese -Requires: %{name} = %{version} -# Provides: locale(skim:zh) - -%description -n scim-pinyin-skim -skim setup module for scim-pinyin -%endif +Smart pinyin IM engine for SCIM platform. %prep -%define scim_binary_version 1.4.0 -%setup -q -n %{name}-%{version} - -chmod a+x configure +%setup -q -n %{name}-%{name}-%{version} %build -export QTDIR=/usr/lib/qt3 -export KDEDIR=/opt/kde3 -export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS" -./configure --prefix=/usr \ - --sysconfdir=%{_sysconfdir} \ - --libdir=%{_libdir} \ - --disable-static \ - --disable-schemas-install \ - --with-gconf-schema-file-dir=/etc/opt/gnome/gconf/schemas \ - --enable-debug -make -%if %{with skim} -make -C skim -%endif +./bootstrap +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" +%configure --disable-static \ + --enable-debug \ + --disable-skim-support \ + --enable-tools +make %{?_smp_mflags} %install -export QTDIR=/usr/lib/qt3 -export KDEDIR=/opt/kde3 -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -make DESTDIR=${RPM_BUILD_ROOT} install -%if %{with skim} -make -C skim DESTDIR=${RPM_BUILD_ROOT} install -%endif -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL -rm -f $RPM_BUILD_ROOT%{_libdir}/scim-1.0/%{scim_binary_version}/*/*.la +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -type f -name "*.la" -delete -print %find_lang scim-pinyin -%if %{with skim} -%find_lang skim-scim-pinyin -%endif - -%clean -# %post -# export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` -# opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/scim-chinese.schemas >/dev/null %files -f scim-pinyin.lang %defattr(-, root, root) -%doc AUTHORS COPYING NEWS README ChangeLog -#%config %{_sysconfdir}/opt/gnome/gconf/schemas/* -%dir %{_libdir}/scim-1.0/ -%dir %{_libdir}/scim-1.0/%{scim_binary_version}/ -%dir %{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/ -%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/pinyin.so -%dir %{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/ -%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/pinyin-imengine-setup.so -%dir %{_datadir}/scim/ -%dir %{_datadir}/scim/pinyin/ -%{_datadir}/scim/pinyin/* -%dir %{_datadir}/scim/icons/ -%{_datadir}/scim/icons/smart-pinyin.png - -%if %{with skim} - -%files -n scim-pinyin-skim -f skim-scim-pinyin.lang -%defattr(-, root, root) -%dir /opt/kde3/share/apps/skim/ -/opt/kde3/share/apps/skim/* -/opt/kde3/share/config.kcfg/* -/opt/kde3/share/services/* -/opt/kde3/%{_lib}/kde3/* -%endif +%doc AUTHORS COPYING README ChangeLog +%{_scim_enginedir}/pinyin.so +%if 0%{?suse_version} >= 1310 +%{_scim_uidir}/pinyin-imengine-setup.so +%endif +%dir %{_scim_datadir}/pinyin/ +%{_scim_datadir}/pinyin/phrase_lib +%{_scim_datadir}/pinyin/pinyin_phrase_index +%{_scim_datadir}/pinyin/pinyin_phrase_lib +%{_scim_datadir}/pinyin/pinyin_table +%{_scim_datadir}/pinyin/special_table +%{_scim_icondir}/smart-pinyin.png %changelog

1 0

commit scim-anthy for openSUSE:Factory
by root＠hilbert.suse.de 19 Sep '15

19 Sep '15

Hello community, here is the log from the commit of package scim-anthy for openSUSE:Factory checked in at 2015-09-19 06:54:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-anthy (Old) and /work/SRC/openSUSE:Factory/.scim-anthy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scim-anthy" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-anthy/scim-anthy.changes 2013-09-26 07:19:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scim-anthy.new/scim-anthy.changes 2015-09-19 06:54:50.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Sep 13 12:52:31 UTC 2015 - i(a)marguerite.su + +- remove scim_gtk3 macro, use suse_version instead +- use upstream source +- use macros from macros.scim +- remove unneeded dependency: update-desktop-files + +------------------------------------------------------------------- Old: ---- scim-anthy-1.2.7.tar.bz2 New: ---- scim-anthy-1.2.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-anthy.spec ++++++ --- /var/tmp/diff_new_pack.Hzp65F/_old 2015-09-19 06:54:51.000000000 +0200 +++ /var/tmp/diff_new_pack.Hzp65F/_new 2015-09-19 06:54:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim-anthy # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,12 +16,6 @@ # -%if 0%{?suse_version} >= 1140 -%define scim_gtk3 1 -%else -%define scim_gtk3 0 -%endif - Name: scim-anthy Version: 1.2.7 Release: 0 @@ -29,33 +23,30 @@ License: LGPL-2.1+ Group: System/I18n/Japanese Url: http://sourceforge.jp/projects/scim-imengine/ -Source0: scim-anthy-%{version}.tar.bz2 +Source: http://iij.dl.osdn.jp/scim-imengine/37309/%{name}-%{version}.tar.gz Source1: icons.tar.gz Patch3: %{name}-gtk3-abuild.patch -Patch355863: bnc355863-add-Eisu_toggle-to-default-keybindings.patch Patch4: remove-intl.patch +Patch5: bnc355863-add-Eisu_toggle-to-default-keybindings.patch BuildRequires: anthy-devel BuildRequires: gcc-c++ -BuildRequires: gettext-tools BuildRequires: libtool +BuildRequires: pkg-config BuildRequires: scim-devel -BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Anthy Input Method Engine for SCIM %prep -%define scim_binary_version %(pkg-config --variable=scim_binary_version scim) -%define build_setup 1 %setup -q -%if 0%{?scim_gtk3} +%patch5 -p1 +%patch4 -p1 +%if 0%{?suse_version} >= 1140 %patch3 -p1 tar -xzvf %{SOURCE1} cp -r icons/* data/ %endif -%patch355863 -p1 -%patch4 -p1 %build libtoolize --force @@ -66,26 +57,19 @@ make %{?_smp_mflags} %install -%makeinstall -rm -f %{buildroot}/%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/anthy.{a,la} -rm -f %{buildroot}/%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/anthy-imengine-setup.{a,la} -%find_lang scim-anthy +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -name "*.la" -delete -print +%find_lang %{name} -%files -f scim-anthy.lang +%files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS COPYING NEWS README ChangeLog -%dir %{_libdir}/scim-1.0/ -%dir %{_libdir}/scim-1.0/%{scim_binary_version}/ -%dir %{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/ -%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/anthy.so -%if %{build_setup} -%dir %{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/ -%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/anthy-imengine-setup.so +%{_scim_enginedir}/anthy.so +%if 0%{?suse_version} >= 1140 +%{_scim_uidir}/anthy-imengine-setup.so +%{_scim_helperdir}/anthy-imengine-helper.so %endif -%{_libdir}/scim-1.0/1.?.?/Helper/anthy-imengine-helper.* -%dir %{_datadir}/scim/icons/ -%{_datadir}/scim/icons/scim-anthy*.png -%dir %{_datadir}/scim/Anthy/ -%{_datadir}/scim/Anthy/* +%{_scim_datadir}/Anthy/ +%{_scim_icondir}/*.png %changelog ++++++ scim-anthy-gtk3-abuild.patch ++++++ ++++ 102263 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/scim-anthy/scim-anthy-gtk3-abuild.patch ++++ and /work/SRC/openSUSE:Factory/.scim-anthy.new/scim-anthy-gtk3-abuild.patch

1 0

commit scim-canna for openSUSE:Factory
by root＠hilbert.suse.de 19 Sep '15

19 Sep '15

Hello community, here is the log from the commit of package scim-canna for openSUSE:Factory checked in at 2015-09-19 06:54:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-canna (Old) and /work/SRC/openSUSE:Factory/.scim-canna.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scim-canna" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-canna/scim-canna.changes 2013-07-24 23:40:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scim-canna.new/scim-canna.changes 2015-09-19 06:54:49.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Sep 13 16:35:13 UTC 2015 - i(a)marguerite.su + +- drop libtool-autoconf.patch: it's for SLE_10 +- remove other SLE_10 hacks +- use macros from macros.scim +- use %configure +- remove unneeded dependency: update-desktop-files +- remove always enabled macro: scim_gtk3 + +------------------------------------------------------------------- Old: ---- libtool-autoconf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-canna.spec ++++++ --- /var/tmp/diff_new_pack.foythC/_old 2015-09-19 06:54:50.000000000 +0200 +++ /var/tmp/diff_new_pack.foythC/_new 2015-09-19 06:54:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim-canna # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,6 @@ # -%define scim_gtk3 1 Name: scim-canna Version: 1.0.1 Release: 0 @@ -24,58 +23,44 @@ License: GPL-2.0+ Group: System/I18n/Japanese Url: http://sourceforge.jp/projects/scim-imengine/ -Source0: http://iij.dl.sourceforge.jp/scim-imengine/29155/%{name}-%{version}.tar.gz -Patch1: libtool-autoconf.patch +Source: http://iij.dl.sourceforge.jp/scim-imengine/29155/%{name}-%{version}.tar.gz #PATCH-FIX-UPSTREAM migration old gtk functions: gtktooltips -Patch3: gtk-2.12+-gtktooltips-migration.patch +Patch1: gtk-2.12+-gtktooltips-migration.patch #PATCH-FIX-UPSTREAM convert old gtk_combo to new gtk_combobox -Patch4: gtk-2.4+-combobox-migration.patch +Patch2: gtk-2.4+-combobox-migration.patch BuildRequires: canna-devel BuildRequires: gcc-c++ +BuildRequires: pkg-config BuildRequires: scim-devel -BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Canna Input Method Engine for SCIM %prep -%define scim_binary_version %(pkg-config --variable=scim_binary_version scim) -%define build_setup 1 %setup -q -%if 0%{?suse_version} <= 1110 %patch1 -p1 -libtoolize --force -autoreconf -I /opt/gnome/share/aclocal --force --install --verbose -%endif -%if 0%{?scim_gtk3} -%patch3 -p1 -%patch4 -p1 -%endif +%patch2 -p1 %build -CXXFLAGS="%{optflags}" \ -./configure --prefix=/usr \ - --sysconfdir=%{_sysconfdir} \ - --libdir=%{_libdir} \ +CXXFLAGS="%{optflags}" +%configure \ --disable-static \ --enable-debug -make +make %{?_smp_mflags} %install -%makeinstall -rm -f %{buildroot}/%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/canna.{a,la} -rm -f %{buildroot}/%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/canna-imengine-setup.{a,la} -%find_lang scim-canna +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -name "*.la" -delete -print +%find_lang %{name} -%files -f scim-canna.lang +%files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS COPYING NEWS README ChangeLog -%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/canna.so -%if %{build_setup} -%dir %{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/ -%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/canna-imengine-setup.so +%{_scim_enginedir}/canna.so +%if 0%{?suse_version} >= 1140 +%{_scim_uidir}/canna-imengine-setup.so %endif -%{_datadir}/scim/icons/scim-canna.png +%{_scim_icondir}/%{name}.png %changelog

1 0

commit scim-chewing for openSUSE:Factory
by root＠hilbert.suse.de 19 Sep '15

19 Sep '15

Hello community, here is the log from the commit of package scim-chewing for openSUSE:Factory checked in at 2015-09-19 06:54:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-chewing (Old) and /work/SRC/openSUSE:Factory/.scim-chewing.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scim-chewing" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-chewing/scim-chewing.changes 2014-07-27 18:47:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scim-chewing.new/scim-chewing.changes 2015-09-19 06:54:48.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Sep 13 06:13:06 UTC 2015 - i(a)marguerite.su + +- update to 0.3.6+git20150821.5df4075 + * make CI build faster + * export LIBTOOL_EXPORT_OPTIONS +- remove gconf schemas install bits + +------------------------------------------------------------------- Old: ---- scim-chewing-0.3.6git20140424.tar.xz New: ---- _service scim-chewing-0.3.6+git20150821.5df4075.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-chewing.spec ++++++ --- /var/tmp/diff_new_pack.ZDn7G4/_old 2015-09-19 06:54:49.000000000 +0200 +++ /var/tmp/diff_new_pack.ZDn7G4/_new 2015-09-19 06:54:49.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim-chewing # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,12 @@ Name: scim-chewing -Version: 0.3.6git20140424 +Version: 0.3.6+git20150821.5df4075 Release: 0 -Summary: Chewing input method module for SCIM +Summary: Chewing IM engine for SCIM platform License: GPL-2.0+ Group: System/I18n/Chinese -Url: http://chewing.csie.net/ -#Source: http://chewing.csie.net/download/scim/%{name}-%{version}.tar.xz +Url: https://github.com/chewing/scim-chewing Source: %{name}-%{version}.tar.xz Patch: %{name}-0.3.6-autogen.patch BuildRequires: gcc-c++ @@ -31,44 +30,37 @@ BuildRequires: intltool BuildRequires: libchewing-devel BuildRequires: libtool -BuildRequires: perl-XML-Parser BuildRequires: scim-devel BuildRequires: update-desktop-files BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Chewing input method module for SCIM. +Chewing IM engine for SCIM platform. %prep -%define scim_binary_version %(pkg-config --variable=scim_binary_version scim) %setup -q %patch -p1 NOCONFIGURE=1 ./autogen.sh %build CXXFLAGS="%{optflags}" \ -./configure --prefix=/usr \ - --sysconfdir=%{_sysconfdir} \ - --libdir=%{_libdir} \ +%configure \ --disable-static \ - --disable-schemas-install \ - --with-gconf-schema-file-dir=/etc/opt/gnome/gconf/schemas \ --enable-debug -make +make %{?_smp_mflags} %install -%makeinstall -find %{buildroot}%{_libdir} -name "*.la" -type f -delete -print -%find_lang scim-chewing +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -type f -name "*.la" -delete -print +%find_lang %{name} -%clean - -%files -f scim-chewing.lang +%files -f %{name}.lang %defattr(-, root, root) -%doc AUTHORS COPYING NEWS README ChangeLog -%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/chewing.so -%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/chewing-imengine-setup.so -%{_datadir}/scim/icons/*.png +%doc AUTHORS COPYING NEWS README +%{_scim_enginedir}/chewing.so +%{_scim_uidir}/chewing-imengine-setup.so +%{_scim_icondir}/%{name}.png +%{_scim_icondir}/%{name}-swap-colors.png %changelog ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/chewing/scim-chewing</param> <param name="scm">git</param> <param name="exclude">.git</param> <param name="versionformat">0.3.6+git%cd.%h</param> <param name="revision">master</param> </service> <service name="recompress" mode="disabled"> <param name="file">scim-chewing-*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"> <param name="basename">scim-chewing</param> </service> </services>

1 0

commit scim for openSUSE:Factory
by root＠hilbert.suse.de 19 Sep '15

19 Sep '15

Hello community, here is the log from the commit of package scim for openSUSE:Factory checked in at 2015-09-19 06:54:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim (Old) and /work/SRC/openSUSE:Factory/.scim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scim" Changes: -------- --- /work/SRC/openSUSE:Factory/scim/scim.changes 2015-03-25 21:32:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scim.new/scim.changes 2015-09-19 06:54:45.000000000 +0200 @@ -1,0 +2,31 @@ +Thu Sep 10 16:02:05 UTC 2015 - i(a)marguerite.su + +- Update to version 1.4.15+git20150804.187a1fd: + * drop and ignore dotfiles + * drop some empty files + * disable subdir-objects + * add manpages taken from debian + * IMdkit: Track window property offsets correctly + * disable setpwent. patch from openSUSE + * add sharedmethod support + * use reference-to-const for copy constructor to pass c++11 + * fix SCIM_DEBUG_AllMask to be unsigned +- refactored xim.d-scim + * skim is not available, no need to conditional check any more + * it should not be scim to set path for kde3 + * this is shipped w/ scim, no need to check existence +- baselibs.conf: no more scim-qt3 +- drop patch: scim-disable-subdir-objects.patch, upstreamed +- drop patch: scim-no-setpwent.diff, upstreamed +- fix post/postun scripts +- remove unneeded conditionals which will be always built like + gtk2/qt4-immodule, simple config and x11 frontend +- remove unneeded gnome_prefix macro +- remove unneeded provides/obsoletes, those packages are not in + either SLE or openSUSE now. +- remove SLE_10 hacks +- add patch: G_GNUC_BEGIN_IGNORE_DEPRECATIONS.patch + * define G_GNUC_BEGIN_IGNORE_DEPRECATIONS is undefined +- add macros.scim + +------------------------------------------------------------------- Old: ---- etc-x11-xim.d-scim scim-1.4.15.tar.gz scim-disable-subdir-objects.patch scim-no-setpwent.diff New: ---- G_GNUC_BEGIN_IGNORE_DEPRECATIONS.patch _service macros.scim scim-1.4.15+git20150804.187a1fd.tar.xz xim.d-scim ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim.spec ++++++ --- /var/tmp/diff_new_pack.VazQAg/_old 2015-09-19 06:54:46.000000000 +0200 +++ /var/tmp/diff_new_pack.VazQAg/_new 2015-09-19 06:54:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,71 +17,44 @@ Name: scim -BuildRequires: autoconf +Version: 1.4.15+git20150804.187a1fd +Release: 0 +Summary: Smart Chinese/Common Input Method platform +License: LGPL-2.1+ +Group: System/I18n/Chinese +Url: https://github.com/scim-im/scim +Source: %{name}-%{version}.tar.xz +Source1: xim.d-scim +Source2: scim.config +Source3: macros.scim +Source99: baselibs.conf +Patch1: configs.patch +Patch2: scim-fix-no-return-in-non-void.patch +Patch3: G_GNUC_BEGIN_IGNORE_DEPRECATIONS.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen BuildRequires: fdupes -BuildRequires: fontconfig BuildRequires: gcc-c++ -BuildRequires: graphviz -BuildRequires: graphviz-gd +BuildRequires: gtk2-devel BuildRequires: intltool -# for older distros -BuildRequires: libexpat-devel -BuildRequires: libgnomeui-devel -%if 0%{?suse_version} >= 1310 -BuildRequires: libpng-tools -%endif BuildRequires: libqt4-devel BuildRequires: libtool -BuildRequires: libxslt -BuildRequires: perl-XML-Parser -BuildRequires: pkgconfig +BuildRequires: pkg-config BuildRequires: update-desktop-files +BuildRequires: x11-tools +BuildRequires: xz +# not SLE_12 +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 +BuildRequires: libpng-tools +%endif %if 0%{?suse_version} > 1130 BuildRequires: gtk3-devel +Requires: scim-gtk3 = %{version} %endif -BuildRequires: gtk2-devel -Version: 1.4.15 -Release: 0 -Summary: Smart Chinese/Common Input Method platform -License: LGPL-2.1+ -Group: System/I18n/Chinese -Url: https://github.com/scim-im/scim -Source0: https://github.com/scim-im/scim/archive/%{name}-%{version}.tar.gz -Source1: baselibs.conf -Source10: etc-x11-xim.d-scim -Source11: scim.config -Patch1: configs.patch -Patch2: scim-no-setpwent.diff -Patch3: scim-fix-no-return-in-non-void.patch -Patch4: scim-disable-subdir-objects.patch -Requires(pre): /usr/bin/touch -Recommends: %{name}-lang -Obsoletes: scim-config-gconf < %{version}-%{release} -Obsoletes: scim-config-simple < %{version}-%{release} -Obsoletes: scim-config-socket < %{version}-%{release} -Obsoletes: scim-frontend-socket < %{version}-%{release} -Obsoletes: scim-frontend-x11 < %{version}-%{release} -Obsoletes: scim-gtk2-immodule < %{version}-%{release} -Obsoletes: scim-server-rawcode < %{version}-%{release} -Obsoletes: scim-server-socket < %{version}-%{release} -Obsoletes: scim-server-table < %{version}-%{release} -Provides: scim-config-gconf -Provides: scim-config-simple -Provides: scim-config-socket -Provides: scim-frontend-socket -Provides: scim-frontend-x11 -Provides: scim-gtk2-immodule -Provides: scim-server-rawcode -Provides: scim-server-socket -Provides: scim-server-table +Requires: scim-gtk = %{version} +Requires: scim-qt4 = %{version} +Recommends: scim-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%gtk2_immodule_requires -%if 0%{?suse_version} > 1130 -%gtk3_immodule_requires -%endif -%define gnome_prefix %(pkg-config --variable=prefix libgnomeui-2.0) %description SCIM is a developing platform to significantly reduce the difficulty of @@ -89,7 +62,7 @@ %package devel Summary: Include Files and Libraries mandatory for Development -Group: System/I18n/Chinese +Group: Development/Libraries/C and C++ Requires: %{name} = %{version} %description devel @@ -100,21 +73,24 @@ Summary: SCIM im module for gtk2 Group: System/I18n/Chinese Requires: %{name} = %{version} -%gtk2_immodule_requires Supplements: packageand(scim:gtk2) +%if 0%{?sles_version} && 0%{?suse_version} != 1315 +Requires(post): gtk2 +Requires(postun): gtk2 +%else +%{gtk2_immodule_requires} +%endif %description gtk This package contains SCIM im module for gtk2 %if 0%{?suse_version} > 1130 %package gtk3 - Summary: SCIM im module for gtk3 Group: System/I18n/Chinese Requires: %{name} = %{version} -BuildRequires: gtk3-devel -%gtk3_immodule_requires Supplements: packageand(scim:gtk3) +%{gtk3_immodule_requires} %description gtk3 This package contains SCIM im module for gtk3 @@ -124,7 +100,6 @@ Summary: SCIM im module for qt4 Group: System/I18n/Chinese Requires: %{name} = %{version} -BuildRequires: libqt4-devel Supplements: packageand(scim:libqt4) %description qt4 @@ -133,117 +108,47 @@ %lang_package %prep -%define build_config_socket 1 -%define build_config_simple 1 -%define build_frontend_x11 1 -%define build_frontend_socket 1 -%define build_imengine_rawcode 1 -%define build_imengine_table 1 -%define build_imengine_socket 1 -%define build_gtk2_immodule 1 -%define build_scim_setup 1 -%define build_panel_gtk 1 -%define build_gtk_utils 1 -%setup -q -n %{name}-%{name}-%{version} +%setup -q %patch1 -p1 -%if 0%{?suse_version} > 1110 %patch2 -p1 -%endif +%if 0%{?sles_version} && 0%{?suse_version} != 1315 %patch3 -p1 -%patch4 -p1 -find . -type f | xargs chmod u+w -UTF_8_LOCALES=$(locale -a | grep utf8 | perl -p -e "s/utf8/UTF-8/; s/\n/,/; " | perl -p -e "s/,$//") -perl -pi -e "s/\/SupportedUnicodeLocales =.*/\/SupportedUnicodeLocales = $UTF_8_LOCALES/" ./configs/global -# hack to build with older distros -%if 0%{?suse_version} < 1100 -sed -i -e'/supplements/d' $RPM_SOURCE_DIR/baselibs.conf %endif +UTF_8_LOCALES=$(locale -a | grep utf8 | perl -p -e "s/utf8/UTF-8/; s/\n/,/; " | perl -p -e "s/,$//") +perl -pi -e "s/\/SupportedUnicodeLocales =.*/\/SupportedUnicodeLocales = $UTF_8_LOCALES/" configs/global # hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860) -%if %suse_version < 1310 +%if 0%{?suse_version} < 1310 sed -i \ -e's(a)$gtk-query-immodules-2.0-64$ --update-cache@\1 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules@g' \ -e's(a)$gtk-query-immodules-2.0$ --update-cache@\1 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules@g' \ - $RPM_SOURCE_DIR/baselibs.conf + %{_sourcedir}/baselibs.conf %endif %build -%if 0%{?suse_version} <= 1100 -libtoolize --force -autoreconf --force --install --verbose -%endif ./bootstrap - -if [ ! -f po/Makevars -a -f po/Makevars.template ] ; then - cp po/Makevars.template po/Makevars -fi -if [ ! -f po/Makevars -a -f /usr/share/gettext/po/Makevars.template ] ; then - cp /usr/share/gettext/po/Makevars.template po/Makevars -fi -#export CFLAGS="%{optflags} -fno-strict-aliasing" -# so configure detects gettext with gcc-4.7 -#export CXXFLAGS="%{optflags} -fpermissive" %configure\ - --libexecdir=%{_prefix}/lib/scim-1.0\ + --libexecdir=%{_libexecdir}/scim-1.0\ %if 0%{?suse_version} > 1130 --with-gtk3-im-module-dir=%{_libdir}/gtk-3.0/3.0.0/immodules\ --with-gtk-version=3\ %endif + --enable-gtk2-immodule\ + --enable-qt4-immodule\ --disable-static\ -%if ! %{build_config_socket} - --disable-config-socket\ -%endif -%if ! %{build_config_simple} - --disable-config-simple\ -%endif -%if ! %{build_frontend_x11} - --disable-frontend-x11\ -%endif -%if ! %{build_frontend_socket} - --disable-frontend-socket\ -%endif -%if ! %{build_imengine_rawcode} - --disable-im-rawcode\ -%endif -%if ! %{build_imengine_table} - --disable-im-table\ -%endif -%if ! %{build_imengine_socket} - --disable-im-socket\ -%endif -%if ! %{build_gtk2_immodule} - --disable-gtk2-immodule\ -%endif -%if ! %{build_scim_setup} - --disable-setup-ui\ -%endif --enable-debug\ - --enable-ld-version-script\ - --enable-gtk2-immodule\ - --enable-qt4-immodule -make top_builddir=$(pwd) + --enable-ld-version-script +make %{?_smp_mflags} top_builddir=$(pwd) # build documentation: -make -C docs html -# manual is missing in 1.4.11 -## make -C docs/manual/zh_CN html +make %{?_smp_mflags} -C docs html %install make DESTDIR=%{buildroot} top_builddir=$(pwd) install -mkdir -p %{buildroot}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI} -rm -f %{buildroot}/%{_libdir}/lib*.*a -rm -f %{buildroot}/%{_libdir}/scim-1.0/*/*/*.*a -rm -f %{buildroot}/%{_libdir}/gtk-2.0/2.10.0/immodules/im-scim.la -rm -f %{buildroot}/%{_libdir}/qt4/plugins/inputmethods/im-scim.la -%if 0%{?suse_version} > 1130 -rm -f %{buildroot}/%{_libdir}/gtk-3.0/3.0.0/immodules/*.la -%endif -# install user manual -# mkdir -p docs/dist/manual/zh_CN/figures/ -# cp -a docs/manual/zh_CN/user-manual.{html,xml} docs/dist/manual/zh_CN/ -# cp -a docs/manual/zh_CN/figures/*.png docs/dist/manual/zh_CN/figures/ +find %{buildroot} -type f -name "*.la" -delete -print + # install configuration files mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/ -install -m 644 $RPM_SOURCE_DIR/etc-x11-xim.d-scim \ - %{buildroot}%{_sysconfdir}/X11/xim.d/scim +install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xim.d/scim + # install symlinks in /etc/X11/xim.d/$lang for all languages # where SCIM might be useful: PRIORITY=50 @@ -258,65 +163,123 @@ popd done popd -install -m 755 $RPM_SOURCE_DIR/scim.config \ - %{buildroot}/%{_datadir}/scim + +install -m 755 %{SOURCE2} %{buildroot}/%{_datadir}/scim %find_lang scim %suse_update_desktop_file scim-setup System SystemSetup -%if 0%{?suse_version} >= 1310 +# own _scim_tabledir +install -d %{buildroot}%{_datadir}/scim/tables + +# install macro.scim +mkdir -p %{buildroot}%{_sysconfdir}/rpm +install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/ + +# not SLE_12 +%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 %png_fix %{buildroot}/%{_datadir}/%{name}/icons/menu.png %endif + %fdupes %{buildroot} %post /sbin/ldconfig -%if %{build_gtk2_immodule} -%gtk2_immodule_post +# Update KeyboardLayout +%{_datadir}/scim/scim.config + +%postun -p /sbin/ldconfig + +%post gtk +/sbin/ldconfig +%if 0%{?sles_version} && 0%{?suse_version} != 1315 +%if "%{_lib}" == "lib64" + %{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk-2.0/gtk64.immodules +%else + %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules +%endif +%else +%{gtk2_immodule_post} %endif + +%postun gtk +/sbin/ldconfig +%if 0%{?sles_version} && 0%{?suse_version} != 1315 +if [ $1 -eq 0 ] ; then +%if "%{_lib}" == "lib64" + %{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk-2.0/gtk64.immodules +%else + %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules +%endif +fi +%else +%{gtk2_immodule_postun} +%endif + %if 0%{?suse_version} > 1130 +%post gtk3 #Add icons to gnome3 panel -TARGET="/usr/share/gnome-shell/js/ui/statusIconDispatcher.js" +TARGET="%{_datadir}/gnome-shell/js/ui/statusIconDispatcher.js" if [ -f $TARGET ] && [ ! -f $TARGET-scim ] ; then mv $TARGET $TARGET-scim sed "/^const STANDARD_TRAY_ICON_IMPLEMENTATIONS/a \ 'scim-panel-gtk': 'input-method'," $TARGET-scim > $TARGET fi -%gtk3_immodule_post -%endif -# Update KeyboardLayout -%{_datadir}/scim/scim.config +%{gtk3_immodule_post} -%postun +%postun gtk3 /sbin/ldconfig -%if %{build_gtk2_immodule} -%gtk2_immodule_postun -%endif -%if 0%{?suse_version} > 1130 -%gtk3_immodule_postun +%{gtk3_immodule_postun} %endif %files %defattr(-, root, root) %doc AUTHORS COPYING README ChangeLog TODO -# %doc docs/dist/manual/zh_CN -%dir %{_sysconfdir}/X11/xim.d/ %config %{_sysconfdir}/X11/xim.d/* +%config %{_sysconfdir}/rpm/macros.scim %dir %{_sysconfdir}/scim -%config %{_sysconfdir}/scim/* -%{_libdir}/lib*.so.* -%{_libdir}/scim-1.0 +%config %{_sysconfdir}/scim/config +%config %{_sysconfdir}/scim/global +%{_bindir}/scim +%{_bindir}/scim-config-agent +%{_bindir}/scim-im-agent +%{_bindir}/scim-setup +%{_libdir}/scim-1.0/scim-helper-launcher +%{_libdir}/scim-1.0/scim-helper-manager +%{_libdir}/scim-1.0/scim-launcher +%{_libdir}/scim-1.0/scim-panel-gtk %{_datadir}/scim -%{_datadir}/pixmaps/* -%{_bindir}/* -%if %{build_scim_setup} +%dir %{_datadir}/scim/tables +%{_datadir}/pixmaps/scim-setup.png %{_datadir}/applications/scim-setup.desktop %{_datadir}/control-center-2.0 -%endif +%{_libdir}/libscim-1.0.so.8 +%{_libdir}/libscim-1.0.so.8.2.6 +%{_libdir}/libscim-gtkutils-1.0.so.8 +%{_libdir}/libscim-gtkutils-1.0.so.8.2.6 +%{_libdir}/libscim-x11utils-1.0.so.8 +%{_libdir}/libscim-x11utils-1.0.so.8.2.6 +%dir %{_libdir}/scim-1.0 +%dir %{_libdir}/scim-1.0/1.4.0 +%dir %{_libdir}/scim-1.0/1.4.0/Config +%dir %{_libdir}/scim-1.0/1.4.0/Filter +%dir %{_libdir}/scim-1.0/1.4.0/FrontEnd +%dir %{_libdir}/scim-1.0/1.4.0/Helper +%dir %{_libdir}/scim-1.0/1.4.0/IMEngine +%dir %{_libdir}/scim-1.0/1.4.0/SetupUI +%{_libdir}/scim-1.0/1.4.0/Config/simple.so +%{_libdir}/scim-1.0/1.4.0/Config/socket.so +%{_libdir}/scim-1.0/1.4.0/Filter/sctc.so +%{_libdir}/scim-1.0/1.4.0/FrontEnd/socket.so +%{_libdir}/scim-1.0/1.4.0/FrontEnd/x11.so +%{_libdir}/scim-1.0/1.4.0/Helper/setup.so +%{_libdir}/scim-1.0/1.4.0/IMEngine/rawcode.so +%{_libdir}/scim-1.0/1.4.0/IMEngine/socket.so +%{_libdir}/scim-1.0/1.4.0/SetupUI/aaa-frontend-setup.so +%{_libdir}/scim-1.0/1.4.0/SetupUI/aaa-imengine-setup.so +%{_libdir}/scim-1.0/1.4.0/SetupUI/panel-gtk-setup.so %files gtk %defattr(-, root, root) -%dir %{gnome_prefix}/%{_lib}/gtk-2.0/2.10.0 -%dir %{gnome_prefix}/%{_lib}/gtk-2.0/2.10.0/immodules -%{gnome_prefix}/%{_lib}/gtk-2.0/2.10.0/immodules/im-scim.so +%{_libdir}/gtk-2.0/2.10.0/immodules/im-scim.so %if 0%{?suse_version} > 1130 %files gtk3 @@ -326,14 +289,18 @@ %files qt4 %defattr(-, root, root) -%{_libdir}/qt4/plugins/ +%{_libdir}/qt4/plugins/inputmethods/im-scim.so %files devel %defattr(-, root, root) %doc docs/html %doc docs/developers -%{_libdir}/libscim*.so -%{_libdir}/pkgconfig/*.pc +%{_libdir}/libscim-1.0.so +%{_libdir}/libscim-gtkutils-1.0.so +%{_libdir}/libscim-x11utils-1.0.so +%{_libdir}/pkgconfig/scim.pc +%{_libdir}/pkgconfig/scim-gtkutils.pc +%{_libdir}/pkgconfig/scim-x11utils.pc %{_includedir}/scim-1.0 %files lang -f %{name}.lang ++++++ G_GNUC_BEGIN_IGNORE_DEPRECATIONS.patch ++++++ Index: scim-1.4.15+git20150804.187a1fd/src/scim_private.h =================================================================== --- scim-1.4.15+git20150804.187a1fd.orig/src/scim_private.h +++ scim-1.4.15+git20150804.187a1fd/src/scim_private.h @@ -46,6 +46,17 @@ #define bind_textdomain_codeset(domain,codeset) #endif +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) +#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"") +#define G_GNUC_END_IGNORE_DEPRECATIONS \ + _Pragma ("GCC diagnostic pop") +#else +#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS +#define G_GNUC_END_IGNORE_DEPRECATIONS +#endif + #endif //__SCIM_PRIVATE_H /* ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/scim-im/scim</param> <param name="scm">git</param> <param name="exclude">.git</param> <param name="versionformat">1.4.15+git%cd.%h</param> <param name="revision">master</param> </service> <service name="recompress" mode="disabled"> <param name="file">scim-*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"> <param name="basename">scim</param> </service> </services> ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.VazQAg/_old 2015-09-19 06:54:47.000000000 +0200 +++ /var/tmp/diff_new_pack.VazQAg/_new 2015-09-19 06:54:47.000000000 +0200 @@ -22,6 +22,5 @@ postun "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache" postun "%endif" supplements "packageand(scim:gtk3-<targettype>)" -scim-qt3 scim-qt4 scim ++++++ configs.patch ++++++ --- /var/tmp/diff_new_pack.VazQAg/_old 2015-09-19 06:54:47.000000000 +0200 +++ /var/tmp/diff_new_pack.VazQAg/_new 2015-09-19 06:54:47.000000000 +0200 @@ -1,16 +1,5 @@ ---- - configs/config | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - --- a/configs/config +++ b/configs/config -@@ -1,5 +1,6 @@ - # This file is encoded in UTF-8 encoding. - /FrontEnd/OnTheSpot = true -+/FrontEnd/SharedInputMethod = true - /FrontEnd/ChangeFactoryGlobally = false - /FrontEnd/Socket/ConfigReadOnly = false - /FrontEnd/Socket/MaxClients = 512 @@ -10,7 +11,7 @@ /Hotkeys/FrontEnd/NextFactory = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R /Hotkeys/FrontEnd/PreviousFactory = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R ++++++ macros.scim ++++++ %_scim_bindir %{_bindir} %_scim_sysconfdir %{_sysconfdir}/scim %_scim_binary_version %(pkg-config --variable=scim_binary_version scim) %_scim_libdir %{_libdir}/scim-1.0/%{_scim_binary_version} %_scim_enginedir %{_scim_libdir}/IMEngine %_scim_uidir %{_scim_libdir}/SetupUI %_scim_helperdir %{_scim_libdir}/Helper %_scim_frontenddir %{_scim_libdir}/FrontEnd %_scim_backenddir %{_scim_libdir}/Config %_scim_datadir %{_datadir}/scim %_scim_icondir %{_scim_datadir}/icons %_scim_tabledir %{_scim_datadir}/tables %scim_gtk2_immodule_requires \ %if 0%{?sles_version} && 0%{?suse_version} != 1315 \ Requires(post): gtk2 \ Requires(postun): gtk2 \ %else \ %{gtk2_immodule_requires} \ %endif %scim_gtk2_immodule_post \ %if 0%{?sles_version} && 0%{?suse_version} != 1315 \ %if "%{_lib}" == "lib64" \ %{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk-2.0/gtk64.immodules \ %else \ %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules \ %endif \ %else \ %{gtk2_immodule_post} \ %endif %scim_gtk2_immodule_postun \ %if 0%{?sles_version} && 0%{?suse_version} != 1315 \ if [ $1 -eq 0 ] ; then \ %if "%{_lib}" == "lib64" \ %{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk-2.0/gtk64.immodules \ %else \ %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules \ %endif \ fi \ %else \ %{gtk2_immodule_postun} \ %endif ++++++ scim-fix-no-return-in-non-void.patch ++++++ --- /var/tmp/diff_new_pack.VazQAg/_old 2015-09-19 06:54:47.000000000 +0200 +++ /var/tmp/diff_new_pack.VazQAg/_new 2015-09-19 06:54:47.000000000 +0200 @@ -1,14 +1,12 @@ ---- a/extras/immodules/agent/scim-bridge-agent-client-listener.cpp 2014-10-23 11:14:53.000000000 +0200 -+++ b/extras/immodules/agent/scim-bridge-agent-client-listener.cpp 2015-03-22 16:31:35.937496486 +0100 -@@ -406,9 +406,12 @@ - } else { - - scim_bridge_perrorln ("Unknown message: %s", message_header); -- return RETVAL_FAILED; -+ return RETVAL_FAILED; +Index: scim-1.4.15+git20150804.187a1fd/extras/immodules/agent/scim-bridge-agent-client-listener.cpp +=================================================================== +--- scim-1.4.15+git20150804.187a1fd.orig/extras/immodules/agent/scim-bridge-agent-client-listener.cpp ++++ scim-1.4.15+git20150804.187a1fd/extras/immodules/agent/scim-bridge-agent-client-listener.cpp +@@ -409,6 +409,9 @@ retval_t ScimBridgeAgentClientListenerIm + return RETVAL_FAILED; } -+ ++ + return 0; + } ++++++ xim.d-scim ++++++ export LC_CTYPE=$LANG export XMODIFIERS="@im=SCIM" export GTK_IM_MODULE="scim" export QT_IM_SWITCHER=imsw-multi export QT_IM_MODULE=scim scim -d # success: return 0

1 0

commit u-boot for openSUSE:Factory
by root＠hilbert.suse.de 19 Sep '15

19 Sep '15

Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2015-09-19 06:54:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/u-boot (Old) and /work/SRC/openSUSE:Factory/.u-boot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "u-boot" Changes: -------- --- /work/SRC/openSUSE:Factory/u-boot/u-boot-a10-olinuxino-lime.changes 2015-08-10 09:16:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-a10-olinuxino-lime.changes 2015-09-19 06:54:36.000000000 +0200 @@ -1,0 +2,24 @@ +Sat Sep 12 12:22:53 UTC 2015 - guillaume(a)opensuse.org + +- Use u-boot-2015.10-rc3.tar.bz2 package provided on FTP instead of + packaging it manually. + +------------------------------------------------------------------- +Tue Sep 8 08:52:56 UTC 2015 - guillaume(a)opensuse.org + +- Update to 2015.10-rc3 + +------------------------------------------------------------------- +Wed Sep 2 16:28:02 UTC 2015 - guillaume(a)opensuse.org + +- Add odroid and odroid-xu3 + +------------------------------------------------------------------- +Tue Aug 18 08:31:48 UTC 2015 - guillaume(a)opensuse.org + +- Update to 2015.10-rc2 +- Remove upstreamed patch: + * jetson-tk1-gpu-1.patch + * jetson-tk1-gpu-2.patch + +------------------------------------------------------------------- u-boot-a13-olinuxino.changes: same change u-boot-a13-olinuxinom.changes: same change u-boot-a20-olinuxino-lime.changes: same change u-boot-a20-olinuxino-lime2.changes: same change u-boot-a20-olinuxinomicro.changes: same change u-boot-am335xevm.changes: same change u-boot-arndale.changes: same change u-boot-bananapi.changes: same change u-boot-colibrit20.changes: same change u-boot-cubieboard.changes: same change u-boot-cubieboard2.changes: same change u-boot-cubietruck.changes: same change u-boot-highbank.changes: same change u-boot-jetson-tk1.changes: same change u-boot-melea1000.changes: same change u-boot-merriia80optimus.changes: same change u-boot-mx53loco.changes: same change u-boot-mx6cuboxi.changes: same change u-boot-mx6qsabrelite.changes: same change New Changes file: --- /dev/null 2015-08-24 19:43:32.284261900 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-odroid-xu3.changes 2015-09-19 06:54:37.000000000 +0200 @@ -0,0 +1,824 @@ +------------------------------------------------------------------- +Sat Sep 12 12:22:53 UTC 2015 - guillaume(a)opensuse.org + +- Use u-boot-2015.10-rc3.tar.bz2 package provided on FTP instead of + packaging it manually. + +------------------------------------------------------------------- +Tue Sep 8 08:52:56 UTC 2015 - guillaume(a)opensuse.org + +- Update to 2015.10-rc3 + +------------------------------------------------------------------- +Wed Sep 2 16:28:02 UTC 2015 - guillaume(a)opensuse.org + +- Add odroid and odroid-xu3 + +------------------------------------------------------------------- +Tue Aug 18 08:31:48 UTC 2015 - guillaume(a)opensuse.org + +- Update to 2015.10-rc2 +- Remove upstreamed patch: + * jetson-tk1-gpu-1.patch + * jetson-tk1-gpu-2.patch + +------------------------------------------------------------------- +Thu Aug 6 12:40:58 UTC 2015 - guillaume(a)opensuse.org + +- Update to 2015.10-rc1 +- Remove upstreamed patch: + * mx53loco-bootscr.patch +- Update patches: + * jetson-tk1-gpu-1.patch + * jetson-tk1-gpu-2.patch + +------------------------------------------------------------------- +Wed Aug 5 13:36:45 UTC 2015 - dmueller(a)suse.com + +- add mx6cuboxi + +------------------------------------------------------------------- +Wed Jul 22 22:38:23 UTC 2015 - afaerber(a)suse.de + +- jetson-tk1-gpu-1.patch, + jetson-tk1-gpu-2.patch: Enable the Tegra124 GPU device tree node + +------------------------------------------------------------------- +Mon Jul 20 10:45:39 UTC 2015 - afaerber(a)suse.de + +- Add u-boot-jetson-tk1 + +------------------------------------------------------------------- +Fri Jul 17 06:42:37 UTC 2015 - afaerber(a)suse.de + +- Add u-boot-merriia80optimus + +------------------------------------------------------------------- +Wed Jul 15 13:05:24 UTC 2015 - guillaume(a)opensuse.org + +- Update to 2015.07 + +------------------------------------------------------------------- +Tue Jun 30 07:34:49 UTC 2015 - guillaume(a)opensuse.org + +- Update to 2015.07-rc3 +- Remove upstreamed patches: + * enable_spl_ext_support_for_ti_armv7.patch + * fix_slow_mmc_on_rpi.patch + +------------------------------------------------------------------- +Thu Jun 18 12:07:10 UTC 2015 - guillaume(a)opensuse.org + +- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi +- Rework patches (to be upstreamable): + * enable_spl_ext_support_for_ti_armv7.patch + * mx53loco-bootscr.patch +- Remove fix_beagle_spl_build.patch + +------------------------------------------------------------------- +Wed Jun 10 10:07:23 UTC 2015 - guillaume(a)opensuse.org + +- Update to 2015.07-rc2 +- Update drop-marvell.patch + +------------------------------------------------------------------- +Wed May 27 10:07:49 UTC 2015 - guillaume(a)opensuse.org + +- Update to 2015.07-rc1: +- Update drop-marvell.patch +- Remove no more needed add_snow_usb_boot.patch + +------------------------------------------------------------------- +Wed Apr 29 07:51:25 UTC 2015 - dmueller(a)suse.com + +- adjust copyright headers + +------------------------------------------------------------------- +Thu Apr 16 08:34:11 UTC 2015 - guillaume(a)opensuse.org + +- update to 2015.04 +- Remove upstreamed patch: + 0001-Exynos-Clock-Fix-exynos5_get_periph_rate-for-I2C.patch +- Follow upstream board rename colibri_t20_iris => colibri_t20 + +------------------------------------------------------------------- +Sun Apr 12 19:49:41 UTC 2015 - xxxxxmichl(a)googlemail.com + +- Added support for A13-OLinuXino, A13-OLinuXino-MICRO, + A20-OLinuXino-MICRO and A20-OLinuXino-LIME from + www.olimex.com + +------------------------------------------------------------------- +Thu Apr 9 07:56:40 UTC 2015 - guillaume(a)opensuse.org + +- Remove u-boot-vexpressaemv8a (dropped upstream and we now use EFI) + +------------------------------------------------------------------- +Thu Apr 2 09:13:49 UTC 2015 - guillaume(a)opensuse.org + +- update to 2015.04-rc5 + +------------------------------------------------------------------- +Mon Mar 23 08:39:40 UTC 2015 - guillaume(a)opensuse.org + +- update to 2015.04-rc4 + +------------------------------------------------------------------- +Wed Mar 4 15:51:55 UTC 2015 - guillaume(a)opensuse.org + +- Add 0001-Exynos-Clock-Fix-exynos5_get_periph_rate-for-I2C.patch + to fix keyboard on Chromebook + +------------------------------------------------------------------- +Wed Mar 4 15:46:52 UTC 2015 - guillaume(a)opensuse.org + +- update to 2015.04-rc3 +- update patch: drop-marvell.patch + +------------------------------------------------------------------- +Thu Feb 26 16:48:35 UTC 2015 - guillaume(a)opensuse.org + +- Update add_snow_usb_boot.patch to boot on USB2 instead of USB3 + +------------------------------------------------------------------- +Wed Feb 25 15:47:07 UTC 2015 - guillaume(a)opensuse.org + +- Remove unneeded fix_snow_config.patch + +------------------------------------------------------------------- +Tue Feb 24 09:48:50 UTC 2015 - guillaume(a)opensuse.org + +- Add rpi2 armv7 board + +------------------------------------------------------------------- +Fri Feb 20 12:31:38 UTC 2015 - guillaume(a)opensuse.org + +- Update to 2015.04-rc2 + +------------------------------------------------------------------- +Fri Feb 20 10:04:14 UTC 2015 - guillaume(a)opensuse.org + +- Update to 2015.04-rc1 + * Remove upstreamed patch pcm051-bootscr.patch + * Remove no more used patch fix_bootpart_snow_only.patch (now u-boot + scan all known partitions, so no need to set a different boot partition) + +------------------------------------------------------------------- +Sun Jan 25 20:20:46 UTC 2015 - matwey.kornilov(a)gmail.com + +- Enable pcm051rev3 for Phytec Wega board + * Add pcm051-bootscr.patch: add bootscript support (upstreamed in 2015.04-rc1) + +------------------------------------------------------------------- +Tue Jan 13 14:32:17 UTC 2015 - guillaume(a)opensuse.org + +- Update to 2015.01: + * Drop upstreamed patches: + - 0001-spl-mmc-Fix-raw-boot-mode-related-to-commit.patch + - fix_sata.patch + * Update partially upstreamed mx53loco-bootscr.patch + +------------------------------------------------------------------- +Tue Dec 16 11:10:23 UTC 2014 - guillaume(a)opensuse.org + +- Backport SPL MMC raw boot mode fix: + * 0001-spl-mmc-Fix-raw-boot-mode-related-to-commit.patch + +------------------------------------------------------------------- +Sat Dec 13 12:12:41 UTC 2014 - xxxxxmichl(a)googlemail.com + +- Added support for A20-OLinuXIno-LIME2 and A10-OLinuXino-LIME from + www.olimex.com + +------------------------------------------------------------------- +Tue Dec 9 11:23:41 UTC 2014 - guillaume(a)opensuse.org + +- Rename XLOADER to OMAP_SPL in pre_checkin.sh and u-boot.spec.in + ++++ 627 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-odroid-xu3.changes New Changes file: u-boot-odroid.changes: same change --- /work/SRC/openSUSE:Factory/u-boot/u-boot-omap3beagle.changes 2015-08-10 09:16:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-omap3beagle.changes 2015-09-19 06:54:37.000000000 +0200 @@ -1,0 +2,24 @@ +Sat Sep 12 12:22:53 UTC 2015 - guillaume(a)opensuse.org + +- Use u-boot-2015.10-rc3.tar.bz2 package provided on FTP instead of + packaging it manually. + +------------------------------------------------------------------- +Tue Sep 8 08:52:56 UTC 2015 - guillaume(a)opensuse.org + +- Update to 2015.10-rc3 + +------------------------------------------------------------------- +Wed Sep 2 16:28:02 UTC 2015 - guillaume(a)opensuse.org + +- Add odroid and odroid-xu3 + +------------------------------------------------------------------- +Tue Aug 18 08:31:48 UTC 2015 - guillaume(a)opensuse.org + +- Update to 2015.10-rc2 +- Remove upstreamed patch: + * jetson-tk1-gpu-1.patch + * jetson-tk1-gpu-2.patch + +------------------------------------------------------------------- u-boot-omap4panda.changes: same change u-boot-paz00.changes: same change u-boot-pcm051rev3.changes: same change u-boot-rpi.changes: same change u-boot-rpi2.changes: same change u-boot-snow.changes: same change u-boot.changes: same change Old: ---- jetson-tk1-gpu-1.patch jetson-tk1-gpu-2.patch u-boot-2015.10-rc1.tar.bz2 New: ---- u-boot-2015.10-rc3.tar.bz2 u-boot-odroid-xu3.changes u-boot-odroid-xu3.spec u-boot-odroid.changes u-boot-odroid.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot-a10-olinuxino-lime.spec ++++++ --- /var/tmp/diff_new_pack.EVX8NT/_old 2015-09-19 06:54:41.000000000 +0200 +++ /var/tmp/diff_new_pack.EVX8NT/_new 2015-09-19 06:54:41.000000000 +0200 @@ -25,10 +25,10 @@ %define cuboxi_spl 0 # archive_version differs from version for RC version only -%define archive_version 2015.10-rc1 +%define archive_version 2015.10-rc3 Name: u-boot-a10-olinuxino-lime -Version: 2015.10~rc1 +Version: 2015.10~rc3 Release: 0 Summary: The u-boot firmware for the a10-olinuxino-lime arm platform License: GPL-2.0 @@ -37,8 +37,6 @@ Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch51: jetson-tk1-gpu-1.patch -Patch52: jetson-tk1-gpu-2.patch # Marvell boards support is non-free licensed, and we don't need it (bnc#773824) Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -70,8 +68,6 @@ # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%patch51 -p1 -%patch52 -p1 %patch99 -p1 %build u-boot-a13-olinuxino.spec: same change u-boot-a13-olinuxinom.spec: same change u-boot-a20-olinuxino-lime.spec: same change u-boot-a20-olinuxino-lime2.spec: same change u-boot-a20-olinuxinomicro.spec: same change u-boot-am335xevm.spec: same change u-boot-arndale.spec: same change u-boot-bananapi.spec: same change u-boot-colibrit20.spec: same change u-boot-cubieboard.spec: same change u-boot-cubieboard2.spec: same change u-boot-cubietruck.spec: same change u-boot-highbank.spec: same change u-boot-jetson-tk1.spec: same change u-boot-melea1000.spec: same change u-boot-merriia80optimus.spec: same change u-boot-mx53loco.spec: same change ++++++ u-boot-mx6cuboxi.spec ++++++ --- /var/tmp/diff_new_pack.EVX8NT/_old 2015-09-19 06:54:41.000000000 +0200 +++ /var/tmp/diff_new_pack.EVX8NT/_new 2015-09-19 06:54:41.000000000 +0200 @@ -25,10 +25,10 @@ %define cuboxi_spl 1 # archive_version differs from version for RC version only -%define archive_version 2015.10-rc1 +%define archive_version 2015.10-rc3 Name: u-boot-mx6cuboxi -Version: 2015.10~rc1 +Version: 2015.10~rc3 Release: 0 Summary: The u-boot firmware for the mx6cuboxi arm platform License: GPL-2.0 @@ -37,8 +37,6 @@ Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch51: jetson-tk1-gpu-1.patch -Patch52: jetson-tk1-gpu-2.patch # Marvell boards support is non-free licensed, and we don't need it (bnc#773824) Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -70,8 +68,6 @@ # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%patch51 -p1 -%patch52 -p1 %patch99 -p1 %build ++++++ u-boot-mx6qsabrelite.spec ++++++ --- /var/tmp/diff_new_pack.EVX8NT/_old 2015-09-19 06:54:42.000000000 +0200 +++ /var/tmp/diff_new_pack.EVX8NT/_new 2015-09-19 06:54:42.000000000 +0200 @@ -25,10 +25,10 @@ %define cuboxi_spl 0 # archive_version differs from version for RC version only -%define archive_version 2015.10-rc1 +%define archive_version 2015.10-rc3 Name: u-boot-mx6qsabrelite -Version: 2015.10~rc1 +Version: 2015.10~rc3 Release: 0 Summary: The u-boot firmware for the mx6qsabrelite arm platform License: GPL-2.0 @@ -37,8 +37,6 @@ Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch51: jetson-tk1-gpu-1.patch -Patch52: jetson-tk1-gpu-2.patch # Marvell boards support is non-free licensed, and we don't need it (bnc#773824) Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -70,8 +68,6 @@ # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%patch51 -p1 -%patch52 -p1 %patch99 -p1 %build ++++++ u-boot-odroid-xu3.spec ++++++ # # spec file for package u-boot-odroid-xu3 # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon # Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco(a)mambasoft.it> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define x_loader 0 %define origen_spl 0 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 0 # archive_version differs from version for RC version only %define archive_version 2015.10-rc3 Name: u-boot-odroid-xu3 Version: 2015.10~rc3 Release: 0 Summary: The u-boot firmware for the odroid-xu3 arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc # Marvell boards support is non-free licensed, and we don't need it (bnc#773824) Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) %if %x_loader == 1 Obsoletes: x-loader-odroid-xu3 Provides: x-loader-odroid-xu3 %endif ExclusiveArch: armv7l armv7hl %description Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains the firmware for the odroid-xu3 arm platform. %package doc Summary: Documentation for the u-boot Firmware Group: Documentation/Other %description doc Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains documentation for u-boot firmware %prep %setup -q -n u-boot-%{archive_version} # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot %patch99 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" odroid-xu3_defconfig make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif %install %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do install -D -m 0644 $f %{buildroot}/boot/$f done %else # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then install -D -m 0644 u-boot-dtb-tegra.bin %{buildroot}/boot/u-boot.bin elif [ -f u-boot-dtb.bin ]; then install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin else install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin fi %endif %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO %endif %if %origen_spl == 1 install -D -m 0755 spl/origen-spl.bin %{buildroot}/boot/origen-spl.bin %endif %if %arndale_spl == 1 install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin %endif %files %defattr(-,root,root) /boot/* %doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) # Generic documents %doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands %doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns %doc doc/README.hwconfig doc/README.nand doc/README.NetConsole doc/README.serial_multi %doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb %doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST doc/README.Modem # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation %doc doc/README.ARM-memory-map %changelog ++++++ u-boot-odroid.spec ++++++ # # spec file for package u-boot-odroid # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon # Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco(a)mambasoft.it> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define x_loader 0 %define origen_spl 0 %define sunxi_spl 0 %define arndale_spl 0 %define cuboxi_spl 0 # archive_version differs from version for RC version only %define archive_version 2015.10-rc3 Name: u-boot-odroid Version: 2015.10~rc3 Release: 0 Summary: The u-boot firmware for the odroid arm platform License: GPL-2.0 Group: System/Boot Url: http://www.denx.de/wiki/U-Boot Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc # Marvell boards support is non-free licensed, and we don't need it (bnc#773824) Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) %if %x_loader == 1 Obsoletes: x-loader-odroid Provides: x-loader-odroid %endif ExclusiveArch: armv7l armv7hl %description Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains the firmware for the odroid arm platform. %package doc Summary: Documentation for the u-boot Firmware Group: Documentation/Other %description doc Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. This package contains documentation for u-boot firmware %prep %setup -q -n u-boot-%{archive_version} # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot %patch99 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" odroid_defconfig make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif %install %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do install -D -m 0644 $f %{buildroot}/boot/$f done %else # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then install -D -m 0644 u-boot-dtb-tegra.bin %{buildroot}/boot/u-boot.bin elif [ -f u-boot-dtb.bin ]; then install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin else install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin fi %endif %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO %endif %if %origen_spl == 1 install -D -m 0755 spl/origen-spl.bin %{buildroot}/boot/origen-spl.bin %endif %if %arndale_spl == 1 install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin %endif %files %defattr(-,root,root) /boot/* %doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) # Generic documents %doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands %doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns %doc doc/README.hwconfig doc/README.nand doc/README.NetConsole doc/README.serial_multi %doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb %doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST doc/README.Modem # Copy some useful kermit scripts as well %doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation %doc doc/README.ARM-memory-map %changelog ++++++ u-boot-omap3beagle.spec ++++++ --- /var/tmp/diff_new_pack.EVX8NT/_old 2015-09-19 06:54:42.000000000 +0200 +++ /var/tmp/diff_new_pack.EVX8NT/_new 2015-09-19 06:54:42.000000000 +0200 @@ -25,10 +25,10 @@ %define cuboxi_spl 0 # archive_version differs from version for RC version only -%define archive_version 2015.10-rc1 +%define archive_version 2015.10-rc3 Name: u-boot-omap3beagle -Version: 2015.10~rc1 +Version: 2015.10~rc3 Release: 0 Summary: The u-boot firmware for the omap3beagle arm platform License: GPL-2.0 @@ -37,8 +37,6 @@ Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch51: jetson-tk1-gpu-1.patch -Patch52: jetson-tk1-gpu-2.patch # Marvell boards support is non-free licensed, and we don't need it (bnc#773824) Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -70,8 +68,6 @@ # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%patch51 -p1 -%patch52 -p1 %patch99 -p1 %build u-boot-omap4panda.spec: same change u-boot-paz00.spec: same change u-boot-pcm051rev3.spec: same change u-boot-rpi.spec: same change u-boot-rpi2.spec: same change u-boot-snow.spec: same change ++++++ u-boot.spec ++++++ --- /var/tmp/diff_new_pack.EVX8NT/_old 2015-09-19 06:54:42.000000000 +0200 +++ /var/tmp/diff_new_pack.EVX8NT/_new 2015-09-19 06:54:42.000000000 +0200 @@ -19,10 +19,10 @@ # 'archive_version' differs from 'version' for RC version only -%define archive_version 2015.10-rc1 +%define archive_version 2015.10-rc3 Name: u-boot -Version: 2015.10~rc1 +Version: 2015.10~rc3 Release: 0 Summary: Tools for the u-boot Firmware License: GPL-2.0 ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.EVX8NT/_old 2015-09-19 06:54:42.000000000 +0200 +++ /var/tmp/diff_new_pack.EVX8NT/_new 2015-09-19 06:54:42.000000000 +0200 @@ -5,7 +5,7 @@ ARCH_RESTRICTIONS="$3 $4" armv6_boards="rpi" -armv7_boards="omap3_beagle omap4_panda am335x_evm arndale highbank mx53loco mx6cuboxi mx6qsabrelite Bananapi Cubieboard Cubieboard2 Cubietruck Mele_A1000 colibri_t20 paz00 snow A10-OLinuXino-Lime A20-OLinuXino-Lime2 pcm051_rev3 rpi_2 A20-OLinuXino-Lime A13-OLinuXinoM A13-OLinuXino A20-OLinuXino_MICRO Merrii_A80_Optimus jetson-tk1" +armv7_boards="omap3_beagle omap4_panda am335x_evm arndale highbank mx53loco mx6cuboxi mx6qsabrelite Bananapi Cubieboard Cubieboard2 Cubietruck Mele_A1000 colibri_t20 paz00 snow A10-OLinuXino-Lime A20-OLinuXino-Lime2 pcm051_rev3 rpi_2 A20-OLinuXino-Lime A13-OLinuXinoM A13-OLinuXino A20-OLinuXino_MICRO Merrii_A80_Optimus jetson-tk1 odroid odroid-xu3" aarch64_boards="" if [ ! "$1" -o ! "$2" -o ! "$3" ]; then ++++++ u-boot-2015.10-rc1.tar.bz2 -> u-boot-2015.10-rc3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/u-boot/u-boot-2015.10-rc1.tar.bz2 /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-2015.10-rc3.tar.bz2 differ: char 11, line 1 ++++++ u-boot.spec.in ++++++ --- /var/tmp/diff_new_pack.EVX8NT/_old 2015-09-19 06:54:42.000000000 +0200 +++ /var/tmp/diff_new_pack.EVX8NT/_new 2015-09-19 06:54:42.000000000 +0200 @@ -25,10 +25,10 @@ %define cuboxi_spl CUBOXI_SPL # archive_version differs from version for RC version only -%define archive_version 2015.10-rc1 +%define archive_version 2015.10-rc3 Name: u-boot-BOARDNAME -Version: 2015.10~rc1 +Version: 2015.10~rc3 Release: 0 Summary: The u-boot firmware for the BOARDNAME arm platform License: GPL-2.0 @@ -37,8 +37,6 @@ Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -Patch51: jetson-tk1-gpu-1.patch -Patch52: jetson-tk1-gpu-2.patch # Marvell boards support is non-free licensed, and we don't need it (bnc#773824) Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -70,8 +68,6 @@ # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell # Any custom patches to be applied on top of mainline u-boot -%patch51 -p1 -%patch52 -p1 %patch99 -p1 %build

1 0

commit apache-rpm-macros for openSUSE:Factory
by root＠hilbert.suse.de 19 Sep '15

19 Sep '15

Hello community, here is the log from the commit of package apache-rpm-macros for openSUSE:Factory checked in at 2015-09-19 06:54:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.apache-rpm-macros.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache-rpm-macros" Changes: -------- --- /work/SRC/openSUSE:Factory/apache-rpm-macros/apache-rpm-macros.changes 2015-08-07 00:18:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apache-rpm-macros.new/apache-rpm-macros.changes 2015-09-19 06:54:33.000000000 +0200 @@ -1,0 +2,41 @@ +Fri Sep 18 08:18:45 UTC 2015 - pgajdos(a)suse.com + +- version 20150918 +- -m is no longer required (see apache2-mod_apreq2 for usecase) + +------------------------------------------------------------------- +Tue Sep 15 09:13:18 UTC 2015 - pgajdos(a)suse.com + +- version 20150915 +- new macro: %apache_access_syntax_version + +------------------------------------------------------------------- +Sat Sep 5 07:22:53 UTC 2015 - pgajdos(a)suse.com + +- version 20150904 +- new macros: %apache_test_module_curl, %apache_test_module_dir + +------------------------------------------------------------------- +Thu Sep 3 08:36:35 UTC 2015 - pgajdos(a)suse.com + +- version 20150903 +- %apache_test_module_start_apache: + * better check that httpd is really running + * add -p to mkdir test to not fail if test exist and do not + remove test dir + +------------------------------------------------------------------- +Mon Aug 31 08:30:28 UTC 2015 - pgajdos(a)suse.com + +- bump version to 20150902 + +------------------------------------------------------------------- +Fri Aug 28 08:27:11 UTC 2015 - pgajdos(a)suse.com + +- added macros to test loading modules + %apache_test_module_start_apache + %apache_test_module_stop_apache + %apache_test_module_load + + macros.apache-module-test + +------------------------------------------------------------------- New: ---- macros.apache-module-test ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.TcMwmG/_old 2015-09-19 06:54:34.000000000 +0200 +++ /var/tmp/diff_new_pack.TcMwmG/_new 2015-09-19 06:54:34.000000000 +0200 @@ -35,6 +35,7 @@ %define ap_datadir %(%{ap_apxs} -q DATADIR) %define ap_user wwwrun %define ap_group www +%define ap_access_syntax_version %(if [ $(grep -c '^[[:space:]]*Require all denied' /etc/apache2/httpd.conf) -gt 0 ]; then echo 24; else echo 22; fi) # %if 0%{?suse_version} > 1230 %define macros_dir %{_libexecdir}/rpm/macros.d @@ -43,12 +44,13 @@ %endif %define macros_file macros.apache Name: apache-rpm-macros -Version: 20150717 +Version: 20150918 Release: 0 Summary: Apache RPM Macros License: Apache-2.0 Group: Productivity/Networking/Web/Servers Url: http://httpd.apache.org/ +Source1: macros.apache-module-test BuildRequires: apache%{ap_major}-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -74,7 +76,10 @@ %%apache_datadir %{ap_datadir} %%apache_user %{ap_user} %%apache_group %{ap_group} +%%apache_access_syntax_version %{ap_access_syntax_version} eom +echo >> %{macros_file} +cat %{SOURCE1} >> %{macros_file} %install mkdir -p %{buildroot}%{macros_dir} ++++++ macros.apache-module-test ++++++ %__test_dir /tmp/%{name}-test %__test_mpm prefork %__test_user abuild %__test_group abuild %__test_port 60080 # world writeable dir for testing purposes (logs, document root, ..) %apache_test_module_dir %{__test_dir} # # macro: apache_test_module_start_apache -- start apache with specified modules loaded # # usage: apache_test_module_start_apache -m module_list [-i include_list] [-r document_root] # # module_list: colon separated list of module names to be loaded with test run # search path: %{buildroot} tree # %{apache_libexecdir}-prefork # %{apache_libexecdir} # [example value: asn:dbd] # include_list: colon separated list of names of apache configuration files # to be included; can be either existing path or just name # of the configuration file,which will be searched under: # %{buildroot}%{apache_sysconfdir} tree # $PWD tree # %{apache_test_module_dir} # [example value: mod_asn.conf] # document_root: document root of the test server, # [default value: $PWD/test/htdocs] # # %apache_test_module_start_apache(m:,i:,r:) \ # constants \ TEST_DIR='%{__test_dir}' \ TEST_MPM='%{__test_mpm}' \ TEST_USER='%{__test_user}' \ TEST_GROUP='%{__test_group}' \ TEST_PORT='%{__test_port}' \ # arguments \ # modules to load, from BUILD tree or system \ MODULES=$(echo %{-m:%{-m*}} | tr ':' ' ') \ # configs to include \ CONFIGS="%{-i:%{-i*}}" \ # document root of the test server \ DOCUMENT_ROOT="%{-r:%{-r*}}" \ if [ -z "$DOCUMENT_ROOT" ]; then \ DOCUMENT_ROOT=$TEST_DIR/htdocs \ fi \ # helpers \ APACHE_BRANCH=$(echo %{apache_branch} | tr -d '.') \ # begin \ echo "-----------------------------------------------------------" \ echo "APACHE MODULE TEST" \ echo \ echo "modules to load: $MODULES" \ echo "configs to include: $CONFIGS" \ # create test dir \ mkdir -p $TEST_DIR \ # create document root if not exist \ mkdir -p $DOCUMENT_ROOT \ # create test/httpd-test.conf \ TEST_CONF_FILE="$TEST_DIR/httpd.conf" \ SYSTEM_MODULE_PATH="%{apache_libexecdir}-$TEST_MPM" \ echo "ServerName test" > $TEST_CONF_FILE \ echo "User $TEST_USER" >> $TEST_CONF_FILE \ echo "Group $TEST_GROUP" >> $TEST_CONF_FILE \ echo "Listen $TEST_PORT" >> $TEST_CONF_FILE \ echo "PidFile $TEST_DIR/pid" >> $TEST_CONF_FILE \ echo "ErrorLog $TEST_DIR/error_log" >> $TEST_CONF_FILE \ echo "LoadModule dir_module $SYSTEM_MODULE_PATH/mod_dir.so" >> $TEST_CONF_FILE \ echo "LoadModule auth_basic_module $SYSTEM_MODULE_PATH/mod_auth_basic.so" >> $TEST_CONF_FILE \ if [ $APACHE_BRANCH -ge 24 ]; then \ echo "LoadModule authz_core_module $SYSTEM_MODULE_PATH/mod_authz_core.so" >> $TEST_CONF_FILE \ fi \ echo "LoadModule authz_host_module $SYSTEM_MODULE_PATH/mod_authz_host.so" >> $TEST_CONF_FILE \ for m in $(echo $MODULES | tr ':' ' '); do \ module_path=$(find %{buildroot} %{apache_libexecdir}-$TEST_MPM %{apache_libexecdir} -name "mod_$m.so" | tail -n 1) \ if [ -z "$module_path" ]; then \ echo "ERROR: Module $m not found." \ exit 1 \ fi \ echo "Will load ${m}_module $module_path" \ echo "LoadModule ${m}_module $module_path" >> $TEST_CONF_FILE \ done \ for c in $(echo $CONFIGS | tr ':' ' '); do \ if [ -f $c ]; then \ if [[ ! "$c" = /* ]]; then \ c="$PWD/$c" \ fi \ include_path="$c" \ else \ include_path=$(find %{buildroot}%{apache_sysconfdir} %{apache_test_module_dir} $PWD -name "$c" 2>/dev/null | tail -n 1) \ fi \ if [ -z "$include_path" ]; then \ echo "ERROR: Config file $c not found." \ exit 1 \ fi \ echo "Will include $include_path" \ echo "Include $include_path" >> $TEST_CONF_FILE \ done \ echo "DocumentRoot $DOCUMENT_ROOT" >> $TEST_CONF_FILE \ echo "DirectoryIndex index.html" >> $TEST_CONF_FILE \ echo "<Directory $DOCUMENT_ROOT>" >> $TEST_CONF_FILE \ if [ $APACHE_BRANCH -ge 24 ]; then \ echo " Require local" >> $TEST_CONF_FILE \ else \ echo " Order deny,allow" >> $TEST_CONF_FILE \ echo " Deny from all" >> $TEST_CONF_FILE \ echo " Allow from localhost" >> $TEST_CONF_FILE \ fi \ echo "</Directory>" >> $TEST_CONF_FILE \ # run apache \ CMD=$(ls %{_sbindir}/httpd*-$TEST_MPM | head -n 1) \ echo -n "Starting Apache ... " \ $CMD -f $TEST_CONF_FILE -k start \ # wait to be sure apache finished start \ sleep 2 \ if [ ! -f $TEST_DIR/pid ]; then \ echo "FAILED:" \ cat $TEST_DIR/error_log \ echo "See $PWD/$TEST_DIR for details" \ exit 1 \ fi \ echo "SUCCESS" \ %nil # # macro: apache_test_module_stop_apache -- stops apache previously started with *_start_apache # # usage: apache_test_module_stop_apache # %apache_test_module_stop_apache() \ TEST_DIR='%{__test_dir}' \ # stop apache \ echo "Stopping Apache ..." \ kill -TERM `cat $TEST_DIR/pid` \ echo "Done." \ echo "-----------------------------------------------------------" \ %nil # # macro: apache_test_module_curl -- outputs curl on particular document relative to # document root of test instance # # usage: apache_test_module_curl -d document_to_curl -o output_of_curl # example: apache_test_module_curl -d foo/test.html -o test.html # apache_test_module_curl -d foo/ -o output.txt # %apache_test_module_curl(d:,o:) \ TEST_DOCUMENT="%{-d:%{-d*}}" \ TEST_OUTPUT="%{-o:%{-o*}}" \ if [ -z "$TEST_OUTPUT" ]; then \ echo "Missing argument -o to apache_test_module_curl." \ exit 1 \ fi \ curl -s "http://localhost:%{__test_port}/$TEST_DOCUMENT" --create-dirs -o "$TEST_OUTPUT" \ %nil # # macro: apache_test_module_load -- tests that module(s) can be loaded # # usage: apache_test_module_load -m module_list [-i include_list] # # module_list: colon separated list of module names to be loaded with test run # search path: %{buildroot} tree # %{apache_libexecdir}-prefork # %{apache_libexecdir} # [example value: asn:dbd] # include_list: colon separated list of names of apache configuration files # to be included (path relative to current dir) # search path %{buildroot}%{apache_sysconfdir} tree # $PWD tree # [example value: mod_asn.conf] # %apache_test_module_load(m:,i:) \ %apache_test_module_start_apache %{-m:-m %{-m*}} %{-i:-i %{-i*}} \ %apache_test_module_stop_apache \ %nil

1 0