mcepl pushed to xiphos (epel7). "Fixed duplication of gtk2 and 3 in same package"

[notifications at fedoraproject.org]

>From e1ffea7bb0aede857496be329dc47cdfef292835 Mon Sep 17 00:00:00 2001
From: Gregory Hellings <greg.hellings at gmail.com>
Date: Tue, 16 Dec 2014 22:42:28 -0600
Subject: Fixed duplication of gtk2 and 3 in same package


diff --git a/xiphos.spec b/xiphos.spec
index a2f477f..7c63a0e 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -7,7 +7,7 @@
 
 Name:           xiphos 
 Version:        3.2.3j
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Bible study and research tool
 License:        GPLv2+
 URL:            http://xiphos.org/
@@ -85,6 +85,11 @@ Project and elsewhere.
 %prep
 %setup -q
 rm -rf src/biblesync
+# Ugly hack because of bugs in this version of waf
+mkdir gtk2
+cp -r * gtk2 || true
+mkdir gtk3
+cp -r gtk2/* gtk3
 
 %build
 CFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1'
@@ -97,40 +102,46 @@ export CXXFLAGS
 export CFLAGS
 
 # Build GTK2 version
+pushd gtk2
 LDFLAGS='%{?__global_ldflags}'                              \
 ./waf configure	                     \
         --prefix=%{_prefix}          \
         --gtk=2                      \
-        -b build-gtk2           \
         --enable-webkit || cat build/config.log
 
-./waf build -v -b build-gtk2
+./waf build -v
+popd
 
 # Build GTK3 version
 %if 0%{build3} > 0
+pushd gtk3
 LDFLAGS='%{?__global_ldflags}'      \
 ./waf configure                     \
         --prefix=%{_prefix}         \
         --gtk=3                     \
-        -b build-gtk3          \
         --enable-webkit || cat build/config.log
 
-./waf build -v -b build-gtk3
+./waf build -v
+popd
 %endif
 
 %install
 # Install GTK2 version
-./waf install -b build-gtk2 --destdir %{buildroot}
+pushd gtk2
+./waf install -b . --destdir %{buildroot}
 mv %{buildroot}%{_bindir}/xiphos %{buildroot}%{_bindir}/xiphos-gtk2
 mv %{buildroot}%{_bindir}/xiphos-nav %{buildroot}%{_bindir}/xiphos-nav-gtk2
 touch %{buildroot}%{_bindir}/xiphos
+popd
 
 # Install GTK3 version
 %if 0%{build3} > 0
-./waf install -b build-gtk3 --destdir %{buildroot}
+pushd gtk3
+./waf install --destdir %{buildroot}
 mv %{buildroot}%{_bindir}/xiphos %{buildroot}%{_bindir}/xiphos-gtk3
 mv %{buildroot}%{_bindir}/xiphos-nav %{buildroot}%{_bindir}/xiphos-nav-gtk3
 touch %{buildroot}%{_bindir}/xiphos
+popd
 %endif
 
 desktop-file-install --delete-original         \
@@ -204,6 +215,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/appdata/xiphos.appdata.xml
 
 %changelog
+* Tue Dec 16 2014 Greg Hellings <greg.hellings at gmail.com> 3.2.3j-3
+- Added workaround for waf insufficiently isolating multi-build
+
 * Wed Dec 10 2014 Greg Hellings <greg.hellings at gmail.com> 3.2.3j-2
 - Obsoleted old Xiphos unary package
 
-- 
cgit v0.10.2


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