Fix patch usage

Related: RHEL-62398
This commit is contained in:
Marián Konček 2024-11-21 01:22:48 +01:00
parent 656703fcfc
commit 3a5af1e218

View File

@ -7,7 +7,7 @@
Name: maven
Epoch: 1
Version: 3.6.3
Release: 17%{?dist}
Release: 18%{?dist}
Summary: Java project management and project comprehension tool
# maven itself is ASL 2.0
# bundled slf4j is MIT
@ -163,10 +163,10 @@ Configures Maven to run with OpenJDK 21.
find -name '*.java' -exec sed -i 's/\r//' {} +
find -name 'pom.xml' -exec sed -i 's/\r//' {} +
%patch 1 -p1
%patch 2 -p1
%patch 3 -p1
%patch 4 -p1
%patch -P 1 -p1
%patch -P 2 -p1
%patch -P 3 -p1
%patch -P 4 -p1
# not really used during build, but a precaution
find -name '*.jar' -not -path '*/test/*' -delete
@ -312,6 +312,9 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
%config %{_javaconfdir}/maven.conf-openjdk21
%changelog
* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-18
- Fix patch usage
* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1:3.6.3-17
- Rebuild with regenerated Requires on Java