- up to 3.10.4

diff --git a/libdigidoc-cmake.patch b/libdigidoc-cmake.patch
index c5c8a49861d4c73655392e23b6e61aacf425f8e2..8c95a0573552c62c0922c2c2ba078cb180ea1371 100644 (file)
--- a/libdigidoc-cmake.patch
+++ b/libdigidoc-cmake.patch
@@ -1,38 +1,11 @@
---- libdigidoc-3.10.2/CMakeLists.txt.orig      2016-02-01 11:43:08.000000000 +0100
-+++ libdigidoc-3.10.2/CMakeLists.txt   2017-11-25 09:17:52.191901184 +0100
-@@ -1,5 +1,5 @@
- cmake_minimum_required( VERSION 2.8 )
--project( libdigidoc )
-+project( libdigidoc C)
- 
- set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
- set( CMAKE_FIND_ROOT_PATH ${CMAKE_OSX_SYSROOT} )
---- libdigidoc-3.10.2/libdigidoc/CMakeLists.txt.orig   2016-02-01 11:43:08.000000000 +0100
-+++ libdigidoc-3.10.2/libdigidoc/CMakeLists.txt        2017-11-25 09:18:35.061900692 +0100
-@@ -95,7 +95,6 @@
- 
- if( BUILD_TOOLS )
-       add_executable(cdigidoc cdigidoc.c cdigidoc.rc)
--      set_target_properties(cdigidoc PROPERTIES INSTALL_RPATH "@loader_path/../../../..;@loader_path/../..")
-       target_link_libraries(cdigidoc digidoc)
- endif()
- 
---- libdigidoc-3.10.2/cmake/modules/VersionInfo.cmake.orig     2016-02-01 11:43:09.000000000 +0100
-+++ libdigidoc-3.10.2/cmake/modules/VersionInfo.cmake  2017-11-25 09:23:11.785230866 +0100
-@@ -69,14 +69,14 @@
- 
- if(CMAKE_COMPILER_IS_GNUCC OR __COMPILER_GNU)
-       if(NOT DEFINED ENABLE_VISIBILITY)
--              set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") 
-+              set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") 
-               set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
-               #set( CMAKE_C_VISIBILITY_PRESET hidden )
-               #set( CMAKE_CXX_VISIBILITY_PRESET hidden )
-               #set( CMAKE_VISIBILITY_INLINES_HIDDEN 1 )
+--- libdigidoc-3.10.4/cmake/modules/VersionInfo.cmake~ 2018-06-12 12:22:01.000000000 +0200
++++ libdigidoc-3.10.4/cmake/modules/VersionInfo.cmake  2018-09-14 20:59:46.952522826 +0200
+@@ -81,7 +81,7 @@ if(NOT DEFINED ENABLE_VISIBILITY)
        endif()
+ endif()
  
--      if(NOT DISABLE_CXX11)
-+      if(FALSE)
-               include(CheckCXXCompilerFlag)
-               CHECK_CXX_COMPILER_FLAG(-std=c++11 C11)
-               CHECK_CXX_COMPILER_FLAG(-std=c++0x C0X)
+-if(NOT DISABLE_CXX11)
++if(FALSE)
+       if(CMAKE_VERSION VERSION_GREATER  3.1.0)
+               set(CMAKE_CXX_STANDARD 11)
+               set(CMAKE_CXX_STANDARD_REQUIRED YES)

diff --git a/libdigidoc.spec b/libdigidoc.spec
index 243e869c510a0a99265c07c83dcba2cb4df1ca4f..13540d8fda715b632c39764d03368be27bdb2243 100644 (file)
--- a/libdigidoc.spec
+++ b/libdigidoc.spec
@@ -1,16 +1,13 @@
 Summary:       XAdES digital signature standard library
 Summary(pl.UTF-8):     Biblioteka obsługująca standard podpisów cyfrowych XAdES
 Name:          libdigidoc
-# Note: 3.10.3 is tagged, but release tarball is not published;
-# as it doesn't have substantial improvements on Linux and requires git submodules,
-# stick to 3.10.2 for now.
-Version:       3.10.2
-Release:       3
+Version:       3.10.4
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 #Source0Download: https://github.com/open-eid/libdigidoc/releases
 Source0:       https://github.com/open-eid/libdigidoc/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 987a21c44a8b627794b6f810bf15465f
+# Source0-md5: 050c73fe991dae0ffe3afec616e20851
 Patch0:                %{name}-cmake.patch
 URL:           https://github.com/open-eid/libdigidoc
 BuildRequires: cmake >= 2.8
@@ -86,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS README.md RELEASE-NOTES.txt
+%doc AUTHORS README.md RELEASE-NOTES.md
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/digidoc.conf
 %attr(755,root,root) %{_libdir}/libdigidoc.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libdigidoc.so.2