[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fedora-extras-commits
Subject:    [systemtap/f17: 5/5] fix merge
From:       Peter Robinson <pbrobinson () fedoraproject ! org>
Date:       2012-04-30 23:15:46
Message-ID: 20120430231546.4C8E821A04 () pkgs01 ! phx2 ! fedoraproject ! org
[Download RAW message or body]

commit f395bbb47d7c954210da296e6c3a592ba51e82b4
Merge: cc32092 c39c596
Author: Peter Robinson <pbrobinson@gmail.com>
Date:   Tue May 1 00:15:30 2012 +0100

    fix merge

 systemtap.spec |   65 ++++++++++++++++++++++---------------------------------
 1 files changed, 26 insertions(+), 39 deletions(-)
---
diff --cc systemtap.spec
index e6db00c,bc7bc52..eda46ea
--- a/systemtap.spec
+++ b/systemtap.spec
@@@ -11,11 -12,7 +12,11 @@@
  %{!?pie_supported: %global pie_supported 1}
  %{!?with_grapher: %global with_grapher 1}
  %{!?with_boost: %global with_boost 0}
- %ifarch %{arm} ppc ppc64 # Broken fop/java on ARM.
++%ifarch ppc ppc64 # Broken fop/java on ARM.
 +%{!?with_publican: %global with_publican 0}
 +%else
  %{!?with_publican: %global with_publican 1}
 +%endif
  %{!?publican_brand: %global publican_brand fedora}
  
  Name: systemtap
-- 
scm-commits mailing list
scm-commits@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/scm-commits
[prev in list] [next in list] [prev in thread] [next in thread]