[CVector/el6/master] really use %%{_lib} detection

[tmatsuu]

commit 20380ee5dbf3920fa73b648c905f0dc2907b70e3
Author: Takanori MATSUURA <t.matsuu at gmail.com>
Date:   Sat Apr 9 23:41:10 2011 +0900

    really use %%{_lib} detection

 CVector.spec |   16 +---------------
 1 files changed, 1 insertions(+), 15 deletions(-)
---
diff --git a/CVector.spec b/CVector.spec
index 53c0cf2..4e06739 100644
--- a/CVector.spec
+++ b/CVector.spec
@@ -4,11 +4,7 @@
 
 Name:           CVector
 Version:        %{version_number}.1
-<<<<<<< HEAD
 Release:        %release_func 3
-=======
-Release:        %release_func 2
->>>>>>> dd263fec138f62ad9c2de2e944b9897303d30dec
 Summary:        ANSI C API for Dynamic Arrays
 
 Group:          System Environment/Libraries
@@ -43,7 +39,7 @@ developing applications that use CVector.
 %prep
 %setup -q
 %patch0 -p1 -b .dynamic
-%ifarch x86_64 ppc64 s390x
+%if %{_lib} == lib64
 %patch1 -p1 -b .lib64
 %endif
 
@@ -80,20 +76,10 @@ rm -rf %{buildroot}
 %{_libdir}/libCVector.so
 
 %changelog
-<<<<<<< HEAD
 * Sat Apr  9 2011 Takanori MATSUURA <t.matsuu at gmail.com> - 1.0.3.1-3
 - use %%{_lib} detection to fix
 
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
 * Tue Oct 26 2010 Takanori MATSUURA <t.matsuu at gmail.com> - 1.0.3.1-1
-=======
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Oct 26 2010 Takanori MATSUURA <t.matsuu at gmail.com> - 1.0.3.1-1
->>>>>>> dd263fec138f62ad9c2de2e944b9897303d30dec
 - update to 1.0.3.1
 - use "make all" instead of "make"
 - add %%check