From ed4527b72856db1e11c2a341aa6e6597f6a9997a18b1d91f5b527d28427808a0 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 28 Aug 2019 12:55:32 +0000
Subject: [PATCH] Accepting request 726730 from home:Andreas_Schwab:Factory

- gnulib.patch: adjust to glibc 2.28 libio.h removal
- Use %license

OBS-URL: https://build.opensuse.org/request/show/726730
OBS-URL: https://build.opensuse.org/package/show/devel:tools/idutils?expand=0&rev=11
---
 gnulib.patch    | 28 ++++++++++++++++++++++++++++
 idutils.changes |  6 ++++++
 idutils.spec    | 11 +++++++----
 3 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 gnulib.patch

diff --git a/gnulib.patch b/gnulib.patch
new file mode 100644
index 0000000..0b104b3
--- /dev/null
+++ b/gnulib.patch
@@ -0,0 +1,28 @@
+Index: idutils-4.6/lib/fseeko.c
+===================================================================
+--- idutils-4.6.orig/lib/fseeko.c
++++ idutils-4.6/lib/fseeko.c
+@@ -40,7 +40,8 @@ fseeko (FILE *fp, off_t offset, int when
+ #endif
+ 
+   /* These tests are based on fpurge.c.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_read_end == fp->_IO_read_ptr
+       && fp->_IO_write_ptr == fp->_IO_write_base
+       && fp->_IO_save_base == NULL)
+Index: idutils-4.6/lib/fseterr.c
+===================================================================
+--- idutils-4.6.orig/lib/fseterr.c
++++ idutils-4.6/lib/fseterr.c
+@@ -29,7 +29,8 @@ fseterr (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+   fp->_flags |= _IO_ERR_SEEN;
+ #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+   fp_->_flags |= __SERR;
diff --git a/idutils.changes b/idutils.changes
index 0ce2534..542f8e6 100644
--- a/idutils.changes
+++ b/idutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 28 10:22:44 UTC 2019 - Andreas Schwab <schwab@suse.de>
+
+- gnulib.patch: adjust to glibc 2.28 libio.h removal
+- Use %license
+
 -------------------------------------------------------------------
 Thu Apr  2 17:51:04 UTC 2015 - mpluskal@suse.com
 
diff --git a/idutils.spec b/idutils.spec
index 59e2f74..52cc750 100644
--- a/idutils.spec
+++ b/idutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package idutils
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -20,12 +20,13 @@ Name:           idutils
 Version:        4.6
 Release:        0
 Summary:        Language-Independent Identifier Database Tool
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Text/Utilities
 Url:            http://www.gnu.org/software/idutils/
 Source0:        ftp://ftp.gnu.org/pub/gnu/idutils/idutils-%{version}.tar.xz
 Source1:        ftp://ftp.gnu.org/pub/gnu/idutils/idutils-%{version}.tar.xz.sig
 Source2:        %{name}.keyring
+Patch0:         gnulib.patch
 BuildRequires:  emacs-nox
 BuildRequires:  xz
 Requires(preun): %{install_info_prereq}
@@ -47,6 +48,7 @@ tags facility.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -76,7 +78,8 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc ABOUT-NLS AUTHORS COPYING NEWS README THANKS TODO
+%doc ABOUT-NLS AUTHORS NEWS README THANKS TODO
+%license COPYING
 %config %{_localstatedir}/lib/idutils/id-lang.map
 %dir %{_localstatedir}/lib/idutils
 %{_datadir}/id-lang.map