- updated to 1.25 (-C bug should be fixed now)

- updated pl.po-update patch (from TP)
- removed obsolete fortifysourcessigabrt patch

Changed files:
    tar-fortifysourcessigabrt.patch -> 1.2
    tar-pl.po-update.patch -> 1.20
    tar.spec -> 1.131

diff --git a/tar-fortifysourcessigabrt.patch b/tar-fortifysourcessigabrt.patch
deleted file mode 100644 (file)
index e64ec6f..0000000
--- a/tar-fortifysourcessigabrt.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -urNp tar-1.22-orig/src/create.c tar-1.22/src/create.c
---- tar-1.22-orig/src/create.c 2009-07-09 18:38:37.000000000 +0200
-+++ tar-1.22/src/create.c      2009-07-09 18:43:44.000000000 +0200
-@@ -578,7 +578,10 @@ write_gnu_long_link (struct tar_stat_inf
-   GNAME_TO_CHARS (tmpname, header->header.gname);
-   free (tmpname);
- 
--  strcpy (header->header.magic, OLDGNU_MAGIC);
-+  /* OLDGNU_MAGIC is string with 7 chars + NULL */
-+  strncpy (header->header.magic, OLDGNU_MAGIC, sizeof(header->header.magic));
-+  strncpy (header->header.version, OLDGNU_MAGIC+sizeof(header->header.magic),
-+           sizeof(header->header.version));
-   header->header.typeflag = type;
-   finish_header (st, header, -1);
- 
-@@ -908,9 +911,13 @@ start_header (struct tar_stat_info *st)
-       break;
- 
-     case OLDGNU_FORMAT:
--    case GNU_FORMAT:   /*FIXME?*/
--      /* Overwrite header->header.magic and header.version in one blow.  */
--      strcpy (header->header.magic, OLDGNU_MAGIC);
-+    case GNU_FORMAT:
-+      /* OLDGNU_MAGIC is string with 7 chars + NULL */
-+      strncpy (header->header.magic, OLDGNU_MAGIC,
-+               sizeof(header->header.magic));
-+      strncpy (header->header.version,
-+               OLDGNU_MAGIC+sizeof(header->header.magic),
-+               sizeof(header->header.version));
-       break;
- 
-     case POSIX_FORMAT:

diff --git a/tar-pl.po-update.patch b/tar-pl.po-update.patch
index 7044cd886ff67a9997f8b6651da14dfc99601dbd..cb902eef5e9a8d801f7da3a1882d3e7188938d26 100644 (file)
--- a/tar-pl.po-update.patch
+++ b/tar-pl.po-update.patch
@@ -1,15 +1,20 @@
---- tar-1.24/po/pl.po.orig     2010-10-24 22:08:51.000000000 +0200
-+++ tar-1.24/po/pl.po  2010-10-25 22:31:11.755736853 +0200
-@@ -6,13 +6,12 @@
- #: src/create.c:1550
+--- tar-1.25/po/pl.po.orig     2010-11-07 16:08:01.000000000 +0100
++++ tar-1.25/po/pl.po  2010-11-11 08:12:58.587095747 +0100
+@@ -2,17 +2,16 @@
+ # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ # This file is distributed under the same license as the tar package.
+ # Rafał Maszkowski <rzm@icm.edu.pl>, 1996, 1997, 2000, 2001, 2003, 2004, 2006-2010.  „”
+-# Thanks to Jakub Bogusz for remarks and corrections, 2003, 2004, 2007, 2008
++# Thanks to Jakub Bogusz for remarks and corrections, 2003, 2004, 2007, 2008, 2010
+ #: src/create.c:1552
  msgid ""
  msgstr ""
 -"Project-Id-Version: tar 1.23.90\n"
 +"Project-Id-Version: tar 1.24\n"
  "Report-Msgid-Bugs-To: bug-tar@gnu.org\n"
- "POT-Creation-Date: 2010-10-24 23:08+0300\n"
+ "POT-Creation-Date: 2010-11-07 17:07+0200\n"
 -"PO-Revision-Date: 2010-07-13 14:50+0200\n"
-+"PO-Revision-Date: 2010-10-25 10:00+0200\n"
++"PO-Revision-Date: 2010-10-25 23:10+0200\n"
  "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
  "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 -"Language: pl\n"

diff --git a/tar.spec b/tar.spec
index ed61e05e750c24f14a64b30d63599d1bcf0ee0aa..74dc58110c0e8fd399ee893a07764ee1b767f60c 100644 (file)
--- a/tar.spec
+++ b/tar.spec
@@ -10,19 +10,18 @@ Summary(pl.UTF-8):  Program do archiwizacji (GNU)
 Summary(pt_BR.UTF-8):  GNU Tape Archiver (tar)
 Summary(tr.UTF-8):     Yaygın kullanılan yedekleyici
 Name:          tar
-Version:       1.24
-Release:       0.1
+Version:       1.25
+Release:       1
 Epoch:         1
 License:       GPL v3+
 Group:         Applications/Archiving
 Source0:       http://ftp.gnu.org/gnu/tar/%{name}-%{version}.tar.bz2
-# Source0-md5: ba905d8b1dcf06254e8025cc4468d8e5
+# Source0-md5: 6e497f861c77bbba2f7da4e10270995b
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 4e4b1655fe42c27a4eb5d7bcd82e74ac
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-pl.po-update.patch
 Patch2:                %{name}-zero-block.patch
-Patch3:                %{name}-fortifysourcessigabrt.patch
 URL:           http://www.gnu.org/software/tar/tar.html
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11
@@ -143,7 +142,6 @@ z pakietu dump.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %{__rm} po/stamp-po
 
@@ -187,21 +185,21 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README NEWS
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) /usr/bin/*
+%attr(755,root,root) %{_bindir}/tar
+%attr(755,root,root) /usr/bin/gtar
 %{_infodir}/tar.info*
-%{_mandir}/man1/*
-%lang(de) %{_mandir}/de/man1/*
-%lang(es) %{_mandir}/es/man1/*
-%lang(fi) %{_mandir}/fi/man1/*
-%lang(fr) %{_mandir}/fr/man1/*
-%lang(hu) %{_mandir}/hu/man1/*
-%lang(id) %{_mandir}/id/man1/*
-%lang(it) %{_mandir}/it/man1/*
-%lang(ja) %{_mandir}/ja/man1/*
-%lang(nl) %{_mandir}/nl/man1/*
-%lang(pl) %{_mandir}/pl/man1/*
+%{_mandir}/man1/tar.1*
+%lang(de) %{_mandir}/de/man1/tar.1*
+%lang(es) %{_mandir}/es/man1/tar.1*
+%lang(fi) %{_mandir}/fi/man1/tar.1*
+%lang(fr) %{_mandir}/fr/man1/tar.1*
+%lang(hu) %{_mandir}/hu/man1/tar.1*
+%lang(id) %{_mandir}/id/man1/tar.1*
+%lang(it) %{_mandir}/it/man1/tar.1*
+%lang(ja) %{_mandir}/ja/man1/tar.1*
+%lang(nl) %{_mandir}/nl/man1/tar.1*
+%lang(pl) %{_mandir}/pl/man1/tar.1*
 
 %files rmt
 %defattr(644,root,root,755)
-%attr(755,root,root) /sbin/*
+%attr(755,root,root) /sbin/rmt