Fix patch usage

Related: RHEL-62398
This commit is contained in:
Marián Konček 2024-11-21 01:21:44 +01:00
parent f12e7a7fcb
commit c54c67a306

View File

@ -2,7 +2,7 @@
Name: guava
Version: 30.1
Release: 7%{?dist}
Release: 8%{?dist}
Summary: Google Core Libraries for Java
# Most of the code is under ASL 2.0
# Few classes are under CC0, grep for creativecommons
@ -91,7 +91,7 @@ annotations=$(
find -name '*.java' | xargs sed -ri \
"s/^import .*\.($annotations);//;s/@($annotations)"'\>\s*(\((("[^"]*")|([^)]*))\))?//g'
%patch 1 -p1
%patch -P 1 -p1
%mvn_package "com.google.guava:failureaccess" guava
@ -112,6 +112,9 @@ find -name '*.java' | xargs sed -ri \
%files testlib -f .mfiles-guava-testlib
%changelog
* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 30.1-8
- Fix patch usage
* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 30.1-7
- Rebuild with regenerated Requires on Java