6
0
forked from pool/jdependency

3 Commits

2 changed files with 10 additions and 7 deletions

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 2 15:52:30 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Spec file cleanup
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 21 05:27:10 UTC 2022 - Fridrich Strba <fstrba@suse.com> Mon Mar 21 05:27:10 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@@ -1,7 +1,7 @@
# #
# spec file for package jdependency # spec file for package jdependency
# #
# 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,10 +29,8 @@ Source1: %{name}-build.xml
BuildRequires: ant BuildRequires: ant
BuildRequires: apache-commons-io BuildRequires: apache-commons-io
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
BuildRequires: objectweb-asm BuildRequires: objectweb-asm
Requires: apache-commons-io
Requires: objectweb-asm
BuildArch: noarch BuildArch: noarch
%if %{with tests} %if %{with tests}
BuildRequires: ant-junit BuildRequires: ant-junit
@@ -60,7 +58,7 @@ mkdir -p lib
build-jar-repository -s lib commons-io objectweb-asm build-jar-repository -s lib commons-io objectweb-asm
%build %build
%{ant} \ ant \
%if %{without tests} %if %{without tests}
-Dtest.skip=true \ -Dtest.skip=true \
%endif %endif
@@ -72,9 +70,9 @@ install -dm 0755 %{buildroot}%{_javadir}
install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{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 %add_maven_depmap %{name}.pom %{name}.jar
# javadocdir # javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name} install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir} %fdupes -s %{buildroot}%{_javadocdir}