pool/apache-commons-jexl
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1205236 from Java:packages

Browse Source 
Spec file cleanup

OBS-URL: https://build.opensuse.org/request/show/1205236
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-jexl?expand=0&rev=4
This commit is contained in:
Ana Guerrero 2024-10-02 19:35:36 +00:00 committed by Git OBS Bridge
commit dc5346937e
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apache-commons-jexl.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 2 15:31:38 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Spec file cleanup
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 20 10:42:41 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org> Tue Feb 20 10:42:41 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

13
apache-commons-jexl.spec
View File

@ -1,7 +1,7 @@
# #
# spec file # spec file for package apache-commons-jexl
# #
# 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
@ -39,8 +39,7 @@ BuildRequires: apache-commons-logging
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javacc BuildRequires: javacc
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
Requires: mvn(commons-logging:commons-logging)
Provides: %{short_name} = %{version}-%{release} Provides: %{short_name} = %{version}-%{release}
BuildArch: noarch BuildArch: noarch
%if %{with tests} %if %{with tests}
@ -93,7 +92,7 @@ mkdir -p lib
build-jar-repository -s lib commons-logging build-jar-repository -s lib commons-logging
# commons-jexl # commons-jexl
%{ant} \ ant \
%if %{without tests} %if %{without tests}
-Dtest.skip=true \ -Dtest.skip=true \
%endif %endif
@ -117,9 +116,9 @@ install -pm 0644 jexl2-compat/target/%{short_name}-compat-%{compatver}.jar %{bui
ln -sf %{name}/%{short_name}-compat.jar %{buildroot}%{_javadir}/%{short_name}-compat.jar ln -sf %{name}/%{short_name}-compat.jar %{buildroot}%{_javadir}/%{short_name}-compat.jar
# poms # poms
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{short_name}.pom %{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{short_name}.pom
%add_maven_depmap %{name}/%{short_name}.pom %{name}/%{short_name}.jar %add_maven_depmap %{name}/%{short_name}.pom %{name}/%{short_name}.jar
install -pm 0644 jexl2-compat/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{short_name}-compat.pom %{mvn_install_pom} jexl2-compat/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{short_name}-compat.pom
%add_maven_depmap %{name}/%{short_name}-compat.pom %{name}/%{short_name}-compat.jar %add_maven_depmap %{name}/%{short_name}-compat.pom %{name}/%{short_name}-compat.jar
# javadoc # javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/jexl2-compat install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/jexl2-compat