From 63178e7f0151c68c5152f14b52c8dcd912d69083 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 11 Apr 2014 20:59:24 +0200 Subject: [PATCH] - updated to 3.3.0; libxssl is gone --- gnutls.spec | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/gnutls.spec b/gnutls.spec index 9f92317..46d5d46 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -1,29 +1,33 @@ # # 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 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.2.13 +Version: 3.3.0 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: 6593abdd6c1417cbc7f04e60a5b49abe +Source0: ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/%{name}-%{version}.tar.lz +# Source0-md5: 9bc98adb532ccf93ac4a3998ec86185c 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: gmp-devel BuildRequires: gtk-doc >= 1.1 BuildRequires: guile-devel >= 5:2.0 BuildRequires: libcfg+-devel BuildRequires: libidn-devel BuildRequires: libstdc++-devel -BuildRequires: libtasn1-devel >= 2.14 +BuildRequires: libtasn1-devel >= 3.1 BuildRequires: libtool >= 2:1.5 BuildRequires: lzip BuildRequires: nettle-devel >= 2.7 @@ -60,7 +64,7 @@ grupę roboczą IETF TLS. Summary: GnuTLS shared libraries Summary(pl.UTF-8): Biblioteki współdzielone GnuTLS Group: Libraries -Requires: libtasn1 >= 2.14 +Requires: libtasn1 >= 3.1 Requires: nettle >= 2.7 #Requires: opencdk >= 0.6.6 Requires: p11-kit >= 0.20.0 @@ -79,7 +83,7 @@ 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: libtasn1-devel >= 3.1 Requires: nettle-devel >= 2.7 #Requires: opencdk-devel >= 0.6.6 Requires: p11-kit-devel >= 0.20.0 @@ -213,7 +217,7 @@ Wiązania Guile do GnuTLS. %{__automake} %configure \ --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} @@ -230,9 +234,12 @@ 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 +%{__rm} -f $RPM_BUILD_ROOT%{_infodir}/dir %find_lang %{name} @@ -282,29 +289,25 @@ rm -rf $RPM_BUILD_ROOT %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 %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 %{_pkgconfigdir}/gnutls.pc %{_mandir}/man3/gnutls_*.3* -%{_mandir}/man3/xssl_*.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 +320,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 @@ -336,10 +341,12 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/gnutls/dane.h %{_pkgconfigdir}/gnutls-dane.pc +%if %{with static_libs} %files dane-static %defattr(644,root,root,755) %{_libdir}/libgnutls-dane.a %endif +%endif %files -n guile-gnutls %defattr(644,root,root,755) -- 2.44.0