packages: gnutls/gnutls-info.patch, gnutls/gnutls.spec - up to 2.8.0 - gett...

witekfl witekfl at pld-linux.org
Sun May 31 14:06:03 CEST 2009 

Author: witekfl                      Date: Sun May 31 12:06:03 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.8.0
- gettext is not used (build with gettextize failed)
- there is no gnutls-config

---- Files affected:
packages/gnutls:
   gnutls-info.patch (1.2 -> 1.3) , gnutls.spec (1.99 -> 1.100) 

---- Diffs:

================================================================
Index: packages/gnutls/gnutls-info.patch
diff -u packages/gnutls/gnutls-info.patch:1.2 packages/gnutls/gnutls-info.patch:1.3
--- packages/gnutls/gnutls-info.patch:1.2	Thu Jun 19 21:16:31 2008
+++ packages/gnutls/gnutls-info.patch	Sun May 31 14:05:56 2009
@@ -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
  
-- at dircategory GNU Libraries
-+ at dircategory Libraries:
+- at dircategory Software libraries
++ at 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
  
-- at dircategory Network Applications
-+ at dircategory Net utilities:
+- at dircategory System Administration
++ at 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 ""}.
  

================================================================
Index: packages/gnutls/gnutls.spec
diff -u packages/gnutls/gnutls.spec:1.99 packages/gnutls/gnutls.spec:1.100
--- packages/gnutls/gnutls.spec:1.99	Fri May 15 10:04:43 2009
+++ packages/gnutls/gnutls.spec	Sun May 31 14:05:56 2009
@@ -2,17 +2,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
@@ -136,15 +135,14 @@
 %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}
 
@@ -157,7 +155,7 @@
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libguile-gnutls-*.{la,a}
 
-%find_lang %{name}
+#%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -176,7 +174,7 @@
 %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
@@ -198,8 +196,6 @@
 
 %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
@@ -208,8 +204,9 @@
 %{_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*
@@ -253,6 +250,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.100  2009/05/31 12:05:56  witekfl
+- up to 2.8.0
+- gettext is not used (build with gettextize failed)
+- there is no gnutls-config
+
 Revision 1.99  2009/05/15 08:04:43  adamg
 - cleanups
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnutls/gnutls-info.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnutls/gnutls.spec?r1=1.99&r2=1.100&f=u

More information about the pld-cvs-commit mailing list