- updated to 3.0.5 (libgnutls-extra is gone)

- added guile patch to remove obsolete gnutls-extra binding (and thus fix guile build)

Changed files:
    gnutls-guile.patch -> 1.1
    gnutls-pl.po-update.patch -> 1.5
    gnutls.spec -> 1.138

diff --git a/gnutls-guile.patch b/gnutls-guile.patch
new file mode 100644 (file)
index 0000000..0c1e644
--- /dev/null
+++ b/gnutls-guile.patch
@@ -0,0 +1,48 @@
+--- gnutls-3.0.5/guile/modules/gnutls/build/enums.scm.orig     2011-09-13 22:31:57.000000000 +0200
++++ gnutls-3.0.5/guile/modules/gnutls/build/enums.scm  2011-10-29 20:40:21.289055938 +0200
+@@ -513,8 +513,6 @@
+ file-error
+ too-many-empty-packets
+ unknown-pk-algorithm
+-init-libextra
+-library-version-mismatch
+ no-temporary-rsa-params
+ no-compression-algorithms
+ no-cipher-suites
+--- gnutls-3.0.5/guile/src/Makefile.am.orig    2011-10-20 21:14:57.000000000 +0200
++++ gnutls-3.0.5/guile/src/Makefile.am 2011-10-29 22:17:33.739251230 +0200
+@@ -33,7 +33,7 @@
+ 
+ CLEANFILES = $(BUILT_SOURCES)
+ 
+-lib_LTLIBRARIES = libguile-gnutls-v-1.la libguile-gnutls-extra-v-1.la
++lib_LTLIBRARIES = libguile-gnutls-v-1.la
+ 
+ # Linking against GnuTLS.
+ GNUTLS_CORE_LIBS  = $(top_builddir)/lib/libgnutls.la
+@@ -50,14 +50,6 @@
+       $(GNUTLS_CORE_LIBS) $(GNULIB_LIBS) \
+       $(GUILE_LDFLAGS)
+ 
+-libguile_gnutls_extra_v_1_la_SOURCES = extra.c
+-libguile_gnutls_extra_v_1_la_CFLAGS =         \
+-  $(AM_CFLAGS) $(GNULIB_CFLAGS) $(GUILE_CFLAGS)
+-libguile_gnutls_extra_v_1_la_LIBADD =         \
+-  $(GNUTLS_CORE_LIBS) \
+-  $(builddir)/libguile-gnutls-v-1.la          \
+-  $(GNULIB_LIBS) $(GUILE_LDFLAGS)
+-
+ AM_CPPFLAGS = \
+       -I$(top_srcdir)/lib/includes \
+       -I$(top_builddir)/lib/includes  \
+--- gnutls-3.0.5/guile/modules/Makefile.am.orig        2011-09-13 22:31:57.000000000 +0200
++++ gnutls-3.0.5/guile/modules/Makefile.am     2011-10-29 21:20:35.982470124 +0200
+@@ -17,7 +17,7 @@
+ 
+ guilemoduledir = $(GUILE_SITE)
+ 
+-nobase_dist_guilemodule_DATA = gnutls.scm gnutls/extra.scm
++nobase_dist_guilemodule_DATA = gnutls.scm
+ 
+ documentation_modules = system/documentation/README           \
+                       system/documentation/c-snarf.scm        \

diff --git a/gnutls-pl.po-update.patch b/gnutls-pl.po-update.patch
index 3d8d9d26d646aa61fcf20ee054e116f474c077f3..d75dc96fb20f37d1877bf2b20016d6b4f1dde471 100644 (file)
--- a/gnutls-pl.po-update.patch
+++ b/gnutls-pl.po-update.patch
@@ -1,28 +1,28 @@
---- gnutls-3.0.4/po/pl.po.orig 2011-10-13 17:06:45.000000000 +0200
-+++ gnutls-3.0.4/po/pl.po      2011-10-16 08:33:10.372427725 +0200
+--- gnutls-3.0.5/po/pl.po.orig 2011-10-27 20:24:53.000000000 +0200
++++ gnutls-3.0.5/po/pl.po      2011-10-29 07:14:24.007436758 +0200
 @@ -5,10 +5,10 @@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: libgnutls-3.0.0\n"
-+"Project-Id-Version: libgnutls-3.0.4\n"
++"Project-Id-Version: libgnutls-3.0.5\n"
  "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n"
- "POT-Creation-Date: 2011-10-13 17:06+0200\n"
+ "POT-Creation-Date: 2011-10-27 20:24+0200\n"
 -"PO-Revision-Date: 2011-08-03 18:46+0200\n"
-+"PO-Revision-Date: 2011-10-16 08:28+0200\n"
++"PO-Revision-Date: 2011-10-29 07:12+0200\n"
  "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
  "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
  "Language: pl\n"
-@@ -572,7 +572,7 @@
+@@ -562,7 +562,7 @@
  msgid ""
  "The provided X.509 certificate list is not sorted (in subject to issuer "
  "order)"
 -msgstr ""
 +msgstr "Przekazana lista certyfikatów X.509 nie jest posortowana (w kolejno¶ci wystawcy)"
  
- #: lib/gnutls_errors.c:421
+ #: lib/gnutls_errors.c:416
  msgid "(unknown error code)"
-@@ -719,7 +719,7 @@
+@@ -709,7 +709,7 @@
  #: lib/x509/output.c:192
  #, c-format
  msgid "\t\t\tAccess Method: %.*s"
@@ -31,7 +31,7 @@
  
  #: lib/x509/output.c:357
  #, c-format
-@@ -921,9 +921,9 @@
+@@ -911,9 +911,9 @@
  msgstr "%s\t\tInformacja o certyfikacie proxy (%s):\n"
  
  #: lib/x509/output.c:1020

diff --git a/gnutls.spec b/gnutls.spec
index cbf3536c14bd89cd91b3d247a3b44d648f15f03c..d9ced9cd2ed7acb5a00131c22b5de0f3655a5975 100644 (file)
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -5,15 +5,16 @@
 Summary:       The GNU Transport Layer Security Library
 Summary(pl.UTF-8):     Biblioteka GNU TLS (Transport Layer Security)
 Name:          gnutls
-Version:       3.0.4
-Release:       2
-License:       LGPL v3+ (libgnutls), GPL v3+ (extra libs and tools)
+Version:       3.0.5
+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: 748d537027978abcb7dd33ec396dc511
+# Source0-md5: c2d4e6344974545c228a1df2147bf334
 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
@@ -24,7 +25,7 @@ BuildRequires:        libcfg+-devel
 %{?with_gcrypt:BuildRequires:  libgcrypt-devel >= 1.4.0}
 BuildRequires: libidn-devel
 BuildRequires: libstdc++-devel
-BuildRequires: libtasn1-devel >= 2.9
+BuildRequires: libtasn1-devel >= 2.10
 BuildRequires: libtool >= 2:1.5
 %{!?with_gcrypt:BuildRequires: nettle-devel >= 2.4}
 # miniopencdk is included in sources and currently maintained
@@ -40,7 +41,7 @@ BuildRequires:        xz
 BuildRequires: zlib-devel
 Requires(post,postun): /sbin/ldconfig
 %{?with_gcrypt:Requires:       libgcrypt >= 1.4.0}
-Requires:      libtasn1 >= 2.9
+Requires:      libtasn1 >= 2.10
 %{!?with_gcrypt:Requires:      nettle >= 2.4}
 #Requires:     opencdk >= 0.6.6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -60,11 +61,11 @@ grupę roboczą IETF TLS.
 %package devel
 Summary:       Header files etc to develop gnutls applications
 Summary(pl.UTF-8):     Pliki nagłówkowe i inne do gnutls
-License:       LGPL v2.1+ (libgnutls), GPL v3+ (extra libs)
+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.9
+Requires:      libtasn1-devel >= 2.10
 %{!?with_gcrypt:Requires:      nettle-devel >= 2.4}
 #Requires:     opencdk-devel >= 0.6.6
 Requires:      p11-kit-devel >= 0.4
@@ -79,7 +80,7 @@ Pliki nagłówkowe i inne do gnutls.
 %package static
 Summary:       Static gnutls library
 Summary(pl.UTF-8):     Biblioteka statyczna gnutls
-License:       LGPL v2.1+ (libgnutls), GPL v3+ (extra libs)
+License:       LGPL v2.1+ (libgnutls), GPL v3+ (openssl library)
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
@@ -133,7 +134,7 @@ Statyczna wersja libgnutlsxx - interfejsu C++ do biblioteki gnutls.
 %package -n guile-gnutls
 Summary:       Guile bindings for GnuTLS
 Summary(pl.UTF-8):     Wiązania Guile do GnuTLS
-License:       LGPL v2.1+ (gnutls binding), GPL v3+ (gnutls-extra binding)
+License:       LGPL v2.1+
 Group:         Development/Languages
 Requires:      %{name} = %{version}-%{release}
 Requires:      guile >= 5:1.8
@@ -149,6 +150,7 @@ Wiązania Guile do GnuTLS.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %{__rm} po/stamp-po
 
@@ -170,8 +172,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-# although libgnutls{,-extra}.la are obsoleted by pkg-config, there are
-# .pc files missing for libgnutls{-openssl,xx}, and they need libgnutls.la
+# although libgnutls.la is obsoleted by pkg-config, there is
+# .pc file missing for libgnutls-openssl, and it needs libgnutls.la
 
 # guile module - dynamic only
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libguile-gnutls-*.{la,a}
@@ -208,8 +210,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/srptool
 %attr(755,root,root) %{_libdir}/libgnutls.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgnutls.so.28
-%attr(755,root,root) %{_libdir}/libgnutls-extra.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnutls-extra.so.28
 %attr(755,root,root) %{_libdir}/libgnutls-openssl.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgnutls-openssl.so.27
 %{_mandir}/man1/certtool.1*
@@ -224,21 +224,17 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgnutls.so
-%attr(755,root,root) %{_libdir}/libgnutls-extra.so
 %attr(755,root,root) %{_libdir}/libgnutls-openssl.so
 %{_libdir}/libgnutls.la
-%{_libdir}/libgnutls-extra.la
 %{_libdir}/libgnutls-openssl.la
 %{_includedir}/gnutls
 %exclude %{_includedir}/gnutls/gnutlsxx.h
 %{_pkgconfigdir}/gnutls.pc
-%{_pkgconfigdir}/gnutls-extra.pc
 %{_mandir}/man3/gnutls*.3*
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libgnutls.a
-%{_libdir}/libgnutls-extra.a
 %{_libdir}/libgnutls-openssl.a
 
 %files c++
@@ -261,10 +257,5 @@ rm -rf $RPM_BUILD_ROOT
 %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}/libguile-gnutls-extra-v-1.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libguile-gnutls-extra-v-1.so.0
-%attr(755,root,root) %{_libdir}/libguile-gnutls-extra-v-1.so
 %{_datadir}/guile/site/gnutls.scm
-%dir %{_datadir}/guile/site/gnutls
-%{_datadir}/guile/site/gnutls/extra.scm
 %{_infodir}/gnutls-guile.info*