From 93a149fe89912dc09561f3748d13288e55820f56 Mon Sep 17 00:00:00 2001 From: Gabriel Féron Date: Jul 08 2019 11:16:42 +0000 Subject: Update to 4.1.0 Signed-off-by: Gabriel Féron --- diff --git a/.gitignore b/.gitignore index 1561342..3b589b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1 @@ -/libsavitar-0-1ad7ddb.tar.gz -/libsavitar-2.6.0.tar.gz -/libsavitar-2.6.1.tar.gz -/libsavitar-2.7.0.tar.gz -/libsavitar-3.0.3.tar.gz -/libsavitar-3.1.0.tar.gz -/libsavitar-3.2.1.tar.gz -/libsavitar-3.3.0.tar.gz -/libsavitar-3.4.1.tar.gz -/libsavitar-3.5.1.tar.gz -/libsavitar-3.6.0.tar.gz -/libsavitar-4.0.0.tar.gz +/libsavitar-*.tar.gz diff --git a/libsavitar-no-pugixml.patch b/libsavitar-no-pugixml.patch index 7f828aa..841c016 100644 --- a/libsavitar-no-pugixml.patch +++ b/libsavitar-no-pugixml.patch @@ -1,25 +1,22 @@ -From da7aea99012720c316881a10cb41ebbb9526d84b Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Wed, 3 May 2017 17:02:08 +0200 +From b76fcd6da723cc725f2703d6c1b82b954a1bd03a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= +Date: Tue, 18 Jun 2019 22:45:17 +0200 Subject: [PATCH] Don't build pugixml ---- - CMakeLists.txt | 2 -- - 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 040830c..a8f700d 100644 +index eecd5e9..7ec2b2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -8,8 +8,6 @@ option(BUILD_PYTHON "Build " ON) - option(BUILD_STATIC "Build as a static library" OFF) - +@@ -15,8 +15,6 @@ if(BUILD_TESTS) + find_package(Threads QUIET) + endif() -add_subdirectory(pugixml) - if(BUILD_PYTHON) - set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) - find_package(SIP REQUIRED) + list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) + -- -2.11.0 +2.21.0 diff --git a/libsavitar.spec b/libsavitar.spec index cafcd69..2fe6b68 100644 --- a/libsavitar.spec +++ b/libsavitar.spec @@ -1,5 +1,5 @@ Name: libsavitar -Version: 4.0.0 +Version: 4.1.0 Release: 1%{?dist} Summary: C++ implementation of 3mf loading with SIP Python bindings License: LGPLv3+ @@ -58,14 +58,16 @@ dos2unix README.md rm pugixml -rf sed -i 's|"../pugixml/src/pugixml.hpp"||g' src/*.cpp src/*.h +# https://github.com/Ultimaker/libSavitar/pull/18 +sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %build export CXXFLAGS="%{optflags} -Wl,--as-needed" %{cmake} -DCMAKE_SKIP_RPATH:BOOL=ON . -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install %files %license LICENSE @@ -85,6 +87,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Savitar.so %changelog +* Tue Jun 18 2019 Gabriel Féron - 4.1.0-1 +- Update to 4.1.0 + * Wed Apr 03 2019 Gabriel Féron - 4.0.0-1 - Update to 4.0.0 diff --git a/sources b/sources index a5a47bd..1025cce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libsavitar-4.0.0.tar.gz) = 38bf9325cbe7ccd8e6b28ed4ca77c9421cb43810e6dd8746a51a1403fc0284c5f0b38f69780eadbcaf024089d1b6f230018c8eabb831a0dc7c1c50a851376c7f +SHA512 (libsavitar-4.1.0.tar.gz) = c25fcfa3abdb437d93932bf0be33a40bfdad2925a62631eb42fcb31ca7a452f2094cf794354c7ce5cd960e1051c958415fd6bc7dfddfc432fa459cf8ab02c8d2