From f1705687ce6cf6535594896521fbce3ae74dbc02 Mon Sep 17 00:00:00 2001 From: fstrba <> Date: Feb 22 2022 20:32:55 +0000 Subject: Update apache-logging-parent to version 5 / rev 2 via SR 956675 https://build.opensuse.org/request/show/956675 by user fstrba + dimstar_suse Lower the dependencies needed to build this one --- diff --git a/.files b/.files index 054b670..5d0eb13 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index b8f59f0..4f40799 100644 --- a/.rev +++ b/.rev @@ -7,4 +7,12 @@ new package 734357 + + ceb4c33869878617487281079de95107 + 5 + + dimstar_suse + Lower the dependencies needed to build this one + 956675 + diff --git a/apache-logging-parent.changes b/apache-logging-parent.changes index d2552a7..d87490a 100644 --- a/apache-logging-parent.changes +++ b/apache-logging-parent.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 19 07:34:34 UTC 2022 - Fridrich Strba + +- Upgrade to logging-parent 5 +- Do not require maven-local, since it can be handled by + javapackages-local just fine + +------------------------------------------------------------------- Tue Oct 1 13:08:26 UTC 2019 - Fridrich Strba - Intial packaging of apache-logging-parent diff --git a/apache-logging-parent.spec b/apache-logging-parent.spec index 2b24fe9..fba996b 100644 --- a/apache-logging-parent.spec +++ b/apache-logging-parent.spec @@ -1,7 +1,7 @@ # -# spec file for package apache-logging-parent +# spec file # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,29 +16,33 @@ # -Name: apache-logging-parent -Version: 2 +%global short_name logging-parent +Name: apache-%{short_name} +Version: 5 Release: 0 Summary: Parent pom for Apache Logging Services projects License: Apache-2.0 URL: https://logging.apache.org/ -Source0: https://repo1.maven.org/maven2/org/apache/logging/logging-parent/%{version}/logging-parent-%{version}-source-release.zip -BuildRequires: maven-local +Source0: https://repo1.maven.org/maven2/org/apache/logging/%{short_name}/%{version}/%{short_name}-%{version}-source-release.zip +BuildRequires: javapackages-local BuildRequires: unzip BuildRequires: mvn(org.apache:apache:pom:) +Requires: mvn(org.apache:apache:pom:) BuildArch: noarch %description Parent pom for Apache Logging Services projects. %prep -%setup -q -n logging-parent-%{version} +%setup -q -n %{short_name}-%{version} %build -%{mvn_build} %install -%mvn_install +# pom +install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name} +install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{short_name}.pom +%add_maven_depmap %{name}/%{short_name}.pom %files -f .mfiles %license LICENSE NOTICE diff --git a/logging-parent-2-source-release.zip b/logging-parent-2-source-release.zip deleted file mode 120000 index c85b989..0000000 --- a/logging-parent-2-source-release.zip +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafkreibcqtofeykwsq5qcy54jx6hldrf2epa5b2jydfivmqi575g4qzvki \ No newline at end of file diff --git a/logging-parent-5-source-release.zip b/logging-parent-5-source-release.zip new file mode 120000 index 0000000..0bd8f77 --- /dev/null +++ b/logging-parent-5-source-release.zip @@ -0,0 +1 @@ +/ipfs/bafkreidxphlnhcuvv6hjyab3pkbaerhxpzuug4sy3yjrwrmjrkb7vac7xq \ No newline at end of file