[abi-compliance-checker/el6: 2/2] Merge remote-tracking branch 'origin/master' into el6 Drop gcc-c++ version for el6 Conflicts: abi-c

[Orion Poplawski]

commit 820ac96e8a5ae6cd99749017596e52bbbc88e5ce
Merge: 44c263d 563d493
Author: Orion Poplawski <orion at nwra.com>
Date:   Fri May 3 16:50:40 2013 -0600

    Merge remote-tracking branch 'origin/master' into el6
    Drop gcc-c++ version for el6
    Conflicts:
    	abi-compliance-checker.spec

 abi-compliance-checker.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --cc abi-compliance-checker.spec
index eef3d07,1ea26c1..6b96661
--- a/abi-compliance-checker.spec
+++ b/abi-compliance-checker.spec
@@@ -8,8 -8,11 +8,10 @@@ URL:            http://ispras.linuxbase
  Source0:        https://github.com/lvc/%{name}/downloads/%{name}-%{version}.tar.gz
  
  BuildArch:      noarch
- Requires:       gcc
 -Requires:       gcc >= 4.5
 -Requires:       gcc-c++ >= 4.5
++Requires:       gcc-c++
  Requires:       binutils
+ Requires:       ctags >= 5.8
+ Requires:       ccache > 3.1.2
  
  %{?perl_default_filter}