Hello community, here is the log from the commit of package couchdb for openSUSE:Factory checked in at 2014-12-10 23:44:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/couchdb (Old) and /work/SRC/openSUSE:Factory/.couchdb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "couchdb" Changes: -------- --- /work/SRC/openSUSE:Factory/couchdb/couchdb.changes 2014-10-14 07:13:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.couchdb.new/couchdb.changes 2014-12-10 23:44:03.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 27 13:28:40 UTC 2014 - [email protected] + +- Add couchdb-glibc-2.20.patch: Fix build with glibc 2.20. + _BSD_SOURCE is deprecated in favor of _DEFAULT_SOURCE. Passing + both flags for compatibility to older glibc as well. + +------------------------------------------------------------------- New: ---- couchdb-glibc-2.20.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ couchdb.spec ++++++ --- /var/tmp/diff_new_pack.pTr1IV/_old 2014-12-10 23:44:04.000000000 +0100 +++ /var/tmp/diff_new_pack.pTr1IV/_new 2014-12-10 23:44:04.000000000 +0100 @@ -42,6 +42,8 @@ Source3: %{name}.service Source4: %{name}.tmpfiles.conf Patch0: couchdb-futon-default-view-language.patch +# PATCH-FIX-UPSTREAM couchdb-glibc-2.20.patch [email protected] -- Fix build with glibc 2.20; _BSD_SOURCE is deprecated in favor of _DEFAULT_SOURCE; using both for backwards compatibility +Patch1: couchdb-glibc-2.20.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf-archive BuildRequires: automake @@ -83,6 +85,7 @@ %prep %setup -q -n apache-couchdb-%{version} %patch0 +%patch1 -p1 %build autoreconf -fi ++++++ couchdb-glibc-2.20.patch ++++++ Index: apache-couchdb-1.6.1/src/couchdb/priv/Makefile.am =================================================================== --- apache-couchdb-1.6.1.orig/src/couchdb/priv/Makefile.am +++ apache-couchdb-1.6.1/src/couchdb/priv/Makefile.am @@ -44,7 +44,7 @@ couchprivlib_LTLIBRARIES = couch_icu_dri if USE_EJSON_COMPARE_NIF couchprivlib_LTLIBRARIES += couch_ejson_compare.la couch_ejson_compare_la_SOURCES = couch_ejson_compare/couch_ejson_compare.c -couch_ejson_compare_la_CPPFLAGS = -D_BSD_SOURCE $(ICU_CPPFLAGS) $(ERLANG_FLAGS) +couch_ejson_compare_la_CPPFLAGS = -D_BSD_SOURCE -D_DEFAULT_SOURCE $(ICU_CPPFLAGS) $(ERLANG_FLAGS) couch_ejson_compare_la_LDFLAGS = -module -avoid-version couch_ejson_compare_la_LIBADD = $(ICU_LIBS) if WINDOWS @@ -72,7 +72,7 @@ COUCHJS_SRCS = \ locallibbin_PROGRAMS = couchjs couchjs_SOURCES = $(COUCHJS_SRCS) -couchjs_CFLAGS = -g -Wall -Werror -D_BSD_SOURCE $(CURL_CFLAGS) $(JS_CFLAGS) +couchjs_CFLAGS = -g -Wall -Werror -D_BSD_SOURCE -D_DEFAULT_SOURCE $(CURL_CFLAGS) $(JS_CFLAGS) couchjs_LDADD = $(CURL_LIBS) $(JS_LIBS) couchpriv_DATA = stat_descriptions.cfg Index: apache-couchdb-1.6.1/test/etap/Makefile.am =================================================================== --- apache-couchdb-1.6.1.orig/test/etap/Makefile.am +++ apache-couchdb-1.6.1/test/etap/Makefile.am @@ -15,7 +15,7 @@ noinst_DATA = test_util.beam test_web.be noinst_PROGRAMS = test_cfg_register test_cfg_register_SOURCES = test_cfg_register.c -test_cfg_register_CFLAGS = -D_BSD_SOURCE +test_cfg_register_CFLAGS = -D_BSD_SOURCE -D_DEFAULT_SOURCE %.beam: %.erl $(ERLC) $< -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
