diff --git a/plexus-interpolation.changes b/plexus-interpolation.changes index 57fe07c..7f231c5 100644 --- a/plexus-interpolation.changes +++ b/plexus-interpolation.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 2 15:58:55 UTC 2024 - Fridrich Strba + +- Spec file cleanup + ------------------------------------------------------------------- Thu Jun 13 17:09:48 UTC 2024 - Fridrich Strba diff --git a/plexus-interpolation.spec b/plexus-interpolation.spec index 5ecc976..6a4985e 100644 --- a/plexus-interpolation.spec +++ b/plexus-interpolation.spec @@ -28,7 +28,7 @@ Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{ver Source1: %{name}-build.xml BuildRequires: ant BuildRequires: fdupes -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildArch: noarch %if %{with tests} BuildRequires: ant-junit @@ -50,14 +50,9 @@ API documentation for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} cp %{SOURCE1} build.xml -%pom_remove_plugin :maven-release-plugin - -%pom_remove_parent - -%pom_xpath_inject "pom:project" "org.codehaus.plexus" %build -%{ant} \ +ant \ %if %{without tests} -Dtest.skip=true \ %endif @@ -69,7 +64,7 @@ install -dm 0755 %{buildroot}%{_javadir}/plexus install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/interpolation.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/plexus/interpolation.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/plexus/interpolation.pom %add_maven_depmap plexus/interpolation.pom plexus/interpolation.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name}