- up to 2.8.0

- gettext is not used (build with gettextize failed)
- there is no gnutls-config

Changed files:
    gnutls-info.patch -> 1.3
    gnutls.spec -> 1.100

diff --git a/gnutls-info.patch b/gnutls-info.patch
index dca0be6dc46086bcc193a9ffcdc86267200c5d34..2bae858c94616a9e5b8fe3e1e8667b8e17b7eb6d 100644 (file)
--- a/gnutls-info.patch
+++ b/gnutls-info.patch
@@ -1,37 +1,34 @@
---- gnutls-2.4.0/doc/gnutls.texi.orig  2008-06-05 16:13:55.000000000 +0200
-+++ gnutls-2.4.0/doc/gnutls.texi       2008-06-19 20:13:42.891831150 +0200
-@@ -30,20 +30,20 @@
+--- gnutls-2.8.0/doc/gnutls.texi.orig  2009-05-30 21:21:29.000000000 +0200
++++ gnutls-2.8.0/doc/gnutls.texi       2009-05-30 21:22:36.000000000 +0200
+@@ -29,19 +29,19 @@
  @end quotation
  @end copying
  
--@dircategory GNU Libraries
-+@dircategory Libraries:
+-@dircategory Software libraries
++@dircategory Libraries
  @direntry
--* libgnutls: (gnutls).                A Transport Layer Security Library.
-+* libgnutls: (gnutls).                        A Transport Layer Security Library
+ * GnuTLS: (gnutls).           GNU Transport Layer Security Library.
  @end direntry
  
--@dircategory Network Applications
-+@dircategory Net utilities:
+-@dircategory System Administration
++@dircategory Net utilities
  @direntry
--* GnuTLS: (gnutls).                   Package for Transport Layer Security.
 -* certtool: (gnutls)Invoking certtool.        Manipulate certificates and keys.
 -* gnutls-serv: (gnutls)Invoking gnutls-serv.  GNU TLS test server.
 -* gnutls-cli: (gnutls)Invoking gnutls-cli.    GNU TLS test client.
 -* gnutls-cli-debug: (gnutls)Invoking gnutls-cli-debug.        GNU TLS debug client.
 -* psktool: (gnutls)Invoking psktool.  Simple TLS-Pre-Shared-Keys manager.
 -* srptool: (gnutls)Invoking srptool.  Simple SRP password tool.
-+* GnuTLS: (gnutls).                   Package for Transport Layer Security
-+* certtool: (gnutls)certtool.         Manipulate certificates and keys
-+* gnutls-serv: (gnutls)gnutls-serv.   GNU TLS test server
-+* gnutls-cli: (gnutls)gnutls-cli.     GNU TLS test client
-+* gnutls-cli-debug: (gnutls)gnutls-cli-debug. GNU TLS debug client
-+* psktool: (gnutls)psktool.           Simple TLS-Pre-Shared-Keys manager
-+* srptool: (gnutls)srptool.           Simple SRP password tool
++* certtool: (gnutls)Invoking certtool.        Manipulate certificates and keys
++* gnutls-serv: (gnutls)Invoking gnutls-serv.  GNU TLS test server
++* gnutls-cli: (gnutls)Invoking gnutls-cli.    GNU TLS test client
++* gnutls-cli-debug: (gnutls)Invoking gnutls-cli-debug.        GNU TLS debug client
++* psktool: (gnutls)Invoking psktool.  Simple TLS-Pre-Shared-Keys manager
++* srptool: (gnutls)Invoking srptool.  Simple SRP password tool
  @end direntry
  
  @titlepage
-@@ -2524,15 +2524,15 @@
+@@ -2714,15 +2714,15 @@
  application.  The applications are discussed in this chapter.
  
  @menu
@@ -54,7 +51,7 @@
  @section Invoking certtool
  @cindex certtool
  
-@@ -2835,7 +2835,7 @@
+@@ -3031,7 +3031,7 @@
  #time_stamping_key
  @end example
  
@@ -63,7 +60,7 @@
  @section Invoking gnutls-cli
  @cindex gnutls-cli
  
-@@ -2956,7 +2956,7 @@
+@@ -3157,7 +3157,7 @@
  @code{--pskkey} parameter, it will query only for the password during
  the handshake.
  
@@ -72,7 +69,7 @@
  @section Invoking gnutls-cli-debug
  @cindex gnutls-cli-debug
  
-@@ -3004,7 +3004,7 @@
+@@ -3205,7 +3205,7 @@
  Checking for OpenPGP authentication support (TLS extension)... no
  @end smallexample
  
@@ -81,7 +78,7 @@
  @section Invoking gnutls-serv
  @cindex gnutls-serv
  
-@@ -3240,7 +3240,7 @@
+@@ -3450,7 +3450,7 @@
  @cindex PSK server
  
  To set up a PSK server with @code{gnutls-serv} you need to create PSK
@@ -90,7 +87,7 @@
  type @code{password} at the prompt.
  
  @smallexample
-@@ -3264,7 +3264,7 @@
+@@ -3474,7 +3474,7 @@
  You can now connect to the server using a PSK client (@pxref{Example
  client PSK connection}).
  
@@ -99,7 +96,7 @@
  @section Invoking psktool
  @cindex psktool
  
-@@ -3291,9 +3291,8 @@
+@@ -3501,9 +3501,8 @@
  @code{--netconf-hint}.  To derive a PSK key from a password with an
  empty PSK identity hint, using @code{--netconf-hint ""}.
  

diff --git a/gnutls.spec b/gnutls.spec
index e4f564b26840b9ec8b944bdb03782122453d6788..2753febd8f5986214a262856653d7ff6ee863a70 100644 (file)
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -1,17 +1,16 @@
 Summary:       The GNU Transport Layer Security Library
 Summary(pl.UTF-8):     Biblioteka GNU TLS (Transport Layer Security)
 Name:          gnutls
-Version:       2.6.6
+Version:       2.8.0
 Release:       1
 License:       LGPL v2.1+ (libgnutls), GPL v3+ (extra libs and tools)
 Group:         Libraries
 Source0:       ftp://ftp.gnutls.org/pub/gnutls/%{name}-%{version}.tar.bz2
-# Source0-md5: ca2489e29f9dc313a79b9747bb1090e5
+# Source0-md5: 001c1d778ac7b53118cd5e14c6f9210d
 Patch0:                %{name}-info.patch
 URL:           http://www.gnu.org/software/gnutls/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.10.2-2
-BuildRequires: gettext-devel >= 0.17
 BuildRequires: guile-devel >= 5:1.8
 BuildRequires: libcfg+-devel
 BuildRequires: libgcrypt-devel >= 1.2.4
@@ -135,15 +134,14 @@ Wiązania Guile do GnuTLS.
 %patch0 -p1
 
 %build
-%{__gettextize}
 %{__libtoolize}
-%{__aclocal} -I m4 -I gl/m4 -I lgl/m4 -I libextra/gl/m4
+%{__aclocal} -I m4 -I gl/m4 -I lib/gl/m4 -I libextra/gl/m4 -I lib/m4 -I libextra/m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
-       --disable-dependency-tracking \
        --with-lzo
+#      --disable-dependency-tracking \
 
 %{__make}
 
@@ -156,7 +154,7 @@ rm -rf $RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libguile-gnutls-*.{la,a}
 
-%find_lang %{name}
+#%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -175,7 +173,7 @@ rm -rf $RPM_BUILD_ROOT
 %post  -n guile-gnutls -p /sbin/ldconfig
 %postun        -n guile-gnutls -p /sbin/ldconfig
 
-%files -f %{name}.lang
+%files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README THANKS
 %attr(755,root,root) %{_bindir}/certtool
@@ -197,8 +195,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/libgnutls-config
-%attr(755,root,root) %{_bindir}/libgnutls-extra-config
 %attr(755,root,root) %{_libdir}/libgnutls.so
 %attr(755,root,root) %{_libdir}/libgnutls-extra.so
 %attr(755,root,root) %{_libdir}/libgnutls-openssl.so
@@ -207,8 +203,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgnutls-openssl.la
 %{_includedir}/gnutls
 %exclude %{_includedir}/gnutls/gnutlsxx.h
-%{_aclocaldir}/libgnutls.m4
-%{_aclocaldir}/libgnutls-extra.m4
+# These are not installed
+#%{_aclocaldir}/libgnutls.m4
+#%{_aclocaldir}/libgnutls-extra.m4
 %{_pkgconfigdir}/gnutls.pc
 %{_pkgconfigdir}/gnutls-extra.pc
 %{_mandir}/man3/*gnutls*.3*