[nntpgrab] Fix FTBFS against PHP 5.6
Erik van Pienbroek
epienbro at fedoraproject.org
Tue Jul 22 18:50:39 UTC 2014
commit f23740048568ad6c990994bbd638ba9aea1d320c
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Tue Jul 22 20:50:29 2014 +0200
Fix FTBFS against PHP 5.6
nntpgrab-fix-ftbfs-against-php56.patch | 15 +++++++++++++++
nntpgrab.spec | 10 +++++++++-
2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/nntpgrab-fix-ftbfs-against-php56.patch b/nntpgrab-fix-ftbfs-against-php56.patch
new file mode 100644
index 0000000..5b0d3ab
--- /dev/null
+++ b/nntpgrab-fix-ftbfs-against-php56.patch
@@ -0,0 +1,15 @@
+Index: client/web/module/nntpgrab.c
+===================================================================
+--- client/web/module/nntpgrab.c (revision 1961)
++++ client/web/module/nntpgrab.c (working copy)
+@@ -308,6 +308,10 @@
+ add_assoc_bool(return_value, "enabled", config.enabled);
+ }
+
++#ifndef IS_CONSTANT_ARRAY
++#define IS_CONSTANT_ARRAY IS_CONSTANT_AST
++#endif
++
+ #define INVALID_DATA_TYPE(field, given_type, expected_type) \
+ { \
+ char *msg; \
diff --git a/nntpgrab.spec b/nntpgrab.spec
index 27224b4..484d5ae 100644
--- a/nntpgrab.spec
+++ b/nntpgrab.spec
@@ -1,7 +1,7 @@
Summary: Download files from the usenet
Name: nntpgrab
Version: 0.7.2
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2+
Group: Applications/Internet
Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2
@@ -42,6 +42,10 @@ BuildRequires: libglade2-devel
BuildRequires: qtsingleapplication-devel
%endif
+# Fix FTBFS against PHP 5.6
+Patch0: nntpgrab-fix-ftbfs-against-php56.patch
+
+
%description
With this program it is possible to download files from the usenet
@@ -153,6 +157,7 @@ embedded webinterface which doesn't require this package to be installed
%prep
%setup -q
+%patch0 -p0
%build
@@ -357,6 +362,9 @@ install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/php.d/nntpgrab.ini
%changelog
+* Tue Jul 22 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.7.2-8
+- Fix FTBFS against PHP 5.6
+
* Tue Jul 22 2014 Kalev Lember <kalevlember at gmail.com> - 0.7.2-7
- Rebuilt for gobject-introspection 1.41.4
More information about the scm-commits
mailing list