[gigolo] Switch to bundled waf for now, doesn't work with waf-1.6.11

[Kevin Fenzi]

commit a4047b74b5492188c84aa0e8eaa4f78eb55fbb67
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Thu Jul 5 09:07:38 2012 -0600

    Switch to bundled waf for now, doesn't work with waf-1.6.11

 gigolo.spec |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/gigolo.spec b/gigolo.spec
index 5259df6..47690e8 100644
--- a/gigolo.spec
+++ b/gigolo.spec
@@ -1,6 +1,6 @@
 Name:           gigolo
 Version:        0.4.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        GIO/GVFS management application
 
 Group:          User Interface/Desktops
@@ -21,7 +21,8 @@ BuildRequires:  gettext
 BuildRequires:  intltool
 BuildRequires:  gtk2-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  waf
+# Currently using bundled waf to build. 
+#BuildRequires:  waf
 
 Requires:       gvfs-fuse
 
@@ -36,12 +37,13 @@ bookmarks of such.
 %setup -q
 %patch0 -p1 -b .updat
 %patch1 -p1 -b .fix
-%patch2 -p1 -b .wafupdate
+# use bundled waf for now.
+#patch2 -p1 -b .wafupdate
 
 %build
-rm -f waf
+#rm -f waf
 export CFLAGS="%{optflags}"
-waf configure --prefix=%{_prefix} \
+./waf configure --prefix=%{_prefix} \
               --exec-prefix=%{_exec_prefix} \
               --bindir=%{_bindir} \
               --sbindir=%{_sbindir} \
@@ -54,11 +56,11 @@ waf configure --prefix=%{_prefix} \
               --sharedstatedir=%{_sharedstatedir} \
               --mandir=%{_mandir} --infodir=%{_infodir} --enable-debug
 
-waf build -v
+./waf build -v
 
 %install
 rm -rf $RPM_BUILD_ROOT
-DESTDIR=$RPM_BUILD_ROOT waf install 
+DESTDIR=$RPM_BUILD_ROOT ./waf install 
 
 # remove docs that waf installs in the wrong place
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/gigolo
@@ -78,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/gigolo.1.gz
 
 %changelog
+* Thu Jul 05 2012 Kevin Fenzi <kevin at scrye.com> 0.4.1-8
+- Switch to bundled waf for now, doesn't work with waf-1.6.11
+
 * Thu Jun 21 2012 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-7
 - Require gvfs-fuse, fuse and gvfs are not enough (#834261)