Sync from SUSE:SLFO:Main plexus-classworlds revision 8415ff28a7735f187dc689f2e2653b35

This commit is contained in:
Adrian Schröter 2024-05-31 14:56:14 +02:00
parent 8343a69356
commit 48b269a7bb
2 changed files with 9 additions and 10 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 21 22:18:39 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Clean the spec file and simplify it a bit
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 19 06:39:39 UTC 2022 - Fridrich Strba <fstrba@suse.com> Thu May 19 06:39:39 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file # spec file for package plexus-classworlds
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -29,7 +29,7 @@ Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{ver
Source1: %{name}-build.xml Source1: %{name}-build.xml
BuildRequires: ant BuildRequires: ant
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
Obsoletes: %{short_name} < %{version}-%{release} Obsoletes: %{short_name} < %{version}-%{release}
Provides: %{short_name} = %{version}-%{release} Provides: %{short_name} = %{version}-%{release}
BuildArch: noarch BuildArch: noarch
@ -67,12 +67,6 @@ ln -s $(build-classpath commons-logging) target/test-lib/commons-logging-1.0.3.j
ln -s $(build-classpath xml-apis) target/test-lib/xml-apis-1.3.02.jar ln -s $(build-classpath xml-apis) target/test-lib/xml-apis-1.3.02.jar
%endif %endif
%pom_remove_plugin :maven-enforcer-plugin
%pom_remove_plugin :maven-dependency-plugin
%pom_remove_parent .
%pom_xpath_inject "pom:project" "<groupId>org.codehaus.plexus</groupId>" .
%build %build
%{ant} \ %{ant} \
%if %{without tests} %if %{without tests}
@ -88,7 +82,7 @@ ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
ln -sf ../%{name}.jar %{buildroot}%{_javadir}/plexus/%{short_name}.jar ln -sf ../%{name}.jar %{buildroot}%{_javadir}/plexus/%{short_name}.jar
# pom # pom
install -dm 0755 %{buildroot}%{_mavenpomdir} install -dm 0755 %{buildroot}%{_mavenpomdir}
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom %{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
%add_maven_depmap %{name}.pom %{name}.jar -a %{short_name}:%{short_name} %add_maven_depmap %{name}.pom %{name}.jar -a %{short_name}:%{short_name}
# javadoc # javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name} install -dm 0755 %{buildroot}%{_javadocdir}/%{name}