From bb5b54c3d0b76dee2bb4d01291168a5c48e94092 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Sun, 17 Jan 2021 10:29:59 +0100 Subject: [PATCH] upgrading package: opennn 3.0 -> 5.0.5 --- opennn/opennn.patch | 15 --------------- opennn/opennn.spec | 18 ++++++++++++------ 2 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 opennn/opennn.patch diff --git a/opennn/opennn.patch b/opennn/opennn.patch deleted file mode 100644 index 2777555f17..0000000000 --- a/opennn/opennn.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: CMakeLists.txt ---- CMakeLists.txt.orig 2018-01-21 00:31:00.000000000 +0100 -+++ CMakeLists.txt 2018-01-21 00:43:02.311755000 +0100 -@@ -28,11 +28,7 @@ - # Uncomment next line to compile without using C++11 - #add_definitions(-D__Cpp11__) - --add_subdirectory(tinyxml2) - add_subdirectory(opennn) - include_directories(opennn) --add_subdirectory(examples) --add_subdirectory(blank) --add_subdirectory(tests) - - include(CPack) diff --git a/opennn/opennn.spec b/opennn/opennn.spec index 0fca784d98..ac82ab2c49 100644 --- a/opennn/opennn.spec +++ b/opennn/opennn.spec @@ -22,8 +22,8 @@ ## # package version -%define V_opkg 3.0 -%define V_dist 20180505 +%define V_opkg 5.0.5 +%define V_dist 20210117 # package information Name: opennn @@ -36,11 +36,10 @@ Class: EVAL Group: Algorithm License: LGPL Version: %{V_opkg} -Release: 20180505 +Release: 20210117 # list of sources Source0: http://download.openpkg.org/components/versioned/opennn/opennn-%{V_dist}.tar.xz -Patch0: opennn.patch # build information BuildPreReq: OpenPKG, openpkg >= 20160101, cmake @@ -57,7 +56,12 @@ PreReq: OpenPKG, openpkg >= 20160101 (classification) and time series prediction (forecasting). %track - prog opennn = { + prog opennn:base = { + version = %{V_opkg} + url = https://github.com/Artelnics/opennn/releases + regex = v(__VER__)\.tar\.gz + } + prog opennn:snap = { version = %{V_dist} url = http://download.openpkg.org/components/versioned/opennn/ regex = opennn-(__VER__)\.tar\.xz @@ -65,7 +69,6 @@ PreReq: OpenPKG, openpkg >= 20160101 %prep %setup -q -n opennn - %patch -p0 %build mkdir build @@ -79,6 +82,9 @@ PreReq: OpenPKG, openpkg >= 20160101 -DCMAKE_CXX_COMPILER="%{l_cxx}" \ -DCMAKE_CXX_FLAGS="%{l_cxxflags} -std=c++14 -Wno-deprecated-declarations -Wno-ignored-attributes -Wno-enum-compare" \ -DBUILD_SHARED_LIBS=OFF \ + -DOpenNN_BUILD_EXAMPLES=OFF \ + -DOpenNN_BUILD_BLANK=OFF \ + -DOpenNN_BUILD_TESTS=OFF \ .. %{l_make} %{l_mflags -O}