From 5e5ec35cf1470bd52aca1bb73e76d205dcce01fc Mon Sep 17 00:00:00 2001 From: Lukas Berk Date: Wed, 15 Jul 2015 11:22:17 -0400 Subject: [PATCH] systemtap.spec changes for ppc64{be,le} java helper library symlinking systemtap.spec - remove special clauses ppc64{be,le} linking --- systemtap.spec | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/systemtap.spec b/systemtap.spec index 39f2130f9..23d1173a7 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -775,12 +775,8 @@ exit 0 %triggerin runtime-java -- java-1.7.0-openjdk, java-1.6.0-openjdk for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do - %ifarch %{ix86} ppc64 ppc64le - %ifarch ppc64 ppc64le - arch=ppc64 - %else - arch=i386 - %endif + %ifarch %{ix86} + arch=i386 %else arch=`basename $f | cut -f2 -d_ | cut -f1 -d.` %endif @@ -794,12 +790,8 @@ done %triggerun runtime-java -- java-1.7.0-openjdk, java-1.6.0-openjdk for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do - %ifarch %{ix86} ppc64 ppc64le - %ifarch ppc64 ppc64le - arch=ppc64 - %else - arch=i386 - %endif + %ifarch %{ix86} + arch=i386 %else arch=`basename $f | cut -f2 -d_ | cut -f1 -d.` %endif @@ -812,12 +804,8 @@ done %triggerpostun runtime-java -- java-1.7.0-openjdk, java-1.6.0-openjdk # Restore links for any JDKs remaining after a package removal: for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do - %ifarch %{ix86} ppc64 ppc64le - %ifarch ppc64 ppc64le - arch=ppc64 - %else - arch=i386 - %endif + %ifarch %{ix86} + arch=i386 %else arch=`basename $f | cut -f2 -d_ | cut -f1 -d.` %endif -- 2.43.5