From 9d8f6e85f6afca7a2f8107120388c0ed00bd273f Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Tue, 8 Nov 2011 20:24:28 +0000 Subject: [PATCH] - updated to 3.0.7 - updated pl.po-update patch - removed obsolete guile patch; guile module path changed Changed files: gnutls-guile.patch -> 1.2 gnutls-pl.po-update.patch -> 1.6 gnutls.spec -> 1.139 --- gnutls-guile.patch | 48 --------------------------------------- gnutls-pl.po-update.patch | 18 +++++++-------- gnutls.spec | 17 ++++++-------- 3 files changed, 16 insertions(+), 67 deletions(-) delete mode 100644 gnutls-guile.patch diff --git a/gnutls-guile.patch b/gnutls-guile.patch deleted file mode 100644 index 0c1e644..0000000 --- a/gnutls-guile.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- 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 d75dc96..8b6323e 100644 --- a/gnutls-pl.po-update.patch +++ b/gnutls-pl.po-update.patch @@ -1,15 +1,15 @@ ---- 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 +--- gnutls-3.0.7/po/pl.po.orig 2011-11-08 08:20:07.000000000 +0100 ++++ gnutls-3.0.7/po/pl.po 2011-11-08 19:50:09.154060402 +0100 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: libgnutls-3.0.0\n" -+"Project-Id-Version: libgnutls-3.0.5\n" ++"Project-Id-Version: libgnutls-3.0.7\n" "Report-Msgid-Bugs-To: bug-gnutls@gnu.org\n" - "POT-Creation-Date: 2011-10-27 20:24+0200\n" + "POT-Creation-Date: 2011-11-08 08:20+0100\n" -"PO-Revision-Date: 2011-08-03 18:46+0200\n" -+"PO-Revision-Date: 2011-10-29 07:12+0200\n" ++"PO-Revision-Date: 2011-11-08 19:49+0100\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "Language: pl\n" @@ -23,23 +23,23 @@ #: lib/gnutls_errors.c:416 msgid "(unknown error code)" @@ -709,7 +709,7 @@ - #: lib/x509/output.c:192 + #: lib/x509/output.c:152 #, c-format msgid "\t\t\tAccess Method: %.*s" -msgstr "" +msgstr "\t\t\tMetoda dostêpu: %.*s" - #: lib/x509/output.c:357 + #: lib/x509/output.c:317 #, c-format @@ -911,9 +911,9 @@ msgstr "%s\t\tInformacja o certyfikacie proxy (%s):\n" - #: lib/x509/output.c:1020 + #: lib/x509/output.c:980 -#, fuzzy, c-format +#, c-format msgid "%s\t\tAuthority Information Access Information (%s):\n" -msgstr "%s\t\tInformacja o certyfikacie proxy (%s):\n" +msgstr "%s\t\tInformacja Authority Information Access (%s):\n" - #: lib/x509/output.c:1032 + #: lib/x509/output.c:992 #, c-format diff --git a/gnutls.spec b/gnutls.spec index d9ced9c..e113d9d 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -5,22 +5,21 @@ 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.7 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-md5: 840c96c75817c0f800a47805e275db7e 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: 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 @@ -137,7 +136,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,7 +149,6 @@ Wiązania Guile do GnuTLS. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %{__rm} po/stamp-po @@ -176,7 +174,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 @@ -254,8 +252,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* -- 2.44.0