diff --git a/maven-shared-incremental.changes b/maven-shared-incremental.changes index 5d468a1..49c0cfb 100644 --- a/maven-shared-incremental.changes +++ b/maven-shared-incremental.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 6 22:33:43 UTC 2023 - Fridrich Strba + +- Remove unnecessary dependency on xmvn tools and parent pom + ------------------------------------------------------------------- Mon Mar 21 04:38:35 UTC 2022 - Fridrich Strba diff --git a/maven-shared-incremental.spec b/maven-shared-incremental.spec index 3c87f51..a15fe6f 100644 --- a/maven-shared-incremental.spec +++ b/maven-shared-incremental.spec @@ -1,7 +1,7 @@ # # spec file for package maven-shared-incremental # -# 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,20 +22,17 @@ Release: 0 Summary: Maven Incremental Build support utilities License: Apache-2.0 Group: Development/Libraries/Java -URL: http://maven.apache.org/shared/maven-shared-incremental/ -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-incremental/ +Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip Source1: %{name}-build.xml BuildRequires: ant BuildRequires: fdupes -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: maven-lib BuildRequires: maven-shared-utils BuildRequires: plexus-component-api BuildRequires: plexus-containers-component-annotations BuildRequires: unzip -BuildRequires: xmvn-install -BuildRequires: xmvn-resolve -BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) BuildArch: noarch %description @@ -67,18 +64,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 -%doc NOTICE +%license LICENSE NOTICE -%files javadoc -f .mfiles-javadoc -%license LICENSE -%doc NOTICE +%files javadoc +%{_javadocdir}/%{name} +%license LICENSE NOTICE %changelog