summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-04-08 08:32:32 +0200
committerRemi Collet <remi@remirepo.net>2021-04-08 08:32:32 +0200
commitf3ec0d1fa002d648a25c56b7e4ab69fd4c769bbc (patch)
tree429622a6a8a0d8af92f0d604b8f8b2a5786f297a
parentc54baf941bf23ea3a2179e3d43f783f457f9addd (diff)
update to 19.22HEADmaster
-rw-r--r--dlib.spec25
1 files changed, 13 insertions, 12 deletions
diff --git a/dlib.spec b/dlib.spec
index 5e431ed..202379e 100644
--- a/dlib.spec
+++ b/dlib.spec
@@ -1,13 +1,13 @@
# remirepo/fedora spec file for dlib
#
-# Copyright (c) 2020 Remi Collet
+# Copyright (c) 2020-2021 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
-%global gh_commit 9117bd784328d9ac40ffa1f9cf487633a8a715d7
+%global gh_commit 70ea028f12e10f4d992a0c4f0169749eae5bb185
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner davisking
%global gh_project dlib
@@ -16,7 +16,7 @@
Name: %{gh_project}
Summary: A toolkit for making real world machine learning and data analysis
-Version: 19.21
+Version: 19.22
Release: 1%{?dist}
License: Boost
@@ -26,16 +26,11 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}
# only really needed libraries, not using full path
Patch0: %{gh_project}-pc.patch
-%if 0%{?rhel} == 6 || 0%{?rhel} == 7
-BuildRequires: cmake3
%if 0%{?rhel} == 7
+BuildRequires: cmake3
%global dtsenable source /opt/rh/devtoolset-7/enable
BuildRequires: devtoolset-7-toolchain
%else
-%global dtsenable source /opt/rh/devtoolset-6/enable
-BuildRequires: devtoolset-6-toolchain
-%endif
-%else
BuildRequires: cmake
BuildRequires: gcc
BuildRequires: gcc-c++
@@ -80,14 +75,14 @@ for %{libname}.
mkdir build
cd build
-%if 0%{?rhel} == 6 || 0%{?rhel} == 7
+%if 0%{?rhel} == 7
%{dtsenable}
%cmake3 \
%else
%cmake \
%endif
- ..
+ -B . -S ..
make %{_smp_mflags}
@@ -99,7 +94,7 @@ sed -E '/private/s:%{_libdir}/lib([^ ]*).so:-l\1:g' \
%install
cd build
-%if 0%{?rhel} == 6 || 0%{?rhel} == 7
+%if 0%{?rhel} == 7
%{dtsenable}
%endif
@@ -126,6 +121,12 @@ make install DESTDIR="%{buildroot}"
%changelog
+* Thu Apr 8 2021 Remi Collet <remi@remirepo.net> - 19.22-1
+- update to 19.22
+
+* Tue Aug 18 2020 Remi Collet <remi@remirepo.net> - 19.21-2
+- F33 build
+
* Sun Aug 9 2020 Remi Collet <remi@remirepo.net> - 19.21-1
- update to 19.21