[xiphos] SPEC cleanup Build against GTK3 as GNOME3 is the default for a long time.

[Christopher Meng]

commit a99ffe9cfc1e9f40e6f52dec7960d028e1028319
Author: Christopher Meng <i at cicku.me>
Date:   Tue Aug 5 15:51:57 2014 +0800

    SPEC cleanup
    Build against GTK3 as GNOME3 is the default for a long time.

 xiphos.spec |   75 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 42 insertions(+), 33 deletions(-)
---
diff --git a/xiphos.spec b/xiphos.spec
index aefe831..d9170bd 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -1,27 +1,30 @@
 Name:		xiphos 
 Version:	3.2.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Bible study and research tool
-
-Group:		Applications/Text
 License:	GPLv2+
 URL:		http://xiphos.org/
 Source0:	http://downloads.sourceforge.net/gnomesword/xiphos-%{version}.tar.gz
-Patch0:     format-warning.patch
-BuildRequires:	sword-devel >= 1.7.3
-BuildRequires:	gettext
+Patch0:         format-warning.patch
+BuildRequires:  biblesync-devel
 BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRequires:	gnome-doc-utils
-BuildRequires:	gtkhtml3-devel GConf2-devel
-BuildRequires:	webkitgtk-devel
+BuildRequires:	gtkhtml3-devel
+BuildRequires:	GConf2-devel
+BuildRequires:	intltool
 BuildRequires:	libgsf-devel
 BuildRequires:	dbus-glib-devel
+BuildRequires:	docbook-utils
+# Needed on GTK+2 builds
+# However it shouldn't be listed as default BR.
+# BuildRequires:  libglade2-devel
 BuildRequires:  libuuid-devel
 #BuildRequires:	ImageMagick-c++-devel
-BuildRequires:	perl(XML::Parser) intltool
+#BuildRequires:	perl(XML::Parser)
 BuildRequires:	rarian-compat
-# Needed on GTK+2 builds
-BuildRequires:  libglade2-devel
+BuildRequires:	sword-devel >= 1.7.3
+BuildRequires:	webkitgtk-devel
 Requires:	yelp
 Obsoletes:	gnomesword < 2.4.2
 Provides:	gnomesword = %{version}-%{release}
@@ -34,28 +37,31 @@ Project and elsewhere.
 
 %prep
 %setup -q
-
 %patch0 -p1
 
 %build
-CFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' CXXFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' ./waf configure	\
-	--prefix %{_prefix} --enable-webkit \
-    --gtk=2
- 
+CFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1'   \
+CXXFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' \
+LDFLAGS='%{?__global_ldflags}'                              \
+./waf configure	\
+        --prefix=%{_prefix} \
+        --enable-webkit \
+        --gtk=3
+
 ./waf build -v
 
 %install
 ./waf install --destdir %{buildroot}
 
-desktop-file-install --delete-original \
-	--add-category=X-Bible		\
-	--add-category=X-Religion	\
-	--dir=%buildroot%_datadir/applications \
-	--copy-name-to-generic-name \
-	%buildroot%_datadir/applications/xiphos.desktop
+desktop-file-install --delete-original             \
+	--add-category=X-Bible                     \
+	--add-category=X-Religion                  \
+	--dir=%{buildroot}%{_datadir}/applications \
+	--copy-name-to-generic-name                \
+	%{buildroot}%{_datadir}/applications/xiphos.desktop
 
 # package docs with macro
-rm -rf %buildroot%_datadir/doc/%{name}
+rm -frv %{buildroot}%{_docdir}/%{name}
 
 %find_lang %{name}
 
@@ -73,15 +79,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
 %doc AUTHORS COPYING ChangeLog README RELEASE-NOTES TODO Xiphos.ogg
-%_bindir/xiphos
-%_bindir/xiphos-nav
-%_datadir/xiphos/
-%_datadir/icons/hicolor/scalable/apps/xiphos.svg
-%_datadir/omf/xiphos/
-%_datadir/applications/xiphos.desktop
-%_datadir/gnome/help/xiphos
+%{_bindir}/xiphos
+%{_bindir}/xiphos-nav
+%{_datadir}/applications/xiphos.desktop
+%{_datadir}/gnome/help/xiphos
+%{_datadir}/icons/hicolor/scalable/apps/xiphos.svg
+%{_datadir}/omf/xiphos/
+%{_datadir}/xiphos/
 
 %changelog
+* Sat Aug 02 2014 Christopher Meng <rpm at cicku.me> - 3.2.1-2
+- Build against GTK+3
+
 * Tue Jun 10 2014 Greg Hellings <greg.hellings at gmail.com> - 3.2.1-1
 - New upstream release
 
@@ -145,7 +154,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Mon Mar 15 2010 Deji Akingunola <dakingun at gmail.com> - 3.1.2-4
 - Backport upstream patch to fix bugs detected by ABRT caused by empty settings.xml file.
 
-* Sat Mar 13 2010 Deji Akingunola <dakingun at gmail.com> - 3.1.2-3
+* Sun Mar 13 2010 Deji Akingunola <dakingun at gmail.com> - 3.1.2-3
 - Backport upstream patch to fix bug with xulrunner-1.9.2.
 
 * Sat Mar 07 2010 Deji Akingunola <dakingun at gmail.com> - 3.1.2-2
@@ -160,7 +169,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Sun May 18 2009 Deji Akingunola <dakingun at gmail.com> - 3.1-1
+* Mon May 18 2009 Deji Akingunola <dakingun at gmail.com> - 3.1-1
 - Update to the 3.1 release
 
 * Tue Mar 10 2009 Deji Akingunola <dakingun at gmail.com> - 3.0.1-2
@@ -179,7 +188,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Sun Sep 21 2008 Deji Akingunola <dakingun at gmail.com> - 2.4.0-1
 - Update to 2.4.0
 
-* Sun Aug 02 2008 Deji Akingunola <dakingun at gmail.com> - 2.3.6-2
+* Sat Aug 02 2008 Deji Akingunola <dakingun at gmail.com> - 2.3.6-2
 - Package the 'RELEASE-NOTES'
 
 * Sat Aug 02 2008 Deji Akingunola <dakingun at gmail.com> - 2.3.6-1