6
0
forked from pool/args4j

3 Commits

2 changed files with 11 additions and 14 deletions

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 2 15:34:53 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Spec file cleanup
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 23 23:08:56 UTC 2022 - Fridrich Strba <fstrba@suse.com> Wed Mar 23 23:08:56 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@@ -1,7 +1,7 @@
# #
# spec file for package args4j # spec file for package args4j
# #
# 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 @@ Source1: %{name}-build.tar.xz
BuildRequires: ant BuildRequires: ant
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
BuildArch: noarch BuildArch: noarch
%if %{with tests} %if %{with tests}
BuildRequires: ant-junit BuildRequires: ant-junit
@@ -85,21 +85,13 @@ find -name '*.jar' -exec rm -f '{}' \;
%pom_disable_module args4j-maven-plugin %pom_disable_module args4j-maven-plugin
%pom_disable_module args4j-maven-plugin-example %pom_disable_module args4j-maven-plugin-example
for i in args4j args4j-tools; do
%pom_remove_parent $i
%pom_xpath_inject pom:project "
<groupId>args4j</groupId>
<version>%{version}</version>
" $i
done
%build %build
mkdir -p lib mkdir -p lib
%if %{with tests} %if %{with tests}
build-jar-repository -s lib cglib/cglib mockito/mockito-core objectweb-asm/asm objenesis/objenesis build-jar-repository -s lib cglib/cglib mockito/mockito-core objectweb-asm/asm objenesis/objenesis
%ant package javadoc ant package javadoc
%else %else
%ant -Dtest.skip=true package javadoc ant -Dtest.skip=true package javadoc
%endif %endif
%install %install
@@ -112,9 +104,9 @@ install -pm 0644 %{name}-tools/target/%{name}-tools-%{version}.jar %{buildroot}%
# pom # pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
install -pm 0644 %{name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %{mvn_install_pom} %{name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
install -pm 0644 %{name}-tools/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-tools.pom %{mvn_install_pom} %{name}-tools/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-tools.pom
%add_maven_depmap %{name}/%{name}-tools.pom %{name}/%{name}-tools.jar -f tools %add_maven_depmap %{name}/%{name}-tools.pom %{name}/%{name}-tools.jar -f tools
# javadoc # javadoc