[packages/gnupg2] - updated to 2.0.20 - updated pl.po-update patch - added am patch (fixes build with automake 1.13+)
qboosh
qboosh at pld-linux.org
Sun May 12 19:46:41 CEST 2013
commit eb43eafba159c4002117f29771ec95a18de9d3cd
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun May 12 19:46:40 2013 +0200
- updated to 2.0.20
- updated pl.po-update patch
- added am patch (fixes build with automake 1.13+)
gnupg2-am.patch | 11 +++
gnupg2-pl.po-update.patch | 198 +++++++++++++++++++++++++++++++++++++++++++---
gnupg2.spec | 8 +-
3 files changed, 201 insertions(+), 16 deletions(-)
---
diff --git a/gnupg2.spec b/gnupg2.spec
index 33f9a0c..c3092aa 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -6,17 +6,18 @@
Summary: GNU Privacy Guard - tool for secure communication and data storage - enhanced version
Summary(pl.UTF-8): GnuPG - narzędzie do bezpiecznej komunikacji i bezpiecznego przechowywania danych - wersja rozszerzona
Name: gnupg2
-Version: 2.0.19
+Version: 2.0.20
Release: 1
License: GPL v3+
Group: Applications/File
Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
-# Source0-md5: 6a8589381ca1b0c1a921e9955f42b016
+# Source0-md5: 9d18ee71bb0b10d40d1c8a393bdd7a89
Source1: gnupg-agent.sh
Patch0: %{name}-info.patch
Patch1: %{name}-pth.patch
Patch2: %{name}-disable_tests.patch
Patch3: %{name}-pl.po-update.patch
+Patch4: %{name}-am.patch
URL: http://www.gnupg.org/
BuildRequires: adns-devel
BuildRequires: autoconf >= 2.61
@@ -194,6 +195,7 @@ Rozszerzenie GnuPG - obsługa S/MIME.
%patch1 -p1
%{!?with_tests:%patch2 -p1}
%patch3 -p1
+%patch4 -p1
%{__rm} po/stamp-po
@@ -300,12 +302,12 @@ EOF
%files -n gnupg-agent
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/gpg-agent
-%attr(755,root,root) %{_bindir}/scdaemon
%attr(755,root,root) %{_bindir}/symcryptrun
%attr(755,root,root) %{_libexecdir}/gnupg-pcsc-wrapper
%attr(755,root,root) %{_libexecdir}/gpg-check-pattern
%attr(755,root,root) %{_libexecdir}/gpg-protect-tool
%attr(755,root,root) %{_libexecdir}/gpg-preset-passphrase
+%attr(755,root,root) %{_libexecdir}/scdaemon
%{_mandir}/man1/gpg-agent.1*
%{_mandir}/man1/gpg-preset-passphrase.1*
%{_mandir}/man1/scdaemon.1*
diff --git a/gnupg2-am.patch b/gnupg2-am.patch
new file mode 100644
index 0000000..1b347c6
--- /dev/null
+++ b/gnupg2-am.patch
@@ -0,0 +1,11 @@
+--- gnupg-2.0.20/configure.ac.orig 2013-05-12 17:32:39.674996433 +0200
++++ gnupg-2.0.20/configure.ac 2013-05-12 17:33:18.451661475 +0200
+@@ -62,7 +62,7 @@
+
+ AC_CONFIG_AUX_DIR(scripts)
+ AC_CONFIG_SRCDIR(sm/gpgsm.c)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+ AC_CANONICAL_HOST
+ AB_INIT
diff --git a/gnupg2-pl.po-update.patch b/gnupg2-pl.po-update.patch
index 19afe48..1bbd606 100644
--- a/gnupg2-pl.po-update.patch
+++ b/gnupg2-pl.po-update.patch
@@ -1,24 +1,24 @@
---- gnupg-2.0.19/po/pl.po.orig 2012-03-27 10:23:47.000000000 +0200
-+++ gnupg-2.0.19/po/pl.po 2012-04-17 19:32:41.098241338 +0200
+--- gnupg-2.0.20/po/pl.po.orig 2013-05-12 17:25:57.235013323 +0200
++++ gnupg-2.0.20/po/pl.po 2013-05-12 17:31:52.618331743 +0200
@@ -2,14 +2,14 @@
# Copyright (C) 1998, 1999, 2000, 2001, 2002,
# 2007 Free Software Foundation, Inc.
# Janusz A. Urbanowicz <alex at bofh.net.pl>, 1999, 2000, 2001, 2002, 2003-2004
-# Jakub Bogusz <qboosh at pld-linux.org>, 2003-2011.
-+# Jakub Bogusz <qboosh at pld-linux.org>, 2003-2012.
++# Jakub Bogusz <qboosh at pld-linux.org>, 2003-2013.
#
msgid ""
msgstr ""
-"Project-Id-Version: gnupg-2.0.17\n"
-+"Project-Id-Version: gnupg-2.0.19\n"
++"Project-Id-Version: gnupg-2.0.20\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2012-03-27 10:23+0200\n"
+ "POT-Creation-Date: 2013-05-10 15:57+0200\n"
-"PO-Revision-Date: 2011-01-12 08:34+0100\n"
-+"PO-Revision-Date: 2012-04-17 19:31+0200\n"
++"PO-Revision-Date: 2013-05-12 17:25+0200\n"
"Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
- "MIME-Version: 1.0\n"
-@@ -165,32 +165,33 @@
+ "Language: pl\n"
+@@ -169,32 +169,33 @@
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
@@ -49,12 +49,184 @@
-#, fuzzy, c-format
+#, c-format
msgid ""
- "Please enter a passphrase to protect the received secret key%%0A %s%%0A %"
- "s%%0Awithin gpg-agent's key storage"
+ "Please enter a passphrase to protect the received secret key%%0A %s%%0A "
+ "%s%%0Awithin gpg-agent's key storage"
msgstr ""
- "Prosz� wprowadzi� has�o do zabezpieczenia odebranego klucza tajnego%%0A %s%"
--"%0A w miejscu przechowywania kluczy gpg-agenta"
-+"%0A %s%%0Aw miejscu przechowywania kluczy gpg-agenta"
+ "Prosz� wprowadzi� has�o do zabezpieczenia odebranego klucza tajnego%%0A %s"
+-"%%0A w miejscu przechowywania kluczy gpg-agenta"
++"%%0A %s%%0Aw miejscu przechowywania kluczy gpg-agenta"
#: agent/command-ssh.c:2548 agent/genkey.c:340 agent/genkey.c:463
#: tools/symcryptrun.c:436
+@@ -229,8 +230,7 @@
+ msgstr "Kod resetuj�cy"
+
+ #: agent/divert-scd.c:238
+-#, fuzzy, c-format
+-#| msgid "%s%%0A%%0AUse the reader's keypad for input."
++#, c-format
+ msgid "%s%%0A%%0AUse the reader's pinpad for input."
+ msgstr "%s%%0A%%0ADo wpisywania nale�y u�y� klawiatury czytnika."
+
+@@ -347,8 +347,7 @@
+ msgstr "Tak, ochrona nie jest potrzebna"
+
+ #: agent/genkey.c:308
+-#, fuzzy, c-format
+-#| msgid "Please enter the passphrase to%0Ato protect your new key"
++#, c-format
+ msgid "Please enter the passphrase to%0Aprotect your new key"
+ msgstr "Prosz� wprowadzi� has�o do%0Azabezpieczenia swojego nowego klucza"
+
+@@ -2142,19 +2141,14 @@
+ msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
+
+ #: g10/gpg.c:843
+-#, fuzzy
+-#| msgid ""
+-#| "Syntax: gpg [options] [files]\n"
+-#| "sign, check, encrypt or decrypt\n"
+-#| "default operation depends on the input data\n"
+ msgid ""
+ "Syntax: gpg [options] [files]\n"
+ "Sign, check, encrypt or decrypt\n"
+ "Default operation depends on the input data\n"
+ msgstr ""
+ "Sk�adnia: gpg [opcje] [pliki]\n"
+-"podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
+-"domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
++"Podpisywanie, sprawdzanie podpis�w, szyfrowanie, rozszyfrowywanie\n"
++"Domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
+
+ #: g10/gpg.c:854 sm/gpgsm.c:543
+ msgid ""
+@@ -6765,16 +6759,12 @@
+ msgstr "Wywo�anie: kbxutil [opcje] [pliki] (-h podaje pomoc)"
+
+ #: kbx/kbxutil.c:120
+-#, fuzzy
+-#| msgid ""
+-#| "Syntax: kbxutil [options] [files]\n"
+-#| "list, export, import Keybox data\n"
+ msgid ""
+ "Syntax: kbxutil [options] [files]\n"
+ "List, export, import Keybox data\n"
+ msgstr ""
+ "Sk�adnia: kbxutil [opcje] [pliki]\n"
+-"wypisywanie, eksport, import danych Keybox\n"
++"Wypisywanie, eksport, import danych Keybox\n"
+
+ #: scd/app-nks.c:713 scd/app-openpgp.c:2783
+ #, c-format
+@@ -6959,16 +6949,12 @@
+ msgstr "|N|Nowy PIN"
+
+ #: scd/app-openpgp.c:2256
+-#, fuzzy
+-#| msgid "|A|Please enter the Admin PIN"
+ msgid "||Please enter the Admin PIN and New Admin PIN"
+-msgstr "|A|Prosz� wprowadzi� PIN administracyjny"
++msgstr "||Prosz� wprowadzi� PIN administracyjny i nowy PIN administracyjny"
+
+ #: scd/app-openpgp.c:2257
+-#, fuzzy
+-#| msgid "||Please enter the PIN"
+ msgid "||Please enter the PIN and New PIN"
+-msgstr "||Prosz� wpisa� PIN"
++msgstr "||Prosz� wprowadzi� PIN i nowy PIN"
+
+ #: scd/app-openpgp.c:2314 scd/app-openpgp.c:3104
+ msgid "error reading application data\n"
+@@ -7052,8 +7038,6 @@
+ msgstr "nie mo�na dosta� si� do %s - niepoprawna karta OpenPGP?\n"
+
+ #: scd/app-dinsig.c:299
+-#, fuzzy
+-#| msgid "||Please enter your PIN at the reader's keypad"
+ msgid "||Please enter your PIN at the reader's pinpad"
+ msgstr "||Prosz� wprowadzi� PIN na klawiaturze czytnika"
+
+@@ -7097,8 +7081,6 @@
+ msgstr "|N|od��czenie karty po N sekundach nieaktywno�ci"
+
+ #: scd/scdaemon.c:144
+-#, fuzzy
+-#| msgid "do not use a reader's keypad"
+ msgid "do not use a reader's pinpad"
+ msgstr "nie u�ywanie klawiatury czytnika"
+
+@@ -7108,7 +7090,7 @@
+
+ #: scd/scdaemon.c:152
+ msgid "use variable length input for pinpad"
+-msgstr ""
++msgstr "u�ycie wej�cia z klawiatury czytnika o zmiennej d�ugo�ci"
+
+ #: scd/scdaemon.c:267
+ msgid "Usage: scdaemon [options] (-h for help)"
+@@ -7455,26 +7437,18 @@
+ msgstr "b��d podczas pobierania informacji o wykorzystaniu klucza: %s\n"
+
+ #: sm/certlist.c:142
+-#, fuzzy
+-#| msgid "certificate should have not been used for certification\n"
+ msgid "certificate should not have been used for certification\n"
+ msgstr "certyfikat nie powinien by� u�ywany do po�wiadczania\n"
+
+ #: sm/certlist.c:154
+-#, fuzzy
+-#| msgid "certificate should have not been used for OCSP response signing\n"
+ msgid "certificate should not have been used for OCSP response signing\n"
+ msgstr "certyfikat nie powinien by� u�ywany do podpisywania odpowiedzi OCSP\n"
+
+ #: sm/certlist.c:165
+-#, fuzzy
+-#| msgid "certificate should have not been used for encryption\n"
+ msgid "certificate should not have been used for encryption\n"
+ msgstr "certyfikat nie powinien by� u�ywany do szyfrowania\n"
+
+ #: sm/certlist.c:166
+-#, fuzzy
+-#| msgid "certificate should have not been used for signing\n"
+ msgid "certificate should not have been used for signing\n"
+ msgstr "certyfikat nie powinien by� u�ywany do podpisywania\n"
+
+@@ -7822,20 +7796,15 @@
+ msgstr "Wywo�anie: gpgsm [opcje] [pliki] (-h podaje pomoc)"
+
+ #: sm/gpgsm.c:525
+-#, fuzzy
+-#| msgid ""
+-#| "Syntax: gpgsm [options] [files]\n"
+-#| "sign, check, encrypt or decrypt using the S/MIME protocol\n"
+-#| "default operation depends on the input data\n"
+ msgid ""
+ "Syntax: gpgsm [options] [files]\n"
+ "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
+ "Default operation depends on the input data\n"
+ msgstr ""
+ "Sk�adnia: gpgsm [opcje] [pliki]\n"
+-"podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie z u�yciem S/"
++"Podpisywanie, sprawdzanie podpis�w, szyfrowanie, rozszyfrowywanie z u�yciem S/"
+ "MIME\n"
+-"domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
++"Domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
+
+ #: sm/gpgsm.c:617
+ msgid "usage: gpgsm [options] "
+@@ -8376,7 +8345,7 @@
+
+ #: tools/symcryptrun.c:156
+ msgid "decryption modus"
+-msgstr "tryb deszyfrowania"
++msgstr "tryb rozszyfrowywania"
+
+ #: tools/symcryptrun.c:157
+ msgid "encryption modus"
+@@ -8543,6 +8512,3 @@
+ msgstr ""
+ "Sk�adnia: gpg-check-pattern [opcje] plik-wzorc�w\n"
+ "Sprawdzanie has�a ze standardowego wej�cia wzgl�dem pliku wzorc�w\n"
+-
+-#~ msgid "failed to allocated keyDB handle\n"
+-#~ msgstr "nie uda�o si� przydzieli� uchwytu keyDB\n"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnupg2.git/commitdiff/eb43eafba159c4002117f29771ec95a18de9d3cd
More information about the pld-cvs-commit
mailing list