- release 6 (by relup.sh)

[packages/gnutls.git] / gnutls.spec

diff --git a/gnutls.spec b/gnutls.spec
index 4e8323e3fb08855edf1f31585007e2fd07fcb370..0fefcb24abe33fed84428b26384200142139fe2c 100644 (file)
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -1,6 +1,3 @@
-# NOTE: 3.3.x is previous-stable line
-# - for 3.4.x (current stable) see gnutls-3.4 branch (requires DEVEL p11-kit)
-# - for 3.5.x (next-stable) see DEVEL branch (requires DEVEL p11-kit)
 #
 # Conditional build:
 %bcond_without dane            # libdane (DANE with DNSSEC certificate verification)
@@ -12,12 +9,12 @@
 Summary:       The GNU Transport Layer Security Library
 Summary(pl.UTF-8):     Biblioteka GNU TLS (Transport Layer Security)
 Name:          gnutls
-Version:       3.3.24
-Release:       1
+Version:       3.6.5
+Release:       6
 License:       LGPL v2.1+ (libgnutls), LGPL v3+ (libdane), GPL v3+ (openssl library and tools)
 Group:         Libraries
-Source0:       ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/%{name}-%{version}.tar.xz
-# Source0-md5: 4057aa38fcceda709b73f4179ca0a21a
+Source0:       ftp://ftp.gnutls.org/gcrypt/gnutls/v3.6/%{name}-%{version}.tar.xz
+# Source0-md5: 3474849e1bbd4d16403b82ab2579000b
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-link.patch
 URL:           http://www.gnutls.org/
@@ -25,20 +22,20 @@ BuildRequires:      autoconf >= 2.61
 BuildRequires: autogen
 BuildRequires: autogen-devel
 BuildRequires: automake >= 1:1.12.2
-BuildRequires: gettext-tools >= 0.18
+BuildRequires: gettext-tools >= 0.19
 BuildRequires: gmp-devel
-%{?with_doc:BuildRequires:     gtk-doc >= 1.1}
+%{?with_doc:BuildRequires:     gtk-doc >= 1.14}
 BuildRequires: guile-devel >= 5:2.0
-BuildRequires: libcfg+-devel
-BuildRequires: libidn-devel
+BuildRequires: libidn2-devel
 BuildRequires: libstdc++-devel
-BuildRequires: libtasn1-devel >= 3.9
+BuildRequires: libtasn1-devel >= 4.11
+BuildRequires: libunistring-devel
 BuildRequires: libtool >= 2:2
-BuildRequires: nettle-devel >= 2.7.1
+BuildRequires: nettle-devel >= 3.3
 # miniopencdk is included in sources and currently maintained
 # as part of gnutls, not external package
 #BuildRequires:        opencdk-devel >= 0.6.6
-BuildRequires: p11-kit-devel >= 0.20.7
+BuildRequires: p11-kit-devel >= 0.23.1
 BuildRequires: pkgconfig
 BuildRequires: readline-devel
 BuildRequires: rpmbuild(macros) >= 1.383
@@ -69,10 +66,10 @@ grupę roboczą IETF TLS.
 Summary:       GnuTLS shared libraries
 Summary(pl.UTF-8):     Biblioteki współdzielone GnuTLS
 Group:         Libraries
-Requires:      libtasn1 >= 3.9
-Requires:      nettle >= 2.7.1
+Requires:      libtasn1 >= 4.11
+Requires:      nettle >= 3.3
 #Requires:     opencdk >= 0.6.6
-Requires:      p11-kit >= 0.20.7
+Requires:      p11-kit >= 0.23.1
 %{?with_tpm:Requires:  trousers-libs >= 0.3.11}
 Conflicts:     gnutls < 3.2.0
 
@@ -88,10 +85,12 @@ Summary(pl.UTF-8):  Pliki nagłówkowe i inne do gnutls
 License:       LGPL v2.1+ (libgnutls), GPL v3+ (openssl library)
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      libtasn1-devel >= 3.9
-Requires:      nettle-devel >= 2.7.1
+Requires:      libidn2-devel
+Requires:      libtasn1-devel >= 4.11
+Requires:      libunistring-devel
+Requires:      nettle-devel >= 3.3
 #Requires:     opencdk-devel >= 0.6.6
-Requires:      p11-kit-devel >= 0.20.7
+Requires:      p11-kit-devel >= 0.23.1
 %{?with_tpm:Requires:  trousers-devel >= 0.3.11}
 Requires:      zlib-devel
 
@@ -252,19 +251,18 @@ Wiązania Guile do GnuTLS.
 %{__rm} po/stamp-po
 
 %build
-%{__mv} build-aux/snippet{,.save}
 %{__libtoolize}
-%{__mv} build-aux/snippet{.save,}
-%{__aclocal} -I m4 -I gl/m4 -I src/libopts/m4 -I src/gl/m4
+%{__aclocal} -I m4 -I src/libopts/m4 -I src/gl/m4 -I lib/unistring/m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
-       %{!?with_openssl:--disable-openssl-compatibility} \
+       %{?with_openssl:--enable-openssl-compatibility} \
        --disable-silent-rules \
        %{?with_static_libs:--enable-static} \
        --with-default-trust-store-file=/etc/certs/ca-certificates.crt \
        %{!?with_tpm:--without-tpm} \
+       --with-trousers-lib=%{_libdir}/libtspi.so.1 \
        %{!?with_doc:--disable-doc}
 
 # docs build is broken with -jN
@@ -285,6 +283,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/guile/2.0/guile-gnutls-*.a
 %endif
 
+# images for (not installed) htmlized infos - already packaged with infos
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/gnutls/*.png
+
 %{__rm} -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %find_lang %{name}
@@ -315,9 +316,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README THANKS
+%doc AUTHORS ChangeLog NEWS README.md THANKS
 %attr(755,root,root) %{_bindir}/certtool
-%attr(755,root,root) %{_bindir}/crywrap
 %attr(755,root,root) %{_bindir}/gnutls-*
 %attr(755,root,root) %{_bindir}/ocsptool
 %attr(755,root,root) %{_bindir}/p11tool
@@ -340,7 +340,7 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgnutls.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnutls.so.28
+%attr(755,root,root) %ghost %{_libdir}/libgnutls.so.30
 
 %files devel
 %defattr(644,root,root,755)
@@ -390,6 +390,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgnutls-dane.la
 %{_includedir}/gnutls/dane.h
 %{_pkgconfigdir}/gnutls-dane.pc
+%{_mandir}/man3/dane_*.3*
 
 %if %{with static_libs}
 %files dane-static
@@ -418,6 +419,8 @@ rm -rf $RPM_BUILD_ROOT
 %files -n guile-gnutls
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/guile/2.0/guile-gnutls-v-2.so*
-%{_datadir}/guile/site/gnutls.scm
-%{_datadir}/guile/site/gnutls
-%{?with_doc:%{_infodir}/gnutls-guile.info*}
+%{_libdir}/guile/2.0/site-ccache/gnutls.go
+%{_libdir}/guile/2.0/site-ccache/gnutls
+%{_datadir}/guile/site/2.0/gnutls.scm
+%{_datadir}/guile/site/2.0/gnutls
+%{_infodir}/gnutls-guile.info*