[java-1.8.0-openjdk/f20] Use %{with_systemtap} instead of %{jit_arches}
Omair Majid
omajid at fedoraproject.org
Fri Aug 30 05:21:02 UTC 2013
commit dd1af83bd911ffd754db9f75214f0056701d9e42
Author: Omair Majid <omajid at redhat.com>
Date: Thu Aug 29 22:11:50 2013 -0400
Use %{with_systemtap} instead of %{jit_arches}
java-1.8.0-openjdk.spec | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 8029308..2744e66 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -125,7 +125,7 @@
%global jvmjardir %{_jvmjardir}/%{name}-%{version}
%endif
-%ifarch %{jit_arches}
+%ifarch %{with_systemtap}
# 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
@@ -252,8 +252,7 @@ BuildRequires: openssl
%ifnarch %{arm} %{aarch64}
BuildRequires: prelink
%endif
-%ifarch %{jit_arches}
-#systemtap build requirement.
+%ifarch %{with_systemtap}
BuildRequires: systemtap-sdt-devel
%endif
@@ -503,7 +502,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}
-%ifarch %{jit_arches}
+%ifarch %{with_systemtap}
# 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/
@@ -884,13 +883,13 @@ exit 0
%dir %{_jvmdir}/%{sdkdir}/bin
%dir %{_jvmdir}/%{sdkdir}/include
%dir %{_jvmdir}/%{sdkdir}/lib
-%ifarch %{jit_arches}
+%ifarch %{with_systemtap}
%dir %{_jvmdir}/%{sdkdir}/tapset
%endif
%{_jvmdir}/%{sdkdir}/bin/*
%{_jvmdir}/%{sdkdir}/include/*
%{_jvmdir}/%{sdkdir}/lib/*
-%ifarch %{jit_arches}
+%ifarch %{with_systemtap}
%{_jvmdir}/%{sdkdir}/tapset/*.stp
%endif
%{_jvmdir}/%{sdklnk}
@@ -926,7 +925,7 @@ exit 0
%{_mandir}/man1/wsgen-%{name}.1*
%{_mandir}/man1/wsimport-%{name}.1*
%{_mandir}/man1/xjc-%{name}.1*
-%ifarch %{jit_arches}
+%ifarch %{with_systemtap}
%{tapsetroot}
%endif
More information about the scm-commits
mailing list