|
|
@@ -3,8 +3,8 @@
|
|
|
Summary: GNU TLS Library
|
|
|
Summary(ja): GNU TLS ライブラリ
|
|
|
Name: gnutls
|
|
|
-Version: 2.8.6
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 2.10.2
|
|
|
+Release: 1%{?_dist_release}
|
|
|
License: GPLv3+ and LGPLv2+
|
|
|
# The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
|
|
|
Group: System Environment/Libraries
|
|
|
@@ -15,11 +15,19 @@ URL: http://www.gnutls.org/
|
|
|
Source0: %{name}-%{version}.tar.bz2
|
|
|
Source1: libgnutls-config
|
|
|
|
|
|
-#Patch3: gnutls-2.6.2-nosrp.patch
|
|
|
+#patches from fedora development
|
|
|
+Patch1: gnutls-2.10.2-rpath.patch
|
|
|
+Patch2: gnutls-2.8.6-link-libgcrypt.patch
|
|
|
+# Remove nonexisting references from texinfo file
|
|
|
+Patch3: gnutls-2.10.1-nosrp.patch
|
|
|
+# Backport from upstream git
|
|
|
+Patch4: gnutls-2.10.1-handshake-errors.patch
|
|
|
+
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
BuildRequires: libgcrypt-devel >= 1.2.2, zlib-devel libtasn1-devel gmp-devel
|
|
|
+BuildRequires: gettext readline-devel libtool
|
|
|
BuildRequires: guile-devel >= 1.8.6
|
|
|
BuildRequires: lzo-devel
|
|
|
Requires: libgcrypt >= 1.2.2, zlib
|
|
|
@@ -127,8 +135,10 @@ This package contains Guile bindings for the library.
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-
|
|
|
-#%patch3 -p1
|
|
|
+%patch1 -p1 -b .rpath
|
|
|
+%patch2 -p1 -b .link
|
|
|
+%patch3 -p1 -b .nosrp
|
|
|
+%patch4 -p1 -b .errors
|
|
|
|
|
|
for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do
|
|
|
touch lib/$i
|
|
|
@@ -139,6 +149,8 @@ autoreconf
|
|
|
%configure \
|
|
|
--with-lzo \
|
|
|
--with-included-libcfg \
|
|
|
+ --disable-srp-authentication \
|
|
|
+ --disable-static \
|
|
|
--disable-srp-authentication
|
|
|
# --with-included-libtasn1 \
|
|
|
# --with-included-opencdk \
|
|
|
@@ -208,7 +220,7 @@ fi
|
|
|
%defattr(-,root,root,-)
|
|
|
%{_bindir}/libgnutls*-config
|
|
|
%{_includedir}/*
|
|
|
-%{_libdir}/libgnutls*.a
|
|
|
+#%{_libdir}/libgnutls*.a
|
|
|
%{_libdir}/libgnutls*.so
|
|
|
%{_libdir}/pkgconfig/*.pc
|
|
|
%{_mandir}/man3/*
|
|
|
@@ -235,7 +247,7 @@ fi
|
|
|
|
|
|
%files -n compat32-%{name}-devel
|
|
|
%defattr(-,root,root,-)
|
|
|
-%{_libdir}/libgnutls*.a
|
|
|
+#%{_libdir}/libgnutls*.a
|
|
|
%{_libdir}/libgnutls*.so
|
|
|
%{_libdir}/pkgconfig/*.pc
|
|
|
|
|
|
@@ -245,6 +257,14 @@ fi
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Oct 9 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> 2.10.2-1
|
|
|
+- new upstream release
|
|
|
+- added patch1,2,3,4 from Fedora development
|
|
|
+- added BuildRequires: gettext readline-devel libtool
|
|
|
+- added configure option
|
|
|
+ --disable-static,--disable-srp-authentication
|
|
|
+ - dropt *.a files from -devel package again
|
|
|
+
|
|
|
* Tue Sep 21 2010 IWAI, Masaharu <iwai@alib.jp> 2.8.6-2
|
|
|
- build with rpm-4.8.1-1 for pkg-config file
|
|
|
|
kudoh