commit 870dcc6a3db0052b97e6c159b0767f9c7cb1c2a0
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sun Oct 21 17:03:25 2018 +0200
- fix building with glibc 2.28+
- rel 4
glibc.patch | 11 +++++++++++
pspp.spec | 6 ++++--
2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/pspp.spec b/pspp.spec
index 9af5ce4..47cc50b 100644
--- a/pspp.spec
+++ b/pspp.spec
@@ -1,6 +1,6 @@
#
# Conditional build:
-%bcond_without glade # Glade extensions for PSPP development
+%bcond_without glade # Glade extensions for PSPP development
%bcond_without perl # Perl module
%include /usr/lib/rpm/macros.perl
@@ -8,7 +8,7 @@ Summary: GNU PSPP - program for statistical analysis of
sampled data
Summary(pl.UTF-8): GNU PSPP - program do analizy statystycznej danych
próbkowanych
Name: pspp
Version: 1.0.1
-Release: 3
+Release: 4
License: GPL v3+
Group: Applications/Science
Source0: http://ftp.gnu.org/gnu/pspp/%{name}-%{version}.tar.gz
@@ -16,6 +16,7 @@ Source0:
http://ftp.gnu.org/gnu/pspp/%{name}-%{version}.tar.gz
Patch0: %{name}-info.patch
Patch1: %{name}-perl.patch
Patch2: %{name}-glade.patch
+Patch3: glibc.patch
URL: http://www.gnu.org/software/pspp/
BuildRequires: autoconf >= 2.63
BuildRequires: automake
@@ -100,6 +101,7 @@ Rozszerzenia Glade do rozwijania PSPP.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
diff --git a/glibc.patch b/glibc.patch
new file mode 100644
index 0000000..21c2b09
--- /dev/null
+++ b/glibc.patch
@@ -0,0 +1,11 @@
+--- pspp-1.0.1/gl/fseterr.c~ 2017-07-16 00:06:38.000000000 +0200
++++ pspp-1.0.1/gl/fseterr.c 2018-10-21 17:00:26.932630785 +0200
+@@ -29,7 +29,7 @@
+ /* 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 || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+ fp->_flags |= _IO_ERR_SEEN;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android
*/
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pspp.git/commitdiff/870dcc6a3db0052b97e6c159b0767f9c7cb1c2a0
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
