From af3330b67ecb1c5b0dae6f76f83e1aa0884abe2706055eee085124d6871f03a1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 5 Oct 2019 13:00:04 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/slf4j?expand=0&rev=48 --- slf4j-sources.changes | 5 +++++ slf4j.changes | 5 +++++ slf4j.spec | 10 ++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/slf4j-sources.changes b/slf4j-sources.changes index f614862..0176a59 100644 --- a/slf4j-sources.changes +++ b/slf4j-sources.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Oct 5 12:59:06 UTC 2019 - Fridrich Strba + +- Remove references to parent from all pom files + ------------------------------------------------------------------- Tue Oct 1 09:01:32 UTC 2019 - Fridrich Strba diff --git a/slf4j.changes b/slf4j.changes index f614862..0176a59 100644 --- a/slf4j.changes +++ b/slf4j.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Oct 5 12:59:06 UTC 2019 - Fridrich Strba + +- Remove references to parent from all pom files + ------------------------------------------------------------------- Tue Oct 1 09:01:32 UTC 2019 - Fridrich Strba diff --git a/slf4j.spec b/slf4j.spec index 51f672c..5f00dda 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -190,14 +190,20 @@ done # poms install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/parent.pom for i in api ext jcl jdk14 log4j12 nop simple; do + %pom_remove_parent slf4j-${i} + %pom_xpath_inject "pom:project" " + org.slf4j + %{version}" slf4j-${i} install -pm 644 slf4j-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom done for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do + %pom_remove_parent ${i} + %pom_xpath_inject "pom:project" " + org.slf4j + %{version}" ${i} install -pm 644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom done -%add_maven_depmap %{name}/parent.pom for i in api nop simple; do %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar done From 9d59c8863fb632daa6f842da103e8d1e59ee2038f90d6100889e65284451d162 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 5 Oct 2019 16:51:20 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/slf4j?expand=0&rev=49 --- slf4j-sources.changes | 1 + slf4j.changes | 1 + slf4j.spec | 2 ++ 3 files changed, 4 insertions(+) diff --git a/slf4j-sources.changes b/slf4j-sources.changes index 0176a59..57fe36e 100644 --- a/slf4j-sources.changes +++ b/slf4j-sources.changes @@ -2,6 +2,7 @@ Sat Oct 5 12:59:06 UTC 2019 - Fridrich Strba - Remove references to parent from all pom files +- Avoid dependencies without version tag ------------------------------------------------------------------- Tue Oct 1 09:01:32 UTC 2019 - Fridrich Strba diff --git a/slf4j.changes b/slf4j.changes index 0176a59..57fe36e 100644 --- a/slf4j.changes +++ b/slf4j.changes @@ -2,6 +2,7 @@ Sat Oct 5 12:59:06 UTC 2019 - Fridrich Strba - Remove references to parent from all pom files +- Avoid dependencies without version tag ------------------------------------------------------------------- Tue Oct 1 09:01:32 UTC 2019 - Fridrich Strba diff --git a/slf4j.spec b/slf4j.spec index 5f00dda..ae3869c 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -163,6 +163,8 @@ done # # Reported upstream: http://bugzilla.slf4j.org/show_bug.cgi?id=283 sed -i "/Import-Package/s/.$/;resolution:=optional&/" slf4j-api/src/main/resources/META-INF/MANIFEST.MF +%pom_change_dep -r -f ::::: ::::: + %build export CLASSPATH=$(build-classpath log4j12/log4j-12 \ commons-logging \