Accepting request 1148491 from Java:packages

rpm 4.20 compat

OBS-URL: https://build.opensuse.org/request/show/1148491
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/javassist?expand=0&rev=22
This commit is contained in:
Ana Guerrero 2024-02-22 19:55:33 +00:00 committed by Git OBS Bridge
commit d421465521
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 21 09:42:17 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use %patch -P N instead of deprecated %patchN.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 6 16:20:35 UTC 2023 - Fridrich Strba <fstrba@suse.com> Tue Jun 6 16:20:35 UTC 2023 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package javassist # spec file for package javassist
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# Copyright (c) 2000-2005, JPackage Project # Copyright (c) 2000-2005, JPackage Project
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -78,9 +78,9 @@ Tutorial for javassist.
%prep %prep
%setup -q -n %{name}-%{tar_version} %setup -q -n %{name}-%{tar_version}
%if %{!?pkg_vcmp:1}%{?pkg_vcmp:%pkg_vcmp java-devel < 9} %if %{!?pkg_vcmp:1}%{?pkg_vcmp:%pkg_vcmp java-devel < 9}
%patch0 -p1 %patch -P 0 -p1
%endif %endif
%patch1 -p1 %patch -P 1 -p1
find . -name "*.jar" -print -delete find . -name "*.jar" -print -delete
%build %build
@ -93,7 +93,7 @@ cp -p %{name}.jar %{buildroot}/%{_javadir}/%{name}.jar
# pom # pom
install -d -m 755 %{buildroot}%{_mavenpomdir} install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap JPP-%{name}.pom %{name}.jar -a javassist:javassist %add_maven_depmap JPP-%{name}.pom %{name}.jar -a javassist:javassist
# demo # demo