From da90ee5b9622e380a1db1d2b81ee2b720c6d3cdc79d703d227856c296cd42d0e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 6 Sep 2023 22:38:19 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-shared-io?expand=0&rev=6 --- maven-shared-io.changes | 5 +++++ maven-shared-io.spec | 27 ++++++++++++++++----------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/maven-shared-io.changes b/maven-shared-io.changes index 0852d8b..24cdb06 100644 --- a/maven-shared-io.changes +++ b/maven-shared-io.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 6 22:37:02 UTC 2023 - Fridrich Strba + +- Remove unnecessary dependency on xmvn tools and parent pom + ------------------------------------------------------------------- Mon Mar 21 04:40:31 UTC 2022 - Fridrich Strba diff --git a/maven-shared-io.spec b/maven-shared-io.spec index 41f0032..6cafc73 100644 --- a/maven-shared-io.spec +++ b/maven-shared-io.spec @@ -1,7 +1,7 @@ # # spec file for package maven-shared-io # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,23 +22,20 @@ Release: 0 Summary: API for I/O support like logging, download or file scanning License: Apache-2.0 Group: Development/Libraries/Java -URL: http://maven.apache.org/shared/maven-shared-io -Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip +URL: https://maven.apache.org/shared/maven-shared-io +Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip Source1: %{name}-build.xml # Rejected upstream: https://issues.apache.org/jira/browse/MSHARED-490 Patch0: 0001-Fix-running-tests-with-Maven-3.3.9.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: maven-lib BuildRequires: maven-shared-utils BuildRequires: maven-wagon-provider-api BuildRequires: plexus-containers-container-default BuildRequires: plexus-utils BuildRequires: unzip -BuildRequires: xmvn-install -BuildRequires: xmvn-resolve -BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) BuildArch: noarch %description @@ -75,16 +72,24 @@ build-jar-repository -s lib \ -Dtest.skip=true \ jar javadoc -%mvn_artifact pom.xml target/%{name}-%{version}.jar - %install -%mvn_install +# jar +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %license LICENSE NOTICE -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} %license LICENSE NOTICE %changelog