[packages/sharutils] - updated to 4.14 - updated pl.po-update,format patches (the latter contains only workarounds now)
qboosh
qboosh at pld-linux.org
Sun Oct 20 08:21:24 CEST 2013
commit 401f7b5122c926ae333d5b66685d4a807ad63f55
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Oct 20 08:20:49 2013 +0200
- updated to 4.14
- updated pl.po-update,format patches (the latter contains only workarounds now)
sharutils-format.patch | 55 +++------------------------
sharutils-pl.po-update.patch | 90 +++++++++++++++++++-------------------------
sharutils.spec | 4 +-
3 files changed, 46 insertions(+), 103 deletions(-)
---
diff --git a/sharutils.spec b/sharutils.spec
index 428dcda..a0c891c 100644
--- a/sharutils.spec
+++ b/sharutils.spec
@@ -8,12 +8,12 @@ Summary(ru.UTF-8): Утилиты GNU shar для создания и распа
Summary(tr.UTF-8): Arşivleme ve kabuk araçları
Summary(uk.UTF-8): Утиліти GNU shar для створення та розпаковки shell-архівів
Name: sharutils
-Version: 4.13.5
+Version: 4.14
Release: 1
License: GPL v3+
Group: Applications/File
Source0: http://ftp.gnu.org/gnu/sharutils/%{name}-%{version}.tar.xz
-# Source0-md5: 05b66d9b30336a9fd3b28fd1860e26c1
+# Source0-md5: 77ede22951bdb67279c6e78e79a04784
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 336f405f69324d129a6ccd3b66f8eb6c
Patch0: %{name}-info.patch
diff --git a/sharutils-format.patch b/sharutils-format.patch
index 1ace3ed..8ba7899 100644
--- a/sharutils-format.patch
+++ b/sharutils-format.patch
@@ -1,42 +1,6 @@
---- sharutils-4.13.5/src/shar.c.orig 2013-04-12 02:35:05.000000000 +0200
-+++ sharutils-4.13.5/src/shar.c 2013-04-24 18:19:54.990797675 +0200
-@@ -461,7 +461,7 @@
-
- if (stat (local_name, &struct_stat))
- {
-- error (0, errno, local_name);
-+ error (0, errno, "%s", local_name);
- return SHAR_EXIT_FILE_NOT_FOUND;
- }
-
-@@ -470,7 +470,7 @@
-
- if (directory = opendir (local_name), !directory)
- {
-- error (0, errno, local_name);
-+ error (0, errno, "%s", local_name);
- return SHAR_EXIT_CANNOT_OPENDIR;
- }
-
-@@ -563,7 +563,7 @@
- #else
- if (closedir (directory))
- {
-- error (0, errno, local_name);
-+ error (0, errno, "%s", local_name);
- return SHAR_EXIT_CANNOT_OPENDIR;
- }
- #endif
-@@ -615,7 +615,7 @@
-
- if (status != 0)
- {
-- error (0, errno, local_name_copy);
-+ error (0, errno, "%s", local_name_copy);
- status = SHAR_EXIT_FILE_NOT_FOUND;
- }
- else
-@@ -954,7 +954,7 @@
+--- sharutils-4.14/src/shar.c.orig 2013-10-13 00:18:28.000000000 +0200
++++ sharutils-4.14/src/shar.c 2013-10-20 08:11:36.027842920 +0200
+@@ -926,7 +926,7 @@
free (c_dir);
}
else
@@ -45,7 +9,7 @@
}
}
-@@ -2134,7 +2134,7 @@
+@@ -2148,7 +2148,7 @@
*/
FILE * fp = freopen ("/dev/null", fwriteonly_mode, stderr);
if (fp != stderr)
@@ -54,7 +18,7 @@
_("reopening stderr to /dev/null"));
}
-@@ -2200,7 +2200,7 @@
+@@ -2219,7 +2219,7 @@
if (HAVE_OPT(QUERY_USER))
{
if (HAVE_OPT(NET_HEADERS))
@@ -63,12 +27,3 @@
fputs ("shar_wish=\n", output);
}
-@@ -2348,7 +2348,7 @@
- optionLoadLine (&sharOptions, arg);
- }
- else
-- error (0, errno, arg);
-+ error (0, errno, "%s", arg);
- continue;
- }
-
diff --git a/sharutils-pl.po-update.patch b/sharutils-pl.po-update.patch
index 74e226c..dc58770 100644
--- a/sharutils-pl.po-update.patch
+++ b/sharutils-pl.po-update.patch
@@ -1,60 +1,48 @@
---- sharutils-4.13.4/po/pl.po.orig 2013-04-01 07:42:02.301972601 +0200
-+++ sharutils-4.13.4/po/pl.po 2013-04-01 07:47:08.598632881 +0200
-@@ -395,7 +395,6 @@
- "\n"
-
- #: src/shar-opts.c:2291
--#, fuzzy
+--- sharutils-4.14/po/pl.po.orig 2013-10-20 08:02:24.147866080 +0200
++++ sharutils-4.14/po/pl.po 2013-10-20 08:05:32.454524844 +0200
+@@ -6,10 +6,10 @@
+ #
msgid ""
- "Though this program supports 'uuencode'-d files, they are deprecated. If\n"
- "you are emailing files, please consider mime-encoded files. If you do\n"
-@@ -957,13 +956,13 @@
- msgstr "%s: opcja '%s' musi mieć argument.\n"
-
- #: ../autoopts.c:171
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "(AutoOpts bug): Equivalenced option '%s' was equivalenced to both\n"
- "\t'%s' and '%s'."
msgstr ""
- "(Błąd AutoOpts): Opcja równoważna '%s' odpowiada jednocześnie\n"
--"\t'%s' i '%s'"
-+"\t'%s' i '%s'."
-
- #: ../check.c:94
+-"Project-Id-Version: sharutils 4.13.5\n"
++"Project-Id-Version: sharutils 4.14\n"
+ "Report-Msgid-Bugs-To: bug-gnu-utils at gnu.org\n"
+ "POT-Creation-Date: 2013-10-18 14:04-0700\n"
+-"PO-Revision-Date: 2013-04-15 20:09+0200\n"
++"PO-Revision-Date: 2013-10-20 08:02+0200\n"
+ "Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
+ "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
+ "Language: pl\n"
+@@ -20,7 +20,7 @@
+ #: src/scribble.c:150
#, c-format
-@@ -1026,9 +1025,9 @@
- msgstr "Błąd %s: '%s' nie jest rozpoznawanym formatem okresu czasu.\n"
+ msgid "could not allocate %u bytes of scribble space"
+-msgstr ""
++msgstr "nie udało się przydzielić miejsca na gryzmoły (%u b)"
- #: ../check.c:92
--#, fuzzy, c-format
-+#, c-format
- msgid "%s error: The %s option must appear %d times.\n"
--msgstr "Błąd %s: opcja %s musi wystąpić %d razy\n"
-+msgstr "Błąd %s: opcja %s musi wystąpić %d razy.\n"
+ #. TRANSLATORS: This is a phony function generated for the purpose of
+ #. constructing the strings to be extracted for translation. Each string
+@@ -1359,10 +1359,8 @@
+ "[<plik>...]\n"
- #: ../numeric.c:157
- #, c-format
-@@ -1577,12 +1576,11 @@
- msgstr "Jeśli nie podano plików, dekodowane jest standardowe wejście.\n"
-
- #: src/uudecode-opts.c:727
+ #: src/unshar-opts.c:971
-#, fuzzy
- msgid ""
- "'uudecode' transforms uuencoded files into their original form.\n"
- "\n"
- msgstr ""
--"'Uudecode' przekształca pliki zakodowane uuencode do postaci oryginalnej.\n"
-+"'uudecode' przekształca pliki zakodowane uuencode do postaci oryginalnej.\n"
- "\n"
+ msgid " -d, --directory=DIR unpack into the directory DIR\n"
+-msgstr ""
+-" -d, --directory=KATALOG przejście do KATALOGU przed rozpakowywaniem\n"
++msgstr " -d, --directory=KATALOG rozpakowanie do podanego KATALOGU\n"
- #: src/uudecode-opts.c:728 src/uudecode-opts.c:763
-@@ -1912,7 +1910,6 @@
- "<nazwa_wyjścia>\n"
+ #: src/unshar-opts.c:972
+ msgid " -c, --overwrite overwrite any pre-existing files\n"
+@@ -1466,9 +1464,9 @@
+ "Wywołanie 'unshar --help' poda więcej informacji.\n"
- #: src/uuencode-opts.c:695
--#, fuzzy
- msgid " -m, --base64 convert using base64\n"
- msgstr " -m, --base64 konwersja przy użyciu base64\n"
+ #: src/unshar-opts.h:258 src/uudecode-opts.h:236
+-#, fuzzy, c-format
++#, c-format
+ msgid "could not allocate %zu bytes for %s\n"
+-msgstr "nie udało się odnaleźć opcji 'help'"
++msgstr "nie udało się przydzielić %zu b dla %s\n"
+ #: src/unshar.c:202
+ #, c-format
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sharutils.git/commitdiff/401f7b5122c926ae333d5b66685d4a807ad63f55
More information about the pld-cvs-commit
mailing list