[xiphos/el6: 6/9] Conditional lines.

Christopher Meng cicku at fedoraproject.org
Tue Aug 5 09:28:41 UTC 2014


commit 77d99c66ba697c1c58479fd570b48dd1fbaba63d
Author: Christopher Meng <i at cicku.me>
Date:   Tue Aug 5 17:23:14 2014 +0800

    Conditional lines.

 xiphos.spec |   70 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 40 insertions(+), 30 deletions(-)
---
diff --git a/xiphos.spec b/xiphos.spec
index 587dda9..5598515 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -1,32 +1,38 @@
-Name:		xiphos 
-Version:	3.2.1
-Release:	2%{?dist}
-Summary:	Bible study and research tool
-License:	GPLv2+
-URL:		http://xiphos.org/
-Source0:	http://downloads.sourceforge.net/gnomesword/xiphos-%{version}.tar.gz
+Name:           xiphos 
+Version:        3.2.1
+Release:        2%{?dist}
+Summary:        Bible study and research tool
+License:        GPLv2+
+URL:            http://xiphos.org/
+Source0:        http://downloads.sourceforge.net/gnomesword/xiphos-%{version}.tar.gz
 Patch0:         format-warning.patch
 BuildRequires:  biblesync-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	dbus-glib-devel
-BuildRequires:	docbook-utils
-BuildRequires:	GConf2-devel
-BuildRequires:	gettext
-BuildRequires:	gnome-doc-utils
-BuildRequires:	gtk3-devel
-BuildRequires:	gtkhtml3-devel
-BuildRequires:	intltool
-#BuildRequires:  libglade2-devel
-BuildRequires:	libgsf-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  dbus-glib-devel
+BuildRequires:  docbook-utils
+BuildRequires:  GConf2-devel
+BuildRequires:  gettext
+BuildRequires:  gnome-doc-utils
+%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
+BuildRequires:  libglade2-devel
+%else
+BuildRequires:  gtk3-devel
+%endif
+BuildRequires:  gtkhtml3-devel
+BuildRequires:  intltool
+BuildRequires:  libgsf-devel
 BuildRequires:  libuuid-devel
-#BuildRequires:	ImageMagick-c++-devel
 #BuildRequires:	perl(XML::Parser)
-BuildRequires:	rarian-compat
-BuildRequires:	sword-devel >= 1.7.3
-BuildRequires:	webkitgtk3-devel
-Requires:	yelp
-Obsoletes:	gnomesword < 2.4.2-1
-Provides:	gnomesword = %{version}-%{release}
+BuildRequires:  rarian-compat
+BuildRequires:  sword-devel >= 1.7.3
+%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
+BuildRequires:  webkitgtk-devel
+%else
+BuildRequires:  webkitgtk3-devel
+%endif
+Requires:       yelp
+Obsoletes:      gnomesword < 2.4.2-1
+Provides:       gnomesword = %{version}-%{release}
 
 %description
 Xiphos (formerly known as GnomeSword) is a Bible study tool written for Linux,
@@ -42,17 +48,21 @@ Project and elsewhere.
 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 || cat build/config.log
+./waf configure	                     \
+        --prefix=%{_prefix}          \
+%if 0%{?rhel} > 0 && 0%{?rhel} <= 7
+        --gtk=2                      \
+%else
+        --gtk=3                      \
+%endif
+        --enable-webkit || cat build/config.log
 
 ./waf build -v
 
 %install
 ./waf install --destdir %{buildroot}
 
-desktop-file-install --delete-original             \
+desktop-file-install --delete-original         \
 	--add-category=X-Bible                     \
 	--add-category=X-Religion                  \
 	--dir=%{buildroot}%{_datadir}/applications \


More information about the scm-commits mailing list