[packages/icedtea8] hsdb/clhsdb work only when invoked from top level bin
atler
atler at pld-linux.org
Tue May 21 19:29:07 CEST 2019
commit 65439fc9bdea3d8151e7ddc0213a5c15bc38deae
Author: Jan Palus <atler at pld-linux.org>
Date: Tue May 21 19:24:57 2019 +0200
hsdb/clhsdb work only when invoked from top level bin
looks like sa-jdi.jar path is relative to binary location
icedtea8.spec | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/icedtea8.spec b/icedtea8.spec
index 2f27208..311033e 100644
--- a/icedtea8.spec
+++ b/icedtea8.spec
@@ -574,6 +574,7 @@ rmdir $RPM_BUILD_ROOT%{dstdir}/man/ja_JP.UTF-8
rm $RPM_BUILD_ROOT%{dstdir}/man/ja
mv $RPM_BUILD_ROOT%{dstdir}/man/man1 $RPM_BUILD_ROOT%{_mandir}/man1
rmdir $RPM_BUILD_ROOT%{dstdir}/man
+rm $RPM_BUILD_ROOT%{dstdir}/jre/bin/{cl,}hsdb
# replace duplicates with symlinks, link to %{_bindir}
for path in $RPM_BUILD_ROOT%{dstdir}/bin/*; do
@@ -805,7 +806,6 @@ rm -rf $RPM_BUILD_ROOT
%{_jvmdir}/%{name}-jre
%dir %{jredir}/bin
%dir %{dstdir}/bin
-%attr(755,root,root) %{jredir}/bin/clhsdb
%attr(755,root,root) %{dstdir}/bin/clhsdb
%attr(755,root,root) %{jredir}/bin/java
%attr(755,root,root) %{dstdir}/bin/java
@@ -915,7 +915,6 @@ rm -rf $RPM_BUILD_ROOT
%files jre-base-X11
%defattr(644,root,root,755)
-%attr(755,root,root) %{jredir}/bin/hsdb
%attr(755,root,root) %{dstdir}/bin/hsdb
%attr(755,root,root) %{jredir}/bin/policytool
%attr(755,root,root) %{dstdir}/bin/policytool
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/icedtea8.git/commitdiff/65439fc9bdea3d8151e7ddc0213a5c15bc38deae
More information about the pld-cvs-commit
mailing list