mcepl pushed to xiphos (epel7). "Added gtkhtml compat (..more)"

[notifications at fedoraproject.org]

>From ed6078c383cc4bb169450ffad4e77f1824b06464 Mon Sep 17 00:00:00 2001
From: Gregory Hellings <greg.hellings at gmail.com>
Date: Fri, 16 Jan 2015 14:24:06 -0600
Subject: Added gtkhtml compat

WebKit based editor has breakages in non-English,
so reverting to build against GTKHtml only

diff --git a/xiphos.spec b/xiphos.spec
index af5ef62..2a60104 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -7,7 +7,7 @@
 
 Name:           xiphos 
 Version:        4.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Bible study and research tool
 License:        GPLv2+
 URL:            http://xiphos.org/
@@ -21,6 +21,7 @@ BuildRequires:  gettext
 BuildRequires:  gnome-doc-utils
 BuildRequires:  libglade2-devel
 BuildRequires:  gtkhtml3-devel
+BuildRequires:  compat-gtkhtml314-devel
 BuildRequires:  intltool
 BuildRequires:  libgsf-devel
 BuildRequires:  libuuid-devel
@@ -102,8 +103,7 @@ pushd gtk2
 LDFLAGS='%{?__global_ldflags}'                              \
 ./waf configure	                     \
         --prefix=%{_prefix}          \
-        --gtk=2                      \
-        --enable-webkit || cat build/config.log
+        --gtk=2 || cat build/config.log
 
 ./waf build -v
 popd
@@ -114,8 +114,7 @@ pushd gtk3
 LDFLAGS='%{?__global_ldflags}'      \
 ./waf configure                     \
         --prefix=%{_prefix}         \
-        --gtk=3                     \
-        --enable-webkit || cat build/config.log
+        --gtk=3 || cat build/config.log
 
 ./waf build -v
 popd
@@ -211,6 +210,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/appdata/xiphos.appdata.xml
 
 %changelog
+* Fri Jan 16 2015 Greg Hellings <greg.hellings at gmail.com> 4.0.0-4
+- Added GTK compat so that we can link against GTK2 all the way
+
 * Wed Dec 24 2014 Greg Hellings <greg.hellings at gmail.com> 4.0.0-3
 - New upstream tarball (same version)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xiphos.git/commit/?h=epel7&id=ed6078c383cc4bb169450ffad4e77f1824b06464