[CVector: 3/3] really use %%{_lib} detection
tmatsuu
tmatsuu at fedoraproject.org
Sat Apr 9 14:42:40 UTC 2011
commit 41e1db2b776663b0b1abb28d3bb0bb3ff2049d3d
Author: Takanori MATSUURA <t.matsuu at gmail.com>
Date: Sat Apr 9 23:40:26 2011 +0900
really use %%{_lib} detection
CVector.spec | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
---
diff --git a/CVector.spec b/CVector.spec
index 53c0cf2..77ff706 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,7 +76,6 @@ 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
@@ -88,12 +83,6 @@ rm -rf %{buildroot}
- 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
More information about the scm-commits
mailing list