[Title] Update spec according to gnutls upgrade to 2.12.20

[Issue#] N/A
[Problem] N/A
[Cause] N/A
[Solution] N/A

Change-Id: Id1ce297d2e2aa153434b9a406b37cdf030860ecf

diff --git a/packaging/gnutls.spec b/packaging/gnutls.spec
index 59ed74e..2b22189 100644 (file)
--- a/packaging/gnutls.spec
+++ b/packaging/gnutls.spec
@@ -1,24 +1,24 @@
-#sbs-git:slp/pkgs/l/libgnutls26 gnutls 2.12.0 334e00aa49812702098c8de319a48e4a1bac6f02
 Summary: A TLS protocol implementation
 Name: gnutls
-Version: 2.12.0
+Version: 2.12.20
 Release: 1
 License: LGPLv2+
 Group: System/Libraries
-BuildRequires: libgcrypt-devel >= 1.2.2, gettext-tools
+BuildRequires: gettext-tools
 BuildRequires: zlib-devel, readline-devel, libtasn1-devel
 BuildRequires: lzo-devel, libtool, automake, autoconf
+BuildRequires: nettle-devel, gmp-devel
 URL: http://www.gnutls.org/
 Source0: %{name}-%{version}.tar.gz
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: libgcrypt >= 1.2.2
+Requires: nettle, gmp
 
 %package devel
 Summary: Development files for the %{name} package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libgcrypt-devel
+Requires: nettle-devel, gmp-devel
 Requires: pkgconfig
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -41,21 +41,14 @@ the GnuTLS library.
 %build
 
 rm -f doc/*.info* lib/po/libgnutls26.pot
-if [ -e doc/gnutls.pdf.debbackup ] && [ ! -e doc/gnutls.pdf ] ; then
-       mv doc/gnutls.pdf.debbackup doc/gnutls.pdf ;
-fi
 
-%configure  --enable-ld-version-script --disable-cxx --without-lzo \
-            --cache-file=config.cache --with-libgcrypt \
-            --with-included-libtasn1
+%configure  --enable-ld-version-script --disable-cxx --without-lzo --with-included-libtasn1 --without-p11-kit
 make
 
 %install
 rm -fr $RPM_BUILD_ROOT
 %make_install
 
-
-
 %remove_docs
 
 %clean
@@ -65,10 +58,9 @@ rm -fr $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
-
 %files
 %{_libdir}/libgnutls*.so.*
-%{_prefix}/share/locale/*/LC_MESSAGES/libgnutls26.mo
+%{_prefix}/share/locale/*/LC_MESSAGES/libgnutls.mo
 
 %files devel
 %{_includedir}/*