diff --git a/makefile-dependency-fix.patch b/makefile-dependency-fix.patch new file mode 100644 index 0000000..3869f5e --- /dev/null +++ b/makefile-dependency-fix.patch @@ -0,0 +1,22 @@ +From 076dd9679bf2e77f1df219287f0eb42ea36b7371 Mon Sep 17 00:00:00 2001 +From: Aleksandar Fabijanic +Date: Tue, 23 May 2017 20:36:12 -0500 +Subject: [PATCH] Build parallelization issues #1730 + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 31f2d4ced..668d3e6be 100644 +--- a/Makefile ++++ b/Makefile +@@ -243,7 +243,7 @@ Data-libexec: Foundation-libexec + Data-tests: Data-libexec cppunit + $(MAKE) -C $(POCO_BASE)/Data/testsuite + +-Data-samples: Data-libexec Data-libexec Data/SQLite-libexec ++Data-samples: Data-libexec Data-libexec Data/SQLite-libexec Net-libexec + $(MAKE) -C $(POCO_BASE)/Data/samples + + Data-clean: diff --git a/poco.spec b/poco.spec index 162f589..ad674a9 100644 --- a/poco.spec +++ b/poco.spec @@ -15,7 +15,7 @@ Name: poco Version: %{poco_src_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ class libraries for network-centric applications Group: Development/Libraries @@ -32,6 +32,8 @@ Patch1: disable-tests.patch Patch2: sqlite-no-busy-snapshot.patch # Add ignored-tests patches Patch3: ignored-tests.patch +# Fix WebNotifier build failure due to Makefile dependency issues +Patch4: makefile-dependency-fix.patch BuildRequires: openssl-devel BuildRequires: libiodbc-devel @@ -460,6 +462,9 @@ HTML format. %doc README NEWS LICENSE CONTRIBUTORS CHANGELOG doc/* %changelog +* Thu May 25 2017 Scott Talbert - 1.7.8p2-3 +- Add patch from upstream to resolve s390x build failures + * Tue May 23 2017 Scott Talbert - 1.7.8p2-2 - Add openssl-devel as a dependency of poco-devel (#1454462)