X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=gnutls.spec;h=c4bfb73c99ae8eb8f0a523958557fd12904e0870;hb=3504caa7336a2ed7f7e4dfa9081d84fa94d7b83e;hp=e5b056972375923be2692f718f090180602db46f;hpb=0f1408c43338e793154ff93ab9a1dc8048a1c119;p=packages%2Fgnutls.git

diff --git a/gnutls.spec b/gnutls.spec
index e5b0569..c4bfb73 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -1,44 +1,53 @@
+# NOTE: 3.3.x is previous-stable line
+# - for 3.5.x (current stable) see DEVEL branch (requires DEVEL p11-kit)
 #
 # Conditional build:
-%bcond_without	dane	# libdane (DANE with DNSSEC certificate verification)
-%bcond_without	tpm	# TPM support in gnutls
+%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
+%bcond_without	doc		# do not generate documentation
 #
 Summary:	The GNU Transport Layer Security Library
 Summary(pl.UTF-8):	Biblioteka GNU TLS (Transport Layer Security)
 Name:		gnutls
-Version:	3.2.12.1
+Version:	3.5.10
 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.2/%{name}-%{version}.tar.lz
-# Source0-md5:	c97f2c360fd955fb6a3da3f5abc55001
+Source0:	ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/%{name}-%{version}.tar.xz
+# Source0-md5:	336c03a71ba90184ffd0388075dde504
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-link.patch
 URL:		http://www.gnutls.org/
 BuildRequires:	autoconf >= 2.61
+BuildRequires:	autogen
+BuildRequires:	autogen-devel
 BuildRequires:	automake >= 1:1.12.2
-BuildRequires:	gettext-devel >= 0.18
-BuildRequires:	gtk-doc >= 1.1
+BuildRequires:	gettext-tools >= 0.19
+BuildRequires:	gmp-devel
+%{?with_doc:BuildRequires:	gtk-doc >= 1.1}
 BuildRequires:	guile-devel >= 5:2.0
 BuildRequires:	libcfg+-devel
-BuildRequires:	libidn-devel
+BuildRequires:	libidn2-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtasn1-devel >= 2.14
-BuildRequires:	libtool >= 2:1.5
-BuildRequires:	lzip
-BuildRequires:	nettle-devel >= 2.7
+BuildRequires:	libtasn1-devel >= 4.9
+BuildRequires:	libunistring-devel
+BuildRequires:	libtool >= 2:2
+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.0
+BuildRequires:	p11-kit-devel >= 0.23.1
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel
 BuildRequires:	rpmbuild(macros) >= 1.383
 BuildRequires:	sed >= 4.0
 BuildRequires:	tar >= 1:1.22
-BuildRequires:	texinfo >= 4.8
+%{?with_doc:BuildRequires:	texinfo >= 4.8}
 %{?with_tpm:BuildRequires:	trousers-devel >= 0.3.11}
 %{?with_dane:BuildRequires:	unbound-devel}
+BuildRequires:	xz
 BuildRequires:	zlib-devel
 Requires:	%{name}-libs = %{version}-%{release}
 %{?with_dane:Requires:	%{name}-dane = %{version}-%{release}}
@@ -60,10 +69,10 @@ grupę roboczą IETF TLS.
 Summary:	GnuTLS shared libraries
 Summary(pl.UTF-8):	Biblioteki współdzielone GnuTLS
 Group:		Libraries
-Requires:	libtasn1 >= 2.14
-Requires:	nettle >= 2.7
+Requires:	libtasn1 >= 4.9
+Requires:	nettle >= 3.3
 #Requires:	opencdk >= 0.6.6
-Requires:	p11-kit >= 0.11
+Requires:	p11-kit >= 0.23.1
 %{?with_tpm:Requires:	trousers-libs >= 0.3.11}
 Conflicts:	gnutls < 3.2.0
 
@@ -79,10 +88,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 >= 2.14
-Requires:	nettle-devel >= 2.7
+Requires:	libidn2-devel
+Requires:	libtasn1-devel >= 4.9
+Requires:	libunistring-devel
+Requires:	nettle-devel >= 3.3
 #Requires:	opencdk-devel >= 0.6.6
-Requires:	p11-kit-devel >= 0.11
+Requires:	p11-kit-devel >= 0.23.1
 %{?with_tpm:Requires:	trousers-devel >= 0.3.11}
 Requires:	zlib-devel
 
@@ -184,6 +195,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
@@ -199,23 +247,28 @@ Guile bindings for GnuTLS.
 Wiązania Guile do GnuTLS.
 
 %prep
-%setup -qn %{name}-3.2.12
+%setup -q
 %patch0 -p1
 %patch1 -p1
 
 %{__rm} po/stamp-po
 
 %build
+%{__mv} build-aux/snippet{,.save}
 %{__libtoolize}
-%{__aclocal} -I m4 -I gl/m4 -I src/libopts/m4 -I src/gl/m4
+%{__mv} build-aux/snippet{.save,}
+%{__aclocal} -I m4 -I gl/m4 -I src/libopts/m4 -I src/gl/m4 -I lib/unistring/m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
+	%{?with_openssl:--enable-openssl-compatibility} \
 	--disable-silent-rules \
-	--enable-heartbeat-support \
+	%{?with_static_libs:--enable-static} \
 	--with-default-trust-store-file=/etc/certs/ca-certificates.crt \
-	%{!?with_tpm:--without-tpm}
+	%{!?with_tpm:--without-tpm} \
+	--with-trousers-lib=%{_libdir}/libtspi.so.1 \
+	%{!?with_doc:--disable-doc}
 
 # docs build is broken with -jN
 %{__make} -j1
@@ -230,9 +283,15 @@ rm -rf $RPM_BUILD_ROOT
 # .pc file missing for libgnutls-openssl, and it needs libgnutls.la
 
 # guile module - dynamic only
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/guile/2.0/guile-gnutls-*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/guile/2.0/guile-gnutls-*.la
+%if %{with static_libs}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/guile/2.0/guile-gnutls-*.a
+%endif
 
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+# 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}
 
@@ -251,20 +310,26 @@ 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
 
 %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
 %attr(755,root,root) %{_bindir}/psktool
 %attr(755,root,root) %{_bindir}/srptool
 %{?with_tpm:%attr(755,root,root) %{_bindir}/tpmtool}
+%if %{with doc}
 %{_mandir}/man1/certtool.1*
 %{_mandir}/man1/gnutls-*.1*
 %{_mandir}/man1/ocsptool.1*
@@ -275,36 +340,29 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/gnutls.info*
 %{_infodir}/gnutls-*.png
 %{_infodir}/pkcs11-vision.png
+%endif
 
 %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) %{_libdir}/libgnutls-openssl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnutls-openssl.so.27
-%attr(755,root,root) %{_libdir}/libgnutls-xssl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnutls-xssl.so.0
+%attr(755,root,root) %ghost %{_libdir}/libgnutls.so.30
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgnutls.so
-%attr(755,root,root) %{_libdir}/libgnutls-openssl.so
-%attr(755,root,root) %{_libdir}/libgnutls-xssl.so
 %{_libdir}/libgnutls.la
-%{_libdir}/libgnutls-openssl.la
-%{_libdir}/libgnutls-xssl.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*
-%{_mandir}/man3/xssl_*.3*
+%{?with_doc:%{_mandir}/man3/gnutls_*.3*}
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libgnutls.a
-%{_libdir}/libgnutls-openssl.a
-%{_libdir}/libgnutls-xssl.a
+%endif
 
 %files c++
 %defattr(644,root,root,755)
@@ -317,9 +375,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgnutlsxx.la
 %{_includedir}/gnutls/gnutlsxx.h
 
+%if %{with static_libs}
 %files c++-static
 %defattr(644,root,root,755)
 %{_libdir}/libgnutlsxx.a
+%endif
 
 %if %{with dane}
 %files dane
@@ -327,7 +387,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/danetool
 %attr(755,root,root) %{_libdir}/libgnutls-dane.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgnutls-dane.so.0
-%{_mandir}/man1/danetool.1*
+%{?with_doc:%{_mandir}/man1/danetool.1*}
 
 %files dane-devel
 %defattr(644,root,root,755)
@@ -335,15 +395,37 @@ 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
 %defattr(644,root,root,755)
 %{_libdir}/libgnutls-dane.a
 %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*
-%{_datadir}/guile/site/gnutls.scm
-%{_datadir}/guile/site/gnutls
+%{_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*