summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Bogusz2010-05-08 06:25:19 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commitd43bb331b547718c166aeb1e287162ad8aae58d1 (patch)
tree0ced9650461ac155993617f1b5cef3db40725ff5
parent7b25538956d013dce5b47f0370a4ac407575a968 (diff)
downloadlibgpg-error-d43bb331b547718c166aeb1e287162ad8aae58d1.zip
libgpg-error-d43bb331b547718c166aeb1e287162ad8aae58d1.tar.gz
- updated patches Changed files: libgpg-error-gpg_error_config.patch -> 1.2 libgpg-error-pl.po-update.patch -> 1.8 libgpg-error.spec -> 1.30
-rw-r--r--libgpg-error-gpg_error_config.patch10
-rw-r--r--libgpg-error-pl.po-update.patch45
-rw-r--r--libgpg-error.spec10
3 files changed, 45 insertions, 20 deletions
diff --git a/libgpg-error-gpg_error_config.patch b/libgpg-error-gpg_error_config.patch
index d886af8..70bf753 100644
--- a/libgpg-error-gpg_error_config.patch
+++ b/libgpg-error-gpg_error_config.patch
@@ -1,12 +1,12 @@
---- libgpg-error-1.5/src/gpg-error-config.in.orig 2007-02-13 12:40:54.000000000 +0100
-+++ libgpg-error-1.5/src/gpg-error-config.in 2007-02-13 12:41:07.000000000 +0100
-@@ -62,9 +62,6 @@
- fi
+--- libgpg-error-1.8/src/gpg-error-config.in.orig 2010-01-14 10:18:30.000000000 +0100
++++ libgpg-error-1.8/src/gpg-error-config.in 2010-05-08 07:52:23.262932556 +0200
+@@ -69,9 +69,6 @@
+ output="$output @GPG_ERROR_CONFIG_CFLAGS@"
;;
--libs)
- if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
- output="$output -L$libdir"
- fi
- output="$output -lgpg-error"
+ output="$output @GPG_ERROR_CONFIG_LIBS@"
;;
*)
diff --git a/libgpg-error-pl.po-update.patch b/libgpg-error-pl.po-update.patch
index 46a238b..78f80aa 100644
--- a/libgpg-error-pl.po-update.patch
+++ b/libgpg-error-pl.po-update.patch
@@ -1,24 +1,24 @@
---- libgpg-error-1.7/po/pl.po.orig 2008-11-12 14:44:29.000000000 +0100
-+++ libgpg-error-1.7/po/pl.po 2008-12-26 17:00:52.066516344 +0100
+--- libgpg-error-1.8/po/pl.po.orig 2010-01-21 12:09:34.000000000 +0100
++++ libgpg-error-1.8/po/pl.po 2010-05-07 23:22:21.166987029 +0200
@@ -1,14 +1,14 @@
# Polish translation for libgpg-error.
# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
# This file is distributed under the same license as the libgpg-error package.
-# Jakub Bogusz <qboosh@pld-linux.org>, 2004-2006.
-+# Jakub Bogusz <qboosh@pld-linux.org>, 2004-2008.
++# Jakub Bogusz <qboosh@pld-linux.org>, 2004-2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: libgpg-error 1.4\n"
-+"Project-Id-Version: libgpg-error 1.7\n"
++"Project-Id-Version: libgpg-error 1.8\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
- "POT-Creation-Date: 2008-11-12 14:44+0100\n"
+ "POT-Creation-Date: 2010-01-21 12:09+0100\n"
-"PO-Revision-Date: 2006-09-15 19:30+0200\n"
-+"PO-Revision-Date: 2008-12-26 16:59+0100\n"
++"PO-Revision-Date: 2010-05-07 23:20+0200\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
-@@ -65,11 +65,11 @@
+@@ -65,15 +65,15 @@
#: src/err-sources.h:40
msgid "GPA"
@@ -31,8 +31,13 @@
+msgstr "Kleopatra"
#: src/err-sources.h:42
+ msgid "G13"
+-msgstr ""
++msgstr "G13"
+
+ #: src/err-sources.h:43
msgid "Any source"
-@@ -800,23 +800,20 @@
+@@ -804,33 +804,28 @@
msgstr "Nieznane polecenie"
#: src/err-codes.h:204
@@ -54,9 +59,29 @@
#: src/err-codes.h:207
-#, fuzzy
+ msgid "Not enabled"
+-msgstr "Nie zablokowany"
++msgstr "Nie włączony"
+
+ #: src/err-codes.h:208
+-#, fuzzy
+ msgid "No crypto engine"
+-msgstr "Niepoprawny silnik kryptograficzny"
++msgstr "Brak silnika kryptograficznego"
+
+ #: src/err-codes.h:209
+-#, fuzzy
msgid "Operation not yet finished"
-msgstr "Operacja anulowana"
-+msgstr "Operacja jeszcze niezakończona"
++msgstr "Operacja jeszcze nie zakończona"
- #: src/err-codes.h:208
+ #: src/err-codes.h:210
msgid "Buffer too short"
+@@ -885,7 +880,6 @@
+ msgstr "Nieparzysta liczba cyfr szesnastkowych w S-wyrażeniu"
+
+ #: src/err-codes.h:223
+-#, fuzzy
+ msgid "Bad octal character in S-expression"
+ msgstr "Błędny znak ósemkowy w S-wyrażeniu"
+
diff --git a/libgpg-error.spec b/libgpg-error.spec
index 8758b16..a95d1d4 100644
--- a/libgpg-error.spec
+++ b/libgpg-error.spec
@@ -6,19 +6,19 @@
Summary: Library libgpg-error
Summary(pl.UTF-8): Biblioteka libgpg-error
Name: libgpg-error
-Version: 1.7
+Version: 1.8
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2
-# Source0-md5: 62c0d09d1e76c5b6da8fff92314c4665
+# Source0-md5: 1d2005268a2f096db28cf9cf77b3229a
Patch0: %{name}-pl.po-update.patch
Patch1: %{name}-gpg_error_config.patch
URL: http://www.gnupg.org/related_software/libgpg-error/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1:1.9.6
BuildRequires: gettext-devel >= 0.15
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2.2.6
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -83,11 +83,11 @@ rm -f po/stamp-po
%build
%{__gettextize}
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
%{__automake}
%configure \
- %{!?with_static_libs:--disable-static}
+ %{?with_static_libs:--enable-static}
%{__make}
%install