From cad60f2bab6d40df37aec613b1b40912feb9bc46bffe8e34568c353c5ff85e1b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Oct 2021 08:28:58 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-sec-dispatcher?expand=0&rev=7 --- plexus-sec-dispatcher-1.4.tar.bz2 | 3 --- plexus-sec-dispatcher-2.0.tar.gz | 3 +++ plexus-sec-dispatcher-build.xml | 8 ++++---- plexus-sec-dispatcher.spec | 22 ++++++++++++---------- 4 files changed, 19 insertions(+), 17 deletions(-) delete mode 100644 plexus-sec-dispatcher-1.4.tar.bz2 create mode 100644 plexus-sec-dispatcher-2.0.tar.gz diff --git a/plexus-sec-dispatcher-1.4.tar.bz2 b/plexus-sec-dispatcher-1.4.tar.bz2 deleted file mode 100644 index 3c44628..0000000 --- a/plexus-sec-dispatcher-1.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76b14426d44a4f53620840c15764b0bed192c57509a376c541ac9262b8e31a01 -size 6619 diff --git a/plexus-sec-dispatcher-2.0.tar.gz b/plexus-sec-dispatcher-2.0.tar.gz new file mode 100644 index 0000000..1010244 --- /dev/null +++ b/plexus-sec-dispatcher-2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21ab7548945f3d6a2cb599fe198575f11ea18841a85d5bbe3d62fa6f9183d39a +size 8444 diff --git a/plexus-sec-dispatcher-build.xml b/plexus-sec-dispatcher-build.xml index af2c5a2..086a019 100644 --- a/plexus-sec-dispatcher-build.xml +++ b/plexus-sec-dispatcher-build.xml @@ -8,14 +8,14 @@ - + - - + + - + diff --git a/plexus-sec-dispatcher.spec b/plexus-sec-dispatcher.spec index e341a2d..31977cc 100644 --- a/plexus-sec-dispatcher.spec +++ b/plexus-sec-dispatcher.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-sec-dispatcher # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,25 +18,26 @@ %bcond_with tests Name: plexus-sec-dispatcher -Version: 1.4 +Version: 2.0 Release: 0 Summary: Plexus Security Dispatcher Component License: Apache-2.0 Group: Development/Libraries/Java -URL: https://github.com/codehaus-plexus/plexus-sec-dispatcher -# svn export http://svn.sonatype.org/spice/tags/plexus-sec-dispatcher-1.4/ -# tar jcf plexus-sec-dispatcher-1.4.tar.bz2 plexus-sec-dispatcher-1.4/ -Source0: %{name}-%{version}.tar.bz2 +URL: https://github.com/codehaus-plexus/%{name} +Source0: https://github.com/codehaus-plexus/%{name}/archive/refs/tags/%{name}-%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source100: %{name}-build.xml BuildRequires: ant +BuildRequires: atinject BuildRequires: fdupes +BuildRequires: java-devel >= 1.7 BuildRequires: javapackages-local BuildRequires: modello BuildRequires: plexus-cipher BuildRequires: plexus-containers-container-default BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils +Requires: mvn(javax.inject:javax.inject) Requires: mvn(org.codehaus.plexus:plexus-utils) Requires: mvn(org.sonatype.plexus:plexus-cipher) BuildArch: noarch @@ -55,17 +56,18 @@ Group: Documentation/HTML API documentation for %{name}. %prep -%setup -q +%setup -q -n %{name}-%{name}-%{version} cp %{SOURCE1} . cp %{SOURCE100} build.xml %pom_remove_parent -%pom_change_dep -r -f ::::: ::::: +%pom_xpath_inject pom:project "org.codehaus.plexus" +%pom_change_dep -r -f ::::: ::::: %build mkdir -p lib -build-jar-repository -s lib plexus/utils plexus/plexus-cipher plexus-containers/plexus-container-default +build-jar-repository -s lib plexus/utils plexus/plexus-cipher plexus-containers/plexus-container-default javax.inject %{ant} \ %if %{without tests} -Dtest.skip=true \ @@ -79,7 +81,7 @@ install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/%{ # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/plexus/%{name}.pom -%add_maven_depmap plexus/%{name}.pom plexus/%{name}.jar +%add_maven_depmap plexus/%{name}.pom plexus/%{name}.jar -a org.sonatype.plexus:%{name} # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/