diff --git a/maven-reporting-impl-build.xml b/maven-reporting-impl-build.xml index ab66fa1..9bf6c6c 100644 --- a/maven-reporting-impl-build.xml +++ b/maven-reporting-impl-build.xml @@ -18,7 +18,7 @@ - + - - - - + @@ -42,11 +39,6 @@ - - - - - @@ -79,96 +71,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - =================================== WARNING =================================== - JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed. - =============================================================================== - - @@ -202,7 +104,7 @@ - + + +- Remove unnecessary dependency on xmvn tools and parent pom + ------------------------------------------------------------------- Fri Mar 11 07:02:31 UTC 2022 - Fridrich Strba diff --git a/maven-reporting-impl.spec b/maven-reporting-impl.spec index 012404a..ca3826c 100644 --- a/maven-reporting-impl.spec +++ b/maven-reporting-impl.spec @@ -1,7 +1,7 @@ # # spec file for package maven-reporting-impl # -# 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 @@ -16,20 +16,19 @@ # -%bcond_with tests Name: maven-reporting-impl Version: 3.1.0 Release: 0 Summary: Abstract classes to manage report generation License: Apache-2.0 Group: Development/Libraries/Java -URL: http://maven.apache.org/shared/%{name} -Source0: https://dlcdn.apache.org/maven/reporting/%{name}-%{version}-source-release.zip +URL: https://maven.apache.org/shared/%{name} +Source0: http://archive.apache.org/dist/maven/reporting/%{name}-%{version}-source-release.zip Source1: %{name}-build.xml Patch0: 0001-Remove-dependency-on-junit-addons.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: maven-doxia-core BuildRequires: maven-doxia-logging-api BuildRequires: maven-doxia-module-xhtml @@ -42,13 +41,7 @@ BuildRequires: maven-reporting-api BuildRequires: maven-shared-utils BuildRequires: plexus-utils BuildRequires: unzip -BuildRequires: xmvn-install -BuildRequires: xmvn-resolve -BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) BuildArch: noarch -%if %{with tests} -BuildRequires: ant-junit -%endif %description Abstract classes to manage report generation, which can be run both: @@ -94,23 +87,26 @@ build-jar-repository -s lib \ plexus/utils %{ant} \ -%if %{without tests} - -Dtest.skip=true \ -%endif 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