- updated to 3.3

- removed obsolete pl.po-update,stdio-gets patches

diff --git a/diffutils-pl.po-update.patch b/diffutils-pl.po-update.patch
deleted file mode 100644 (file)
index dba5798..0000000
--- a/diffutils-pl.po-update.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- diffutils-3.2/po/pl.po.orig        2011-09-02 17:19:13.000000000 +0200
-+++ diffutils-3.2/po/pl.po     2011-09-06 18:48:46.543523975 +0200
-@@ -1,17 +1,17 @@
- # Polish translations for the GNU diffutils messages
- # Copyright (C) 1996, 2002, 2004, 2009, 2010, 2011 Free Software Foundation, Inc.
- # This file is distributed under the same license as the diffutils package.
--# Rafał Maszkowski <rzm@icm.edu.pl>, 1996, 2002, 2004, 2009-2011 „
-+# Rafał Maszkowski <rzm@icm.edu.pl>„ 1996, 2002, 2004, 2009-2011
- # Contributions:
- # Paweł Krawczyk <kravietz@pipeta.chemia.pk.edu.pl>, 1996.
- # 23 corrections - Jakub Bogusz <qboosh@pld-linux.org>, 2004.
- #
- msgid ""
- msgstr ""
--"Project-Id-Version: GNU diffutils 3.1\n"
-+"Project-Id-Version: GNU diffutils 3.2\n"
- "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n"
- "POT-Creation-Date: 2011-09-02 17:19+0200\n"
--"PO-Revision-Date: 2011-08-13 23:15+0200\n"
-+"PO-Revision-Date: 2011-09-02 19:30+0200\n"
- "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
- "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
- "Language: pl\n"
-@@ -854,9 +854,9 @@
- "                                  rozwinięciem TAB-ów"
- 
- #: src/diff.c:889
--#, fuzzy
- msgid "-Z, --ignore-trailing-space     ignore white space at line end"
--msgstr "-W  --ignore-all-space       ignorowanie wszystkich znaków odstępu"
-+msgstr ""
-+"-Z  --ignore-trailing-space     ignorowanie znaków odstępu na końcu linii"
- 
- #: src/diff.c:890
- msgid ""
-@@ -1282,9 +1282,8 @@
- "                               TAB-ów"
- 
- #: src/sdiff.c:174
--#, fuzzy
- msgid "-Z, --ignore-trailing-space  ignore white space at line end"
--msgstr "-W  --ignore-all-space       ignorowanie wszystkich znaków odstępu"
-+msgstr "-Z  --ignore-trailing-space  ignorowanie znaków odstępu na końcu linii"
- 
- #: src/sdiff.c:175
- msgid ""

diff --git a/diffutils-stdio-gets.patch b/diffutils-stdio-gets.patch
deleted file mode 100644 (file)
index 8d7d5a3..0000000
--- a/diffutils-stdio-gets.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up diffutils-3.2/lib/stdio.in.h.stdio-gets diffutils-3.2/lib/stdio.in.h
---- diffutils-3.2/lib/stdio.in.h.stdio-gets    2012-07-23 17:29:22.311787651 +0100
-+++ diffutils-3.2/lib/stdio.in.h       2012-07-23 17:29:58.316908463 +0100
-@@ -681,26 +681,6 @@ _GL_WARN_ON_USE (getline, "getline is un
- # endif
- #endif
- 
--#if @GNULIB_GETS@
--# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
--#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--#   undef gets
--#   define gets rpl_gets
--#  endif
--_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
--_GL_CXXALIAS_RPL (gets, char *, (char *s));
--# else
--_GL_CXXALIAS_SYS (gets, char *, (char *s));
--#  undef gets
--# endif
--_GL_CXXALIASWARN (gets);
--/* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
--#endif
--
--
- #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
- struct obstack;
- /* Grow an obstack with formatted output.  Return the number of

diff --git a/diffutils.spec b/diffutils.spec
index 631611d9946de7de536adf21a0e175c1deaefcda..541907b9f9bb61fb4355179a6430fc61544168f2 100644 (file)
--- a/diffutils.spec
+++ b/diffutils.spec
@@ -4,17 +4,15 @@ Summary(fr.UTF-8):    Utilitaires diff de GNU
 Summary(pl.UTF-8):     Narzędzia diff GNU
 Summary(tr.UTF-8):     GNU dosya karşılaştırma araçları
 Name:          diffutils
-Version:       3.2
-Release:       2
+Version:       3.3
+Release:       1
 License:       GPL v3+
 Group:         Applications/Text
 Source0:       http://ftp.gnu.org/gnu/diffutils/%{name}-%{version}.tar.xz
-# Source0-md5: 26ff64c332429c830c154be46b393382
+# Source0-md5: 99180208ec2a82ce71f55b0d7389f1b3
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 34a7ab56f975ff7e439ea13923ec8ae4
 Patch0:                %{name}-info.patch
-Patch1:                %{name}-pl.po-update.patch
-Patch2:                %{name}-stdio-gets.patch
 URL:           http://www.gnu.org/software/diffutils/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.11
@@ -62,8 +60,6 @@ plików.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__aclocal} -I m4