[cminpack] fix build on 64-bit secondary arches

Dan Horák sharkcz at fedoraproject.org
Wed Jun 13 07:51:51 UTC 2012


commit a3b8ac8fcb6fbc90f81cb707cbd73f72fda2b51c
Author: Dan Horák <dan at danny.cz>
Date:   Wed Jun 13 09:51:45 2012 +0200

    fix build on 64-bit secondary arches

 cminpack-1.1.3-64bit.patch |   18 ------------------
 cminpack.spec              |    9 +++++----
 2 files changed, 5 insertions(+), 22 deletions(-)
---
diff --git a/cminpack.spec b/cminpack.spec
index 5e7919a..9d2e0b8 100644
--- a/cminpack.spec
+++ b/cminpack.spec
@@ -1,13 +1,12 @@
 Name:           cminpack
 Version:        1.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Solver for nonlinear equations and nonlinear least squares problems
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://devernay.free.fr/hacks/cminpack/cminpack.html
 Source0:        http://devernay.free.fr/hacks/cminpack/%{name}-%{version}.tar.gz
-Patch0:         %{name}-1.1.3-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -29,12 +28,11 @@ cminpack.
 
 %prep
 %setup -q
-#%patch0 -p1 -b .64bit
 
 %build
 mkdir build
 pushd build
-%cmake -DUSE_FPIC=ON -DSHARED_LIBS=ON -DBUILD_EXAMPLES=ON -DBUILD_EXAMPLES_FORTRAN=ON ..
+%cmake -DUSE_FPIC=ON -DSHARED_LIBS=ON -DBUILD_EXAMPLES=ON -DBUILD_EXAMPLES_FORTRAN=ON -DCMINPACK_LIB_INSTALL_DIR=%{_lib} ..
 popd
 make -C build  %{?_smp_mflags}
 
@@ -65,6 +63,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jun 13 2012 Dan Horák <dan[at]danny.cz> - 1.2.2-2
+- fix build on 64-bit secondary arches
+
 * Fri May 25 2012 Rich Mattes <richmattes at gmail.com> - 1.2.2-1
 - Upgrade to version 1.2.2
 


More information about the scm-commits mailing list