[packages/libiconv] - up to 1.15 - removed obsolete pl.po-update,gets-undefined-in-C11 patches

Sat Feb 4 23:26:28 CET 2017

commit 06fbe89bd6068d9d15d2e41eac8b3279bcb9a3b5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Feb 4 23:28:05 2017 +0100

    - up to 1.15
    - removed obsolete pl.po-update,gets-undefined-in-C11 patches

 gets-undefined-in-C11.patch | 28 ----------------------------
 libiconv-pl.po-update.patch | 43 -------------------------------------------
 libiconv.spec               | 19 +++++++++----------
 3 files changed, 9 insertions(+), 81 deletions(-)
---

diff --git a/libiconv.spec b/libiconv.spec
index 333081c..a005110 100644
--- a/libiconv.spec
+++ b/libiconv.spec
@@ -1,14 +1,13 @@
+# NOTE: don't send this (glibc based) build to builders
 Summary:	Character set conversion library
 Summary(pl.UTF-8):	Biblioteka konwersji zestawów znaków
 Name:		libiconv
-Version:	1.14
-Release:	1
+Version:	1.15
+Release:	0.1
 License:	LGPL v3+
 Group:		Libraries
 Source0:	http://ftp.gnu.org/gnu/libiconv/%{name}-%{version}.tar.gz
-# Source0-md5:	e34509b1623cec449dfeb73d7ce9c6c6
-Patch0:		%{name}-pl.po-update.patch
-Patch1:		gets-undefined-in-C11.patch
+# Source0-md5:	ace8b5f2db42f7b3b3057585e80d9808
 URL:		http://www.gnu.org/software/libiconv/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -70,16 +69,14 @@ Narzędzie iconv.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %{__rm} po/stamp-po
 
 # struggling to get it regenerated, but i fail, these still remain:
 #-rw-r--r-- 1 glen users 281073 24. sept   2010 ./libcharset/m4/libtool.m4
 #-rw-r--r-- 1 glen users 281073 24. sept   2010 ./m4/libtool.m4
-rm libcharset/m4/{libtool,lt*}.m4
-rm m4/{libtool,lt*}.m4
+%{__rm} libcharset/m4/{libtool,lt*}.m4
+%{__rm} m4/{libtool,lt*}.m4
 
 %build
 cp -f /usr/share/automake/config.sub build-aux
@@ -107,6 +104,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/*.html
+
 %find_lang %{name}
 
 %clean
@@ -117,7 +116,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog DESIGN NEWS NOTES PORTS README THANKS
+%doc AUTHORS ChangeLog DESIGN NEWS NOTES README THANKS
 %attr(755,root,root) %{_libdir}/libcharset.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libcharset.so.1
 %attr(755,root,root) %{_libdir}/libiconv.so.*.*.*
diff --git a/gets-undefined-in-C11.patch b/gets-undefined-in-C11.patch
deleted file mode 100644
index a1e127a..0000000
--- a/gets-undefined-in-C11.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- libiconv-1.14.orig/srclib/stdio.in.h	2011-08-07 13:42:06.000000000 +0000
-+++ libiconv-1.14/srclib/stdio.in.h	2013-01-09 19:56:21.115819812 +0000
-@@ -680,22 +680,7 @@
- #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");
-+#undef gets
- #endif
- 
- 
-
-Diff finished.  Wed Jan  9 19:56:44 2013
diff --git a/libiconv-pl.po-update.patch b/libiconv-pl.po-update.patch
deleted file mode 100644
index 239b4af..0000000
--- a/libiconv-pl.po-update.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- libiconv-1.14/po/pl.po.orig	2011-08-07 19:48:03.000000000 +0200
-+++ libiconv-1.14/po/pl.po	2011-08-10 17:05:59.956544169 +0200
-@@ -1,15 +1,15 @@
- # Polish translation for libiconv.
--# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
-+# Copyright (C) 2003, 2006, 2011 Free Software Foundation, Inc.
- # This file is distributed under the same license as the libiconv package.
- # Arkadiusz Lipiec <alipiec at elka.pw.edu.pl>, 2003.
--# Jakub Bogusz <qboosh at pld-linux.org>, 2006-2007.
-+# Jakub Bogusz <qboosh at pld-linux.org>, 2006-2011.
- #
- msgid ""
- msgstr ""
--"Project-Id-Version: libiconv 1.12\n"
-+"Project-Id-Version: libiconv 1.14\n"
- "Report-Msgid-Bugs-To: bug-gnu-libiconv at gnu.org\n"
- "POT-Creation-Date: 2011-08-07 15:24+0200\n"
--"PO-Revision-Date: 2007-12-26 23:20+0100\n"
-+"PO-Revision-Date: 2011-08-10 17: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"
-@@ -151,17 +151,16 @@
- msgstr "B��dy prosz� zg�asza� na adres <bug-gnu-libiconv at gnu.org>.\n"
- 
- #: src/iconv.c:196
--#, fuzzy, no-wrap
-+#, no-wrap
- msgid ""
- "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
- "This is free software: you are free to change and redistribute it.\n"
- "There is NO WARRANTY, to the extent permitted by law.\n"
- msgstr ""
--"Licencja GPLv2+: GNU GPL wersja 2 lub p�niejsza <http://gnu.org/licenses/gpl.html>\n"
--"To jest oprogramowanie wolnodost�pne: mo�na je modyfikowa� i rozpowszechnia�.\n"
-+"Licencja GPLv3+: GNU GPL wersja 3 lub p�niejsza <http://gnu.org/licenses/gpl.html>\n"
-+"To oprogramowanie jest wolnodost�pne: mo�na je modyfikowa� i rozpowszechnia�.\n"
- "Nie ma �ADNEJ GWARANCJI w zakresie dopuszczalnym przez prawo.\n"
- 
--# s TRANSLATORS: The %s placeholder expands to an author's name.
- #. TRANSLATORS: The %s placeholder expands to an author's name.
- #: src/iconv.c:202
- #, c-format
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libiconv.git/commitdiff/06fbe89bd6068d9d15d2e41eac8b3279bcb9a3b5

