From: Jakub Bogusz Date: Fri, 2 Apr 2010 07:15:00 +0000 (+0000) Subject: - updated to 2.11 X-Git-Tag: auto/th/cpio-2_11-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcpio.git;a=commitdiff_plain;h=a329c181df1f49afbf2fdd0c8f9e456f72f82fef - updated to 2.11 - removed locale,pl.po-update patches, added ifdef patch Changed files: cpio-ifdef.patch -> 1.1 cpio-locale.patch -> 1.3 cpio-pl.po-update.patch -> 1.5 cpio.spec -> 1.79 --- diff --git a/cpio-ifdef.patch b/cpio-ifdef.patch new file mode 100644 index 0000000..0e9f4b1 --- /dev/null +++ b/cpio-ifdef.patch @@ -0,0 +1,22 @@ +--- cpio-2.11/lib/system.h.orig 2010-03-10 10:27:14.000000000 +0100 ++++ cpio-2.11/lib/system.h 2010-04-01 20:11:55.744993924 +0200 +@@ -17,7 +17,7 @@ + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +-#if HAVE_CONFIG_H ++#ifdef HAVE_CONFIG_H + # include + #endif + +--- cpio-2.11/lib/sysdep.c.orig 2010-03-10 10:27:14.000000000 +0100 ++++ cpio-2.11/lib/sysdep.c 2010-04-01 20:12:02.508993924 +0200 +@@ -21,7 +21,7 @@ + along with GNU cpiio. If not, see . */ + + +-#if HAVE_CONFIG_H ++#ifdef HAVE_CONFIG_H + # include + #endif + diff --git a/cpio-locale.patch b/cpio-locale.patch deleted file mode 100644 index 37a81f2..0000000 --- a/cpio-locale.patch +++ /dev/null @@ -1,149 +0,0 @@ ---- cpio-2.6/po/POTFILES.in.orig 2004-09-06 13:22:27.000000000 +0200 -+++ cpio-2.6/po/POTFILES.in 2005-01-09 15:50:33.665477368 +0100 -@@ -9,6 +9,9 @@ - src/userspec.c - src/util.c - -+rmt/rmt.c -+ -+lib/argp-help.c - lib/getopt.c - lib/rtapelib.c - lib/strerror.c ---- cpio-2.7/po/pl.po.orig 2006-10-21 18:55:18.000000000 +0200 -+++ cpio-2.7/po/pl.po 2006-10-28 14:24:47.491975000 +0200 -@@ -801,6 +801,134 @@ - msgid "internal error: tape descriptor changed from %d to %d" - msgstr "b³±d wewnêtrzny: deskryptor ta¶my zmieni³ siê z %d na %d" - -+#: rmt/rmt.c:142 -+msgid "Input string too long" -+msgstr "£añcuch wej¶ciowy zbyt d³ugi" -+ -+#: rmt/rmt.c:161 -+msgid "Number syntax error" -+msgstr "B³±d sk³adni liczby" -+ -+#: rmt/rmt.c:180 -+msgid "rmtd: Cannot allocate buffer space\n" -+msgstr "rmtd: Nie mo¿na przydzieliæ miejsca na bufor\n" -+ -+#: rmt/rmt.c:182 -+msgid "Cannot allocate buffer space" -+msgstr "Nie mo¿na przydzieliæ miejsca na bufor" -+ -+#: rmt/rmt.c:304 -+#, c-format -+msgid "Try `%s --help' for more information.\n" -+msgstr "Wywo³anie `%s --help' poda wiêcej informacji.\n" -+ -+#: rmt/rmt.c:308 -+#, c-format -+msgid "" -+"Usage: %s [OPTION]\n" -+"Manipulate a tape drive, accepting commands from a remote process.\n" -+"\n" -+" --version Output version info.\n" -+" --help Output this help.\n" -+msgstr "" -+"Sk³adnia: %s [OPCJA]\n" -+"Obs³uga napêdu ta¶mowego, przyjmowanie poleceñ od zdalnego procesu.\n" -+"\n" -+" --version Wypisanie informacji o wersji.\n" -+" --help Wypisanie tego tekstu pomocy.\n" -+ -+#: rmt/rmt.c:315 -+#, c-format -+msgid "" -+"\n" -+"Report bugs to <%s>.\n" -+msgstr "" -+"\n" -+"B³êdy nale¿y zg³aszaæ na adres <%s>.\n" -+ -+#: rmt/rmt.c:397 -+msgid "Seek offset error" -+msgstr "B³±d offsetu przesuniêcia" -+ -+#: rmt/rmt.c:406 rmt/rmt.c:547 rmt/rmt.c:557 -+msgid "Seek offset out of range" -+msgstr "Offset przesuniêcia spoza zakresu" -+ -+#: rmt/rmt.c:428 -+msgid "Seek direction out of range" -+msgstr "Kierunek przesuniêcia spoza zakresu" -+ -+#: rmt/rmt.c:472 -+msgid "rmtd: Premature eof\n" -+msgstr "rmtd: Przedwczesny koniec pliku\n" -+ -+#: rmt/rmt.c:474 -+msgid "Premature end of file" -+msgstr "Przedwczesny koniec pliku" -+ -+#: rmt/rmt.c:672 -+msgid "Garbage command" -+msgstr "Nieistniej±ce polecenie" -+ -+#: lib/argp-help.c:148 -+#, c-format -+msgid "ARGP_HELP_FMT: %s value is less than or equal to %s" -+msgstr "ARGP_HELP_FMT: warto¶æ %s jest mniejsza lub równa %s" -+ -+#: lib/argp-help.c:221 -+#, c-format -+msgid "%.*s: ARGP_HELP_FMT parameter requires a value" -+msgstr "%.*s: parametr ARGP_HELP_FMT wymaga warto¶ci" -+ -+#: lib/argp-help.c:227 -+#, c-format -+msgid "%.*s: ARGP_HELP_FMT parameter must be positive" -+msgstr "%.*s: parametr ARGP_HELP_FMT musi byæ dodatni" -+ -+#: lib/argp-help.c:236 -+#, c-format -+msgid "%.*s: Unknown ARGP_HELP_FMT parameter" -+msgstr "%.*s: Nieznany parametr ARGP_HELP_FMT" -+ -+#: lib/argp-help.c:248 -+#, c-format -+msgid "Garbage in ARGP_HELP_FMT: %s" -+msgstr "¦mieci w ARGP_HELP_FMT: %s" -+ -+#: lib/argp-help.c:1229 -+msgid "" -+"Mandatory or optional arguments to long options are also mandatory or " -+"optional for any corresponding short options." -+msgstr "" -+"Obowi±zkowe lub opcjonalne argumenty dla opcji d³ugich s± obowi±zkowe " -+"lub opcjonalne tak¿e dla odpowiadaj±cych im opcji krótkich." -+ -+#: lib/argp-help.c:1622 -+msgid "Usage:" -+msgstr "Sk³adnia:" -+ -+#: lib/argp-help.c:1626 -+msgid " or: " -+msgstr " lub: " -+ -+#: lib/argp-help.c:1638 -+msgid " [OPTION...]" -+msgstr " [OPCJA...]" -+ -+#: lib/argp-help.c:1665 -+#, c-format -+msgid "Try `%s --help' or `%s --usage' for more information.\n" -+msgstr "Wywo³anie `%s --help' lub `%s --usage' poda wiêcej informacji.\n" -+ -+#: lib/argp-help.c:1693 -+#, c-format -+msgid "Report bugs to %s.\n" -+msgstr "B³êdy nale¿y zg³aszaæ na adres %s.\n" -+ -+#: lib/argp-help.c:1912 -+msgid "Unknown system error" -+msgstr "Nieznany b³±d systemowy" -+ - #: lib/getopt.c:531 lib/getopt.c:547 - #, c-format - msgid "%s: option `%s' is ambiguous\n" diff --git a/cpio-pl.po-update.patch b/cpio-pl.po-update.patch deleted file mode 100644 index b7b10ad..0000000 --- a/cpio-pl.po-update.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- cpio-2.9/po/pl.po.orig 2007-06-28 18:58:53.000000000 +0200 -+++ cpio-2.9/po/pl.po 2007-07-01 11:59:14.760027377 +0200 -@@ -6,10 +6,10 @@ - # - msgid "" - msgstr "" --"Project-Id-Version: cpio 2.8\n" -+"Project-Id-Version: cpio 2.9\n" - "Report-Msgid-Bugs-To: bug-cpio@gnu.org\n" - "POT-Creation-Date: 2007-06-28 19:58+0300\n" --"PO-Revision-Date: 2007-06-13 07:33+0200\n" -+"PO-Revision-Date: 2007-07-01 11:40+0200\n" - "Last-Translator: Jakub Bogusz \n" - "Language-Team: Polish \n" - "MIME-Version: 1.0\n" -@@ -107,12 +107,12 @@ - msgstr "standardowe wej¶cie (stdin) jest zamkniête" - - #: src/copyin.c:1579 src/copyout.c:894 src/copypass.c:374 --#, fuzzy, c-format -+#, c-format - msgid "%lu block\n" - msgid_plural "%lu blocks\n" --msgstr[0] "%d blok\n" --msgstr[1] "%d bloki\n" --msgstr[2] "%d bloków\n" -+msgstr[0] "%lu blok\n" -+msgstr[1] "%lu bloki\n" -+msgstr[2] "%lu bloków\n" - - #: src/copyout.c:51 src/copyout.c:60 - #, c-format -@@ -541,7 +541,7 @@ - msgstr "zawieszenie na SECS sekund (domy¶lnie 3600)" - - #: src/main.c:250 --#, fuzzy, c-format -+#, c-format - msgid "" - " GNU cpio is free software; you can redistribute it and/or modify\n" - " it under the terms of the GNU General Public License as published by\n" -@@ -562,7 +562,7 @@ - "modyfikowaæ\n" - " na warunkach Powszechnej Licencji Publicznej GNU (General Public " - "License)\n" --" opublikowanej przez Free Software Foundation, w wersji 2, lub, do " -+" opublikowanej przez Free Software Foundation, w wersji 3, lub, do " - "wyboru,\n" - " dowolnej pó¼niejszej.\n" - "\n" -@@ -785,9 +785,9 @@ - msgstr "brak pamiêci wirtualnej" - - #: src/util.c:624 --#, fuzzy, c-format -+#, c-format - msgid "Creating intermediate directory `%s'" --msgstr "nie mo¿na utworzyæ katalogu `%s'" -+msgstr "Tworzenie katalogu po¶redniego `%s'" - - #: src/util.c:661 src/util.c:667 - #, c-format -@@ -817,7 +817,7 @@ - #: src/util.c:1417 - #, c-format - msgid "%s: Unexpected inconsistency when making directory" --msgstr "" -+msgstr "%s: Nieoczekiwana niespójno¶æ podczas tworzenia katalogu" - - #: lib/getopt.c:531 lib/getopt.c:547 - #, c-format diff --git a/cpio.spec b/cpio.spec index be63758..efcf8ca 100644 --- a/cpio.spec +++ b/cpio.spec @@ -8,20 +8,19 @@ Summary(ru.UTF-8): Архивная программа GNU Summary(tr.UTF-8): GNU cpio arşivleme programı Summary(uk.UTF-8): Архівна програма GNU Name: cpio -Version: 2.9 -Release: 3 +Version: 2.11 +Release: 1 License: GPL v3+ Group: Applications/Archiving Source0: http://ftp.gnu.org/gnu/cpio/%{name}-%{version}.tar.bz2 -# Source0-md5: e387abfdae3a0b9a8a5f762db653a96d +# Source0-md5: 20fc912915c629e809f80b96b2e75d7d Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: 027552f4053477462a09fadc162a5e65 Patch0: %{name}-info.patch -Patch1: %{name}-locale.patch -Patch2: %{name}-pl.po-update.patch +Patch1: %{name}-ifdef.patch URL: http://www.gnu.org/software/cpio/ -BuildRequires: autoconf >= 2.59 -BuildRequires: automake >= 1:1.8 +BuildRequires: autoconf >= 2.63 +BuildRequires: automake >= 1:1.11.1 BuildRequires: gettext-devel >= 0.16 BuildRequires: texinfo BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -103,27 +102,17 @@ cpio копіює файли в або з архіву cpio або tar, який %prep %setup -q -%patch2 -p1 %patch0 -p1 %patch1 -p1 -rm -f po/stamp-po - -rm m4/extensions.m4 -sed -i -e 's#gl_USE_SYSTEM_EXTENSIONS#AC_USE_SYSTEM_EXTENSIONS#g' configure.ac m4/*.m4 - -rm lib/argp*.h -for f in lib/arg*.c; do - :> $f -done - %build %{__gettextize} -%{__aclocal} -I m4 +%{__aclocal} -I m4 -I am %{__autoconf} %{__autoheader} %{__automake} -%configure +%configure \ + --disable-silent-rules %{__make} @@ -135,15 +124,19 @@ rm -rf $RPM_BUILD_ROOT bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} +# in PLD rmt is built from tar.spec +%{__rm} $RPM_BUILD_ROOT%{_libdir}/rmt +%{__rm} $RPM_BUILD_ROOT%{_mandir}{,/es,/ja}/man1/mt.1* + %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/postshell +%post -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} -%postun -p /sbin/postshell +%postun -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} %files -f %{name}.lang