From 3667c7f1c8152094b8c83eb3bde60f6c0d771036 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 20 Mar 2017 09:23:53 +0200 Subject: [PATCH] Don't try to use no longer existing brp-java-repack-jars script (#1409277) --- scl-utils-2.0.1-no-repack-jars.patch | 11 +++++++++++ scl-utils.spec | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 scl-utils-2.0.1-no-repack-jars.patch diff --git a/scl-utils-2.0.1-no-repack-jars.patch b/scl-utils-2.0.1-no-repack-jars.patch new file mode 100644 index 0000000..549c015 --- /dev/null +++ b/scl-utils-2.0.1-no-repack-jars.patch @@ -0,0 +1,11 @@ +diff -up scl-utils-2.0.1/rpm/macros.scl.repack-jars scl-utils-2.0.1/rpm/macros.scl +--- scl-utils-2.0.1/rpm/macros.scl.repack-jars 2017-03-20 09:16:51.194712064 +0200 ++++ scl-utils-2.0.1/rpm/macros.scl 2017-03-20 09:18:25.558540724 +0200 +@@ -94,7 +94,6 @@ package or when debugging this package. + /usr/lib/rpm/brp-strip-static-archive %{__strip} + /usr/lib/rpm/brp-scl-python-bytecompile %{__python} %{?_python_bytecompile_errors_terminate_build} %{_scl_root} + /usr/lib/rpm/brp-python-hardlink +- %{!?__jar_repack:/usr/lib/rpm/redhat/brp-java-repack-jars} + %{nil}} + BuildRequires: scl-utils-build + %if "%{?scl}%{!?scl:0}" == "%{pkg_name}" diff --git a/scl-utils.spec b/scl-utils.spec index 53b30a2..cfe3453 100644 --- a/scl-utils.spec +++ b/scl-utils.spec @@ -3,7 +3,7 @@ Name: scl-utils Epoch: 1 Version: 2.0.1 -Release: 11%{dist} +Release: 12%{dist} Summary: Utilities for alternative packaging License: GPLv2+ @@ -18,6 +18,7 @@ Requires: environment-modules Patch1: 0001-Honor-CFLAGS-passed-to-cmake.patch Patch2: 0002-Fix-core-dumps-with-large-input-on-stdin-rhbz-125727.patch Patch3: 0003-Scl-utils-layout-patch-from-fedora-famillecollet.com.patch +Patch4: scl-utils-2.0.1-no-repack-jars.patch %description Run-time utility for alternative packaging. @@ -80,6 +81,9 @@ rm -rf %buildroot %{_rpmconfigdir}/brp-scl-python-bytecompile %changelog +* Mon Mar 20 2017 Panu Matilainen - 1:2.0.1-12 +- Don't try to use no longer existing brp-java-repack-jars script (#1409277) + * Sat Feb 11 2017 Fedora Release Engineering - 1:2.0.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild