pool/idutils
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 726730 from home:Andreas_Schwab:Factory

Browse Source 
- 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
This commit is contained in:
Dirk Mueller 2019-08-28 12:55:32 +00:00 committed by Git OBS Bridge
parent 8114235a70
commit ed4527b728
3 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gnulib.patch Normal file
View File

@ -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;

6
idutils.changes
View File

@ -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

11
idutils.spec
View File

@ -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