I have made the following changes intended for : nemo:devel:mw / telepathy-gabble
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.merproject.org//request/show/268 Thank You, John Brooks [This message was auto-generated] --- Request # 268: Messages from BOSS: State: review at 2013-04-29T08:43:59 by cibot Reviews: accepted by cibot : Prechecks succeeded. new for nemo:devel:mw : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:jbrooks:branches:nemo:devel:mw / telepathy-gabble -> nemo:devel:mw / telepathy-gabble changes files: -------------- --- telepathy-gabble.changes +++ telepathy-gabble.changes @@ -0,0 +1,5 @@ +* Sun Apr 28 2013 John Brooks <[email protected]> - 0.17.3 +- Update to 0.17.3 +- Add 0.17.3-fix-fdo-61792.patch adapted from master to fix a build failure +- Add 0001-Disable-parallel-build-for-extensions-directory.patch to fix occasional build failures + old: ---- telepathy-gabble-0.17.1.tar.gz new: ---- 0.17.3-fix-fdo-61792.patch 0001-Disable-parallel-build-for-extensions-directory.patch telepathy-gabble-0.17.3.tar.gz spec files: ----------- --- telepathy-gabble.spec +++ telepathy-gabble.spec @@ -9,7 +9,7 @@ # << macros Summary: A Jabber/XMPP connection manager -Version: 0.17.1 +Version: 0.17.3 Release: 1 Group: Applications/Communications License: LGPLv2+ and BSD @@ -19,6 +19,8 @@ Source2: mktests.sh Source100: telepathy-gabble.yaml Patch0: nemo-tests-dir-fix.patch +Patch1: 0.17.3-fix-fdo-61792.patch +Patch2: 0001-Disable-parallel-build-for-extensions-directory.patch Requires: telepathy-filesystem Requires: telepathy-mission-control Requires(post): /sbin/ldconfig @@ -67,6 +69,10 @@ # nemo-tests-dir-fix.patch %patch0 -p1 +# 0.17.3-fix-fdo-61792.patch +%patch1 -p1 +# 0001-Disable-parallel-build-for-extensions-directory.patch +%patch2 -p1 # >> setup %__cp $RPM_SOURCE_DIR/mktests.sh tests/ %__cp $RPM_SOURCE_DIR/INSIGNIFICANT tests/ other changes: -------------- ++++++ 0.17.3-fix-fdo-61792.patch (new) --- 0.17.3-fix-fdo-61792.patch +++ 0.17.3-fix-fdo-61792.patch @@ -0,0 +1,131 @@ +diff -u a/lib/ext/wocky/examples/Makefile.am b/lib/ext/wocky/examples/Makefile.am +--- a/lib/ext/wocky/examples/Makefile.am 2013-03-01 15:06:50.000000000 +0000 ++++ b/lib/ext/wocky/examples/Makefile.am 2013-04-29 04:23:10.905405190 +0000 +@@ -13,6 +13,8 @@ + + wocky_dump_certificates_SOURCES = dump-certificates.c + wocky_dump_certificates_DEPENDENCIES = $(top_builddir)/wocky/libwocky.la ++wocky_dump_certificates_CFLAGS = $(TLS_CFLAGS) $(AM_CFLAGS) ++wocky_dump_certificates_LDADD = $(TLS_LIBS) $(LDADD) + + wocky_send_message_SOURCES = send-message.c + wocky_send_message_DEPENDENCIES = $(top_builddir)/wocky/libwocky.la +diff -u a/lib/ext/wocky/examples/Makefile.in b/lib/ext/wocky/examples/Makefile.in +--- a/lib/ext/wocky/examples/Makefile.in 2013-04-29 04:32:29.453405190 +0000 ++++ b/lib/ext/wocky/examples/Makefile.in 2013-04-29 04:38:16.373405190 +0000 +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11.6 from Makefile.am. ++# Makefile.in generated by automake 1.11.3 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -16,23 +16,6 @@ + @SET_MAKE@ + + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ +- case $$MAKEFLAGS in \ +- *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ +- esac; \ +- test $$am__dry = yes; \ +- } + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -76,13 +59,19 @@ + wocky-receive-messages$(EXEEXT) wocky-register$(EXEEXT) \ + wocky-unregister$(EXEEXT) + PROGRAMS = $(noinst_PROGRAMS) +-am_wocky_dump_certificates_OBJECTS = dump-certificates.$(OBJEXT) ++am_wocky_dump_certificates_OBJECTS = \ ++ wocky_dump_certificates-dump-certificates.$(OBJEXT) + wocky_dump_certificates_OBJECTS = \ + $(am_wocky_dump_certificates_OBJECTS) +-wocky_dump_certificates_LDADD = $(LDADD) ++am__DEPENDENCIES_1 = ++am__DEPENDENCIES_2 = $(top_builddir)/wocky/libwocky.la + AM_V_lt = $(am__v_lt_@AM_V@) + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) + am__v_lt_0 = --silent ++wocky_dump_certificates_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(wocky_dump_certificates_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + am_wocky_receive_messages_OBJECTS = receive-messages.$(OBJEXT) + wocky_receive_messages_OBJECTS = $(am_wocky_receive_messages_OBJECTS) + wocky_receive_messages_LDADD = $(LDADD) +@@ -127,11 +116,6 @@ + DIST_SOURCES = $(wocky_dump_certificates_SOURCES) \ + $(wocky_receive_messages_SOURCES) $(wocky_register_SOURCES) \ + $(wocky_send_message_SOURCES) $(wocky_unregister_SOURCES) +-am__can_run_installinfo = \ +- case $$AM_UPDATE_INFO_DIR in \ +- n|no|NO) false;; \ +- *) (install-info --version) >/dev/null 2>&1;; \ +- esac + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -296,6 +280,8 @@ + INCLUDES := -I$(top_builddir)/wocky + wocky_dump_certificates_SOURCES = dump-certificates.c + wocky_dump_certificates_DEPENDENCIES = $(top_builddir)/wocky/libwocky.la ++wocky_dump_certificates_CFLAGS = $(TLS_CFLAGS) $(AM_CFLAGS) ++wocky_dump_certificates_LDADD = $(TLS_LIBS) $(LDADD) + wocky_send_message_SOURCES = send-message.c + wocky_send_message_DEPENDENCIES = $(top_builddir)/wocky/libwocky.la + wocky_receive_messages_SOURCES = receive-messages.c +@@ -364,7 +350,7 @@ + rm -f $$list + wocky-dump-certificates$(EXEEXT): $(wocky_dump_certificates_OBJECTS) $(wocky_dump_certificates_DEPENDENCIES) $(EXTRA_wocky_dump_certificates_DEPENDENCIES) + @rm -f wocky-dump-certificates$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(wocky_dump_certificates_OBJECTS) $(wocky_dump_certificates_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(wocky_dump_certificates_LINK) $(wocky_dump_certificates_OBJECTS) $(wocky_dump_certificates_LDADD) $(LIBS) + wocky-receive-messages$(EXEEXT): $(wocky_receive_messages_OBJECTS) $(wocky_receive_messages_DEPENDENCIES) $(EXTRA_wocky_receive_messages_DEPENDENCIES) + @rm -f wocky-receive-messages$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(wocky_receive_messages_OBJECTS) $(wocky_receive_messages_LDADD) $(LIBS) +@@ -384,11 +370,11 @@ + distclean-compile: + -rm -f *.tab.c + +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump-certificates.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/receive-messages.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/register.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send-message.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unregister.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wocky_dump_certificates-dump-certificates.Po@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@@ -411,6 +397,20 @@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + ++wocky_dump_certificates-dump-certificates.o: dump-certificates.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_dump_certificates_CFLAGS) $(CFLAGS) -MT wocky_dump_certificates-dump-certificates.o -MD -MP -MF $(DEPDIR)/wocky_dump_certificates-dump-certificates.Tpo -c -o wocky_dump_certificates-dump-certificates.o `test -f 'dump-certificates.c' || echo '$(srcdir)/'`dump-certificates.c ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_dump_certificates-dump-certificates.Tpo $(DEPDIR)/wocky_dump_certificates-dump-certificates.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dump-certificates.c' object='wocky_dump_certificates-dump-certificates.o' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_dump_certificates_CFLAGS) $(CFLAGS) -c -o wocky_dump_certificates-dump-certificates.o `test -f 'dump-certificates.c' || echo '$(srcdir)/'`dump-certificates.c ++ ++wocky_dump_certificates-dump-certificates.obj: dump-certificates.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_dump_certificates_CFLAGS) $(CFLAGS) -MT wocky_dump_certificates-dump-certificates.obj -MD -MP -MF $(DEPDIR)/wocky_dump_certificates-dump-certificates.Tpo -c -o wocky_dump_certificates-dump-certificates.obj `if test -f 'dump-certificates.c'; then $(CYGPATH_W) 'dump-certificates.c'; else $(CYGPATH_W) '$(srcdir)/dump-certificates.c'; fi` ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_dump_certificates-dump-certificates.Tpo $(DEPDIR)/wocky_dump_certificates-dump-certificates.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dump-certificates.c' object='wocky_dump_certificates-dump-certificates.obj' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_dump_certificates_CFLAGS) $(CFLAGS) -c -o wocky_dump_certificates-dump-certificates.obj `if test -f 'dump-certificates.c'; then $(CYGPATH_W) 'dump-certificates.c'; else $(CYGPATH_W) '$(srcdir)/dump-certificates.c'; fi` ++ + mostlyclean-libtool: + -rm -f *.lo + ++++++ 0001-Disable-parallel-build-for-extensions-directory.patch (new) --- 0001-Disable-parallel-build-for-extensions-directory.patch +++ 0001-Disable-parallel-build-for-extensions-directory.patch @@ -0,0 +1,23 @@ +From a77cd07acfb145465e396c835090fe00bf713afe Mon Sep 17 00:00:00 2001 +From: John Brooks <[email protected]> +Date: Mon, 29 Apr 2013 02:28:50 -0600 +Subject: [PATCH] Disable parallel build for extensions directory + +--- + extensions/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/extensions/Makefile.am b/extensions/Makefile.am +index ecb02ef..fbd30e7 100644 +--- a/extensions/Makefile.am ++++ b/extensions/Makefile.am +@@ -93,3 +93,6 @@ Android.mk: Makefile.am $(BUILT_SOURCES) + -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \ + -:LDFLAGS $(libgabble_extensions_la_LIBADD) \ + > $@ ++ ++.NOTPARALLEL: ++ +-- +1.7.9.5 + ++++++ telepathy-gabble-0.17.1.tar.gz -> telepathy-gabble-0.17.3.tar.gz (79954 lines skipped) ++++++ telepathy-gabble.yaml --- telepathy-gabble.yaml +++ telepathy-gabble.yaml @@ -1,6 +1,6 @@ Name: telepathy-gabble Summary: A Jabber/XMPP connection manager -Version: 0.17.1 +Version: 0.17.3 Release: 1 Group: Applications/Communications License: LGPLv2+ and BSD @@ -11,6 +11,8 @@ - mktests.sh Patches: - nemo-tests-dir-fix.patch + - 0.17.3-fix-fdo-61792.patch + - 0001-Disable-parallel-build-for-extensions-directory.patch Description: | A Jabber/XMPP connection manager, that handles single and multi-user chats and voice calls.
