- updated to 3.13.2

- added link patch (fix missing libpthread linking)

diff --git a/libdigidocpp-link.patch b/libdigidocpp-link.patch
new file mode 100644 (file)
index 0000000..f92c9ad
--- /dev/null
+++ b/libdigidocpp-link.patch
@@ -0,0 +1,10 @@
+--- libdigidocpp-3.13.2/src/CMakeLists.txt.orig        2017-10-24 18:48:34.000000000 +0200
++++ libdigidocpp-3.13.2/src/CMakeLists.txt     2017-11-25 11:25:52.228480156 +0100
+@@ -251,6 +251,7 @@
+     ${TARGET_LIBRARIES}
+     ${OPENSSL_LIBRARIES}
+     ${ZLIB_LIBRARIES}
++    pthread
+ )
+ 
+ if( BUILD_TOOLS )

diff --git a/libdigidocpp.spec b/libdigidocpp.spec
index 20d3e8d1ff0db64ca2211f1ddbbcc40fac63ec7d..fb2fe5c8c7424d5fd06ebf8289f6041a8aabfc35 100644 (file)
--- a/libdigidocpp.spec
+++ b/libdigidocpp.spec
@@ -1,9 +1,9 @@
 #
 # Conditional build:
-%bcond_without perl    # perl module
-%bcond_without php             # php module
-%bcond_without python  # python module
-%bcond_with            bindings        # build bindings
+%bcond_without perl            # Perl module
+%bcond_without php             # PHP module
+%bcond_without python          # Python module
+%bcond_with    bindings        # build bindings (currently only C#/Win32 and Java/Android supported)
 
 %if %{without bindings}
 %undefine      with_perl
@@ -12,25 +12,31 @@
 %endif
 
 Summary:       Library for creating and validating BDoc and DDoc containers
+Summary(pl.UTF-8):     Biblioteka do tworzenia i sprawdzania poprawności kontenerów BDoc i DDoc
 Name:          libdigidocpp
-Version:       3.12.3
+Version:       3.13.2
 Release:       1
-License:       LGPL v2+
+License:       LGPL v2.1+
 Group:         Libraries
 Source0:       https://github.com/open-eid/libdigidocpp/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: deead245114c60c3afe7c4a3b3c81060
+# Source0-md5: bc7b44fa9ff66669169337f330112ed4
+Patch0:                %{name}-link.patch
 URL:           https://github.com/open-eid/libdigidocpp
+# for tests
 BuildRequires: boost-devel
-BuildRequires: cmake
+BuildRequires: cmake >= 3.0
+BuildRequires: doxygen
 BuildRequires: libdigidoc-devel >= 3.9
-BuildRequires: libp11-devel
+BuildRequires: libstdc++-devel
 BuildRequires: minizip-devel
-BuildRequires: openssl-devel
+BuildRequires: openssl-devel >= 1.0.1
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.583
+BuildRequires: xerces-c-devel
 BuildRequires: xml-security-c-devel
-BuildRequires: xsd
+BuildRequires: xsd >= 4.0
 BuildRequires: xxd
+BuildRequires: zlib-devel
 %if %{with perl} || %{with php} || %{with python}
 BuildRequires: swig
 %endif
@@ -47,81 +53,113 @@ Requires:  libdigidoc >= 3.9
 Requires:      opensc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# missing -lpthread, -lxalan-c, etc
-%define                skip_post_check_so      libdigidocpp.so.%{version}
+# std::{__once_call,__once_callable} non-function symbols
+%define                skip_post_check_so      libdigidocpp.so.*
 
 %description
 libdigidocpp is a C++ library for reading, validating, and creating
 BDoc and DDoc containers. These file formats are widespread in Estonia
 where they are used for storing legally binding digital signatures.
 
+%description -l pl.UTF-8
+libdigidocpp to biblioteka C++ do odczytu, sprawdzania poprawności i
+tworzenia kontenerów BDoc i DDoc. Te formaty plików są
+rozpowszechnione w Estonii, gdzie służą do przechowywania umocowanych
+prawnie podpisów cyfrowych.
+
 %package devel
-Summary:       Development files for %{name}
+Summary:       Development files for libdigidocpp library
+Summary(pl.UTF-8):     Pliki programistyczne biblioteki libdigidocpp
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      libdigidoc-devel
-Requires:      libp11-devel
-Requires:      openssl-devel
-Requires:      xml-security-c-devel
-Requires:      xsd
+Requires:      libstdc++-devel
 
 %description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
+This package contains the header files for developing applications
+that use libdigidocpp library.
+
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe do tworzenia aplikacji
+wykorzystujących bibliotekę libdigidocpp.
+
+%package apidocs
+Summary:       API documentation for libdigidocpp library
+Summary(pl.UTF-8):     Dokumentacja API biblioteki libdigidocpp
+Group:         Documentation
+
+%description apidocs
+API documentation for libdigidocpp library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki libdigidocpp.
 
 %package -n perl-digidoc
-Summary:       Perl bindings for %{name}
-Group:         Development/Languages
+Summary:       Perl bindings for libdigidocpp library
+Summary(pl.UTF-8):     Wiązania Perla do biblioteki libdigidocpp
+Group:         Development/Languages/Perl
 Requires:      %{name} = %{version}-%{release}
 Provides:      %{name}-perl = %{version}-%{release}
 Obsoletes:     libdigidocpp-perl < 0.3.0-1
 
 %description -n perl-digidoc
-The perl-digidoc package contains Perl bindings for the %{name}
-library.
+Perl bindings for libdigidocpp library.
+
+%description -n perl-digidoc -l pl.UTF-8
+Wiązania Perla do biblioteki libdigidocpp.
 
 %package -n php-digidoc
-Summary:       PHP bindings for %{name}
-Group:         Development/Languages
+Summary:       PHP bindings for libdigidocpp library
+Summary(pl.UTF-8):     Wiązania PHP do biblioteki libdigidocpp
+Group:         Development/Languages/PHP
 Requires:      %{name} = %{version}-%{release}
 %{?requires_php_extension}
 Provides:      %{name}-php = %{version}-%{release}
 Obsoletes:     libdigidocpp-php < 0.3.0-1
 
 %description -n php-digidoc
-The php-digidoc package contains PHP bindings for the %{name} library.
+PHP bindings for libdigidocpp library.
+
+%description -n php-digidoc -l pl.UTF-8
+Wiązania PHP do biblioteki libdigidocpp.
 
 %package -n python-digidoc
-Summary:       Python bindings for %{name}
-Group:         Development/Languages
+Summary:       Python bindings for libdigidocpp library
+Summary(pl.UTF-8):     Wiązania Pythona do biblioteki libdigidocpp
+Group:         Development/Languages/Python
 Requires:      %{name} = %{version}-%{release}
 Provides:      %{name}-python = %{version}-%{release}
 Obsoletes:     libdigidocpp-python < 0.3.0-1
 
 %description -n python-digidoc
-The python-digidoc package contains Python bindings for the %{name}
-library.
+Python bindings for libdigidocpp library.
+
+%description -n python-digidoc -l pl.UTF-8
+Wiązania Pythona do biblioteki libdigidocpp.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Remove bundled copy of minizip
-rm -r src/minizip
-# Remove bundled openssl
-rm -r src/openssl
+%{__rm} -r src/minizip
 
 %build
 install -d build
 cd build
 %cmake .. \
-       %{!?with_bindings:-DENABLE_BINDINGS=NO}
+       -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name}
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -130,7 +168,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS README.md RELEASE-NOTES.txt
+%doc AUTHORS COPYING README.md RELEASE-NOTES.md
 %dir %{_sysconfdir}/digidocpp
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/digidocpp/digidocpp.conf
 # XXX ?
@@ -143,10 +181,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/libdigidocpp.so
+%attr(755,root,root) %{_libdir}/libdigidocpp.so
 %{_includedir}/digidocpp
 %{_pkgconfigdir}/libdigidocpp.pc
 
+%files apidocs
+%defattr(644,root,root,755)
+%doc build/doc/*
+
 %if %{with perl}
 %files -n perl-digidoc
 %defattr(644,root,root,755)