- updated to 3.3.15

- merged -openssl split from DEVEL

diff --git a/gnutls.spec b/gnutls.spec
index c56bb73579233951633a496a887e2e21fc843c71..a5c0280e94601f64e56c6d4b8bd0511c824bd16a 100644 (file)
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -1,18 +1,19 @@
 #
 # Conditional build:
 %bcond_without dane            # libdane (DANE with DNSSEC certificate verification)
+%bcond_without openssl         # libgnutls-openssl compatibility library
 %bcond_without tpm             # TPM support in gnutls
 %bcond_without static_libs     # static libraries
 #
 Summary:       The GNU Transport Layer Security Library
 Summary(pl.UTF-8):     Biblioteka GNU TLS (Transport Layer Security)
 Name:          gnutls
-Version:       3.3.14
+Version:       3.3.15
 Release:       1
 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.lz
-# Source0-md5: 3865e9798865790910d8b4af446717d1
+# Source0-md5: 727edda20daac10c5f5eeda9b9f79654
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-link.patch
 URL:           http://www.gnutls.org/
@@ -30,7 +31,8 @@ BuildRequires:        libstdc++-devel
 BuildRequires: libtasn1-devel >= 3.9
 BuildRequires: libtool >= 2:2
 BuildRequires: lzip
-BuildRequires: nettle-devel >= 2.7
+BuildRequires: nettle-devel >= 2.7.1
+BuildRequires: nettle-devel < 3.0
 # miniopencdk is included in sources and currently maintained
 # as part of gnutls, not external package
 #BuildRequires:        opencdk-devel >= 0.6.6
@@ -65,7 +67,7 @@ Summary:      GnuTLS shared libraries
 Summary(pl.UTF-8):     Biblioteki współdzielone GnuTLS
 Group:         Libraries
 Requires:      libtasn1 >= 3.9
-Requires:      nettle >= 2.7
+Requires:      nettle >= 2.7.1
 #Requires:     opencdk >= 0.6.6
 Requires:      p11-kit >= 0.20.7
 %{?with_tpm:Requires:  trousers-libs >= 0.3.11}
@@ -84,7 +86,7 @@ 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
+Requires:      nettle-devel >= 2.7.1
 #Requires:     opencdk-devel >= 0.6.6
 Requires:      p11-kit-devel >= 0.20.7
 %{?with_tpm:Requires:  trousers-devel >= 0.3.11}
@@ -188,6 +190,43 @@ Static DANE security library.
 %description dane-static -l pl.UTF-8
 Statyczna biblioteka bezpieczeństwa DANE.
 
+%package openssl
+Summary:       OpenSSL compatibility library for GnuTLS
+Summary(pl.UTF-8):     Biblioteka zgodności z OpenSSL dla GnuTLS
+Group:         Libraries
+Requires:      %{name}-libs = %{version}-%{release}
+
+%description openssl
+OpenSSL compatibility library for GnuTLS.
+
+%description openssl -l pl.UTF-8
+Biblioteka zgodności z OpenSSL dla GnuTLS.
+
+%package openssl-devel
+Summary:       Header file for gnutls-openssl library
+Summary(pl.UTF-8):     Plik nagłówkowy biblioteki gnutls-openssl
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+Requires:      %{name}-openssl = %{version}-%{release}
+
+%description openssl-devel
+Header file for gnutls-openssl library.
+
+%description openssl-devel -l pl.UTF-8
+Plik nagłówkowy biblioteki gnutls-openssl.
+
+%package openssl-static
+Summary:       Static gnutls-openssl library
+Summary(pl.UTF-8):     Statyczna biblioteka gnutls-openssl
+Group:         Development/Libraries
+Requires:      %{name}-openssl-devel = %{version}-%{release}
+
+%description openssl-static
+Static gnutls-openssl library.
+
+%description openssl-static -l pl.UTF-8
+Statyczna biblioteka gnutls-openssl.
+
 %package -n guile-gnutls
 Summary:       Guile bindings for GnuTLS
 Summary(pl.UTF-8):     Wiązania Guile do GnuTLS
@@ -218,6 +257,7 @@ Wiązania Guile do GnuTLS.
 %{__autoheader}
 %{__automake}
 %configure \
+       %{!?with_openssl:--disable-openssl-compatibility} \
        --disable-silent-rules \
        %{?with_static_libs:--enable-static} \
        --with-default-trust-store-file=/etc/certs/ca-certificates.crt \
@@ -260,6 +300,12 @@ rm -rf $RPM_BUILD_ROOT
 %post  c++ -p /sbin/ldconfig
 %postun        c++ -p /sbin/ldconfig
 
+%post  dane -p /sbin/ldconfig
+%postun        dane -p /sbin/ldconfig
+
+%post  openssl -p /sbin/ldconfig
+%postun        openssl -p /sbin/ldconfig
+
 %post  -n guile-gnutls -p /sbin/ldconfig
 %postun        -n guile-gnutls -p /sbin/ldconfig
 
@@ -289,18 +335,15 @@ rm -rf $RPM_BUILD_ROOT
 %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) %{_libdir}/libgnutls-openssl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnutls-openssl.so.27
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgnutls.so
-%attr(755,root,root) %{_libdir}/libgnutls-openssl.so
 %{_libdir}/libgnutls.la
-%{_libdir}/libgnutls-openssl.la
 %{_includedir}/gnutls
 %{?with_dane:%exclude %{_includedir}/gnutls/dane.h}
 %exclude %{_includedir}/gnutls/gnutlsxx.h
+%{?with_openssl:%exclude %{_includedir}/gnutls/openssl.h}
 %{_pkgconfigdir}/gnutls.pc
 %{_mandir}/man3/gnutls_*.3*
 
@@ -308,7 +351,6 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libgnutls.a
-%{_libdir}/libgnutls-openssl.a
 %endif
 
 %files c++
@@ -350,6 +392,23 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %endif
 
+%if %{with openssl}
+%files openssl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgnutls-openssl.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnutls-openssl.so.27
+
+%files openssl-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgnutls-openssl.so
+%{_libdir}/libgnutls-openssl.la
+%{_includedir}/gnutls/openssl.h
+
+%files openssl-static
+%defattr(644,root,root,755)
+%{_libdir}/libgnutls-openssl.a
+%endif
+
 %files -n guile-gnutls
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/guile/2.0/guile-gnutls-v-2.so*