From d7d593aeb28de5ad27ba489145031e170c7ebe21 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Jan 02 2015 13:14:23 +0000 Subject: Merge branch 'master' into el6 --- diff --git a/.gitignore b/.gitignore index afd3d21..71cdb0a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /alglib-3.8.2.cpp.tgz +/alglib-3.9.0.cpp.gpl.tgz diff --git a/CMakeLists.txt b/CMakeLists.txt index 1410f48..6c8a871 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,13 @@ # Set the minimum required version of cmake for a project. cmake_minimum_required(VERSION 2.6) +set(ALGLIB_VERSION "" CACHE STRING "The package version") + file(GLOB_RECURSE HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/*.h) file(GLOB_RECURSE SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/*.cpp) add_library(alglib SHARED ${SRC}) -set_target_properties(alglib PROPERTIES VERSION 3.8.2 SOVERSION 3) +set_target_properties(alglib PROPERTIES SUFFIX "-${ALGLIB_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") add_executable(test_c tests/test_c.cpp) add_executable(test_i tests/test_i.cpp) diff --git a/alglib.spec b/alglib.spec index b86f3b0..acfd774 100644 --- a/alglib.spec +++ b/alglib.spec @@ -1,17 +1,20 @@ Name: alglib -Version: 3.8.2 -Release: 4%{?dist} +Version: 3.9.0 +Release: 1%{?dist} Summary: A numerical analysis and data processing library License: GPLv2+ URL: http://www.alglib.net/ -Source0: http://www.alglib.net/translator/re/%{name}-%{version}.cpp.tgz +Source0: http://www.alglib.net/translator/re/%{name}-%{version}.cpp.gpl.tgz Source1: CMakeLists.txt # Extracted from manual.cpp.html Source2: bsd.txt BuildRequires: cmake +# As upstream doesn't support other archs, and package fails to build on secondary archs due test failure +ExclusiveArch: %{ix86} %{arm} x86_64 + %description ALGLIB is a cross-platform numerical analysis and data processing library. ALGLIB features include: @@ -56,13 +59,15 @@ sed -i 's|\r||g' manual.cpp.html mkdir build ( cd build -%cmake .. +%cmake -DALGLIB_VERSION=%{version} .. make %{?_smp_mflags} ) %install %make_install -C build +ln -s libalglib-%{version}.so %{buildroot}%{_libdir}/libalglib.so + %check pushd build @@ -78,7 +83,7 @@ popd %files %doc gpl2.txt -%{_libdir}/libalglib.so.* +%{_libdir}/libalglib-%{version}.so %files devel %{_includedir}/%{name}/ @@ -89,6 +94,16 @@ popd %changelog +* Sat Dec 13 2014 Sandro Mani - 3.9.0-1 +- Update to 3.9.0 +- Use version as library name suffix, not as soname + +* Fri Aug 15 2014 Fedora Release Engineering - 3.8.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Wed Jul 9 2014 Jakub Čajka - 3.8.2-5 +- Made exlusive for primary archs + * Wed Jun 18 2014 Sandro Mani - 3.8.2-4 - Add missing license tag diff --git a/sources b/sources index fc37d24..ef8aa56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a28827b5b9c98638dff7fcfa8f877ac7 alglib-3.8.2.cpp.tgz +6506342f1614c460298c8d4f2a342066 alglib-3.9.0.cpp.gpl.tgz