Djam/java-1.8.0-openjdk
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/java-1.8.0-openjdk.git synced 2025-04-22 12:44:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix systap conditions

Browse source
This commit is contained in:
Denis Silakov 2015-06-05 15:06:30 +03:00
parent 01e10cd0b1
commit a19427c0dc
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
java-1.8.0-openjdk.spec
View file

@ -112,7 +112,7 @@
%global jvmjardir %{_jvmjardir}/%{name}-%{version}
%endif
%if %{with_systap}
%if %{with systap}
# Where to install systemtap tapset (links)
# We would like these to be in a package specific subdir,
# but currently systemtap doesn't support that, so we have to
@ -275,7 +275,7 @@ BuildRequires: openssl
%ifnarch %{arm} %{aarch64} ppc64le
BuildRequires: prelink
%endif
%if %{with_systap}
%if %{with systap}
BuildRequires: systemtap
%endif
@ -472,7 +472,7 @@ sh %{SOURCE12}
%patch503
# Extract systemtap tapsets
%if %{with_systap}
%if %{with systap}
tar xzf %{SOURCE8}
@ -609,7 +609,7 @@ pushd %{buildoutputdir}/images/j2sdk-image
install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
%if %{with_systap}
%if %{with systap}
# Install systemtap support files.
install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/tapset
cp -a $RPM_BUILD_DIR/%{name}/tapset/*.stp $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/tapset/
@ -1042,13 +1042,13 @@ exit 0
%dir %{_jvmdir}/%{sdkdir}/bin
%dir %{_jvmdir}/%{sdkdir}/include
%dir %{_jvmdir}/%{sdkdir}/lib
%if %{with_systap}
%if %{with systap}
%dir %{_jvmdir}/%{sdkdir}/tapset
%endif
%{_jvmdir}/%{sdkdir}/bin/*
%{_jvmdir}/%{sdkdir}/include/*
%{_jvmdir}/%{sdkdir}/lib/*
%if %{with_systap}
%if %{with systap}
%{_jvmdir}/%{sdkdir}/tapset/*.stp
%endif
%{_jvmdir}/%{sdklnk}
@ -1085,7 +1085,7 @@ exit 0
%{_mandir}/man1/wsgen-%{name}.1*
%{_mandir}/man1/wsimport-%{name}.1*
%{_mandir}/man1/xjc-%{name}.1*
%if %{with_systap}
%if %{with systap}
%{tapsetroot}
%endif