From a1418225d5e5d5d0b2aff1c33228cbc91c466f16c1371a887bef821d7bafb7ac Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 25 Mar 2019 17:32:49 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-compress?expand=0&rev=9 --- apache-commons-compress.changes | 6 ++++++ apache-commons-compress.spec | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/apache-commons-compress.changes b/apache-commons-compress.changes index 271d48e..8f7cd3d 100644 --- a/apache-commons-compress.changes +++ b/apache-commons-compress.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 25 17:32:03 UTC 2019 - Fridrich Strba + +- Remove pom parent, since we don't use it when not building with + maven + ------------------------------------------------------------------- Sun Jan 27 16:48:58 UTC 2019 - Jan Engelhardt diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 2a20950..e3045bf 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -1,5 +1,5 @@ # -# spec file for package apache-commons-compress +# spec file for package apache # # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -87,6 +87,9 @@ rm src/test/java/org/apache/commons/compress/OsgiITest.java %pom_xpath_remove "pom:profiles/pom:profile[pom:id[text()='java9+']]" +%pom_remove_parent . +%pom_xpath_inject "pom:project" "org.apache.commons" . + %build mkdir -p lib build-jar-repository -s lib xz-java From 1380bd58b5304cf8cade92d9478fcf2bfd7bd7a1c78f40363a89aee3bc379618 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 25 Mar 2019 17:33:34 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-compress?expand=0&rev=10 --- apache-commons-compress.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index e3045bf..4a8974c 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -31,12 +31,10 @@ Patch0: 0001-Remove-Brotli-compressor.patch Patch1: 0002-Remove-ZSTD-compressor.patch Patch2: fix_java_8_compatibility.patch BuildRequires: ant -BuildRequires: apache-commons-parent BuildRequires: fdupes BuildRequires: java-devel >= 1.7 BuildRequires: javapackages-local BuildRequires: xz-java -Requires: mvn(org.apache.commons:commons-parent:pom:) Requires: mvn(org.tukaani:xz) Provides: %{short_name} = %{version}-%{release} Obsoletes: %{short_name} < %{version}-%{release}