- updated to 3.0.19

[packages/gnutls.git] / gnutls.spec

diff --git a/gnutls.spec b/gnutls.spec
index d9ced9cd2ed7acb5a00131c22b5de0f3655a5975..64e6eb5d80f0cab95be18cfebae53d056410ad9d 100644 (file)
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -5,45 +5,46 @@
 Summary:       The GNU Transport Layer Security Library
 Summary(pl.UTF-8):     Biblioteka GNU TLS (Transport Layer Security)
 Name:          gnutls
-Version:       3.0.5
+Version:       3.0.19
 Release:       1
 License:       LGPL v3+ (libgnutls), GPL v3+ (openssl library and tools)
 Group:         Libraries
-Source0:       ftp://ftp.gnutls.org/pub/gnutls/%{name}-%{version}.tar.xz
-# Source0-md5: c2d4e6344974545c228a1df2147bf334
+Source0:       ftp://ftp.gnutls.org/pub/gnutls/%{name}-%{version}.tar.lz
+# Source0-md5: a1307837e12d4317b136eb23fbf987f2
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-pl.po-update.patch
-Patch3:                %{name}-guile.patch
 URL:           http://www.gnu.org/software/gnutls/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.11
-BuildRequires: gettext-devel >= 0.17
+BuildRequires: gettext-devel >= 0.18
 BuildRequires: gtk-doc >= 1.1
-BuildRequires: guile-devel >= 5:1.8
+BuildRequires: guile-devel >= 5:2.0
 BuildRequires: libcfg+-devel
 %{?with_gcrypt:BuildRequires:  libgcrypt-devel >= 1.4.0}
 BuildRequires: libidn-devel
 BuildRequires: libstdc++-devel
-BuildRequires: libtasn1-devel >= 2.10
+BuildRequires: libtasn1-devel >= 2.12
 BuildRequires: libtool >= 2:1.5
+BuildRequires: lzip
 %{!?with_gcrypt:BuildRequires: nettle-devel >= 2.4}
 # 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.4
+BuildRequires: p11-kit-devel >= 0.11
 BuildRequires: pkgconfig
 BuildRequires: readline-devel
 BuildRequires: rpmbuild(macros) >= 1.383
+BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: texinfo >= 4.8
-BuildRequires: xz
 BuildRequires: zlib-devel
 Requires(post,postun): /sbin/ldconfig
 %{?with_gcrypt:Requires:       libgcrypt >= 1.4.0}
-Requires:      libtasn1 >= 2.10
+Requires:      libtasn1 >= 2.12
 %{!?with_gcrypt:Requires:      nettle >= 2.4}
 #Requires:     opencdk >= 0.6.6
+Requires:      p11-kit >= 0.11
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -65,10 +66,10 @@ License:    LGPL v2.1+ (libgnutls), GPL v3+ (openssl library)
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 %{?with_gcrypt:Requires:       libgcrypt-devel >= 1.4.0}
-Requires:      libtasn1-devel >= 2.10
+Requires:      libtasn1-devel >= 2.12
 %{!?with_gcrypt:Requires:      nettle-devel >= 2.4}
 #Requires:     opencdk-devel >= 0.6.6
-Requires:      p11-kit-devel >= 0.4
+Requires:      p11-kit-devel >= 0.11
 Requires:      zlib-devel
 
 %description devel
@@ -137,7 +138,7 @@ Summary(pl.UTF-8):  Wiązania Guile do GnuTLS
 License:       LGPL v2.1+
 Group:         Development/Languages
 Requires:      %{name} = %{version}-%{release}
-Requires:      guile >= 5:1.8
+Requires:      guile >= 5:2.0
 
 %description -n guile-gnutls
 Guile bindings for GnuTLS.
@@ -150,13 +151,16 @@ Wiązania Guile do GnuTLS.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %{__rm} po/stamp-po
 
+# remove it when "linking libtool libraries using a non-POSIX archiver ..." warning is gone
+# (after gnutls or libtool change)
+%{__sed} -i -e '/AM_INIT_AUTOMAKE/s/-Werror//' configure.ac
+
 %build
 %{__libtoolize}
-%{__aclocal} -I m4 -I gl/m4
+%{__aclocal} -I m4 -I gl/m4 -I src/libopts/m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -164,7 +168,8 @@ Wiązania Guile do GnuTLS.
        --disable-silent-rules \
        %{?with_gcrypt:--with-libgcrypt}
 
-%{__make}
+# docs build is broken with -jN
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -176,7 +181,7 @@ 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}/libguile-gnutls-*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/guile/2.0/guile-gnutls-*.{la,a}
 
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
@@ -205,6 +210,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -214,6 +220,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libgnutls-openssl.so.27
 %{_mandir}/man1/certtool.1*
 %{_mandir}/man1/gnutls-*.1*
+%{_mandir}/man1/ocsptool.1*
 %{_mandir}/man1/p11tool.1*
 %{_mandir}/man1/psktool.1*
 %{_mandir}/man1/srptool.1*
@@ -230,7 +237,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gnutls
 %exclude %{_includedir}/gnutls/gnutlsxx.h
 %{_pkgconfigdir}/gnutls.pc
-%{_mandir}/man3/gnutls*.3*
+%{_mandir}/man3/gnutls_*.3*
 
 %files static
 %defattr(644,root,root,755)
@@ -254,8 +261,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n guile-gnutls
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libguile-gnutls-v-1.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libguile-gnutls-v-1.so.0
-%attr(755,root,root) %{_libdir}/libguile-gnutls-v-1.so
+%attr(755,root,root) %{_libdir}/guile/2.0/guile-gnutls-v-2.so*
 %{_datadir}/guile/site/gnutls.scm
+%{_datadir}/guile/site/gnutls
 %{_infodir}/gnutls-guile.info*