rpms
/
abiword
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix parallel build (thanks yselkowi) rhbz 1214395

This commit is contained in:
Peter Robinson 2016-04-10 20:32:49 +01:00
parent c0d6dffbd1
commit 4d3e79383d
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
abiword-3.0.1-parallel-make.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/src/Makefile.am 2013-02-19 18:39:42.000000000 -0600
+++ b/src/Makefile.am 2015-04-21 21:36:37.504001500 -0500
@@ -168,7 +168,7 @@ if HAVE_INTROSPECTION
INTROSPECTION_GIRS += Abi-@ABIWORD_SERIES@.gir
-Abi_@ABIWORD_SERIES@.gir: $(INTROSPECTION_SCANNER) libabiword-@ABIWORD_SERIES@.la Makefile
+Abi-@ABIWORD_SERIES@.gir: $(INTROSPECTION_SCANNER) libabiword-@ABIWORD_SERIES@.la Makefile
Abi_@ABI_SUB_SERIES@_gir_INCLUDES = GObject-2.0 Gtk-3.0 Gsf-1
Abi_@ABI_SUB_SERIES@_gir_CFLAGS = $(libabiword_@ABIWORD_SERIES@_la_CPPFLAGS)
Abi_@ABI_SUB_SERIES@_gir_LIBS = libabiword-@ABIWORD_SERIES@.la

12
abiword.spec
View File

@ -6,7 +6,7 @@
Summary: Word processing program
Name: abiword
Version: %{majorversion}.%{minorversion}.%{microversion}
Release: 10%{?dist}
Release: 11%{?dist}
Epoch: 1
Group: Applications/Editors
License: GPLv2+
@ -28,6 +28,7 @@ Patch7: abiword-3.0.1-libwps-0.4.patch
Patch8: abiword-3.0.1-gnutls.patch
Patch9: abiword-3.0.1-gcc6.patch
Patch10: abiword-3.0.1-fixwps.patch
Patch11: abiword-3.0.1-parallel-make.patch
BuildRequires: autoconf
BuildRequires: automake
@ -121,6 +122,7 @@ Python bindings for developing with libabiword
%patch8 -p0 -b .gnutls
%patch9 -p0 -b .gcc6
%patch10 -p1 -b .wps2
%patch11 -p1 -b .pb
# setup abiword documentation
%setup -q -T -b 1 -n abiword-docs-%{version}
@ -133,9 +135,8 @@ cd $RPM_BUILD_DIR/abiword-%{version}
autoreconf -vif
%configure --enable-plugins --enable-clipart --enable-templates --enable-introspection
# Build non SMP due to issues with gobject-introspection builds
# make %{?_smp_mflags} V=1
make V=1
make %{?_smp_mflags} V=1
# build the documentation
cd $RPM_BUILD_DIR/abiword-docs-%{version}
@ -257,6 +258,9 @@ fi
%{python_sitearch}/*
%changelog
* Sun Apr 10 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.1-11
- fix parallel build (thanks yselkowi) rhbz 1214395
* Sun Apr 10 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.1-10
- Add patches to fix building with newer gnutls and gcc6
- Add patch to fix Wordperfect support