[gigolo] Update to 0.4.2

[Christoph Wickert]

commit b5f6035cbab022b5941c602013da3ac57df5643f
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Fri Jan 10 14:25:01 2014 +0100

    Update to 0.4.2
    
    - Drop included upstream patches

 .gitignore                          |    1 +
 gigolo-0.4.1-fix-crash-748228.patch |   24 --
 gigolo-0.4.1-update-de.po.patch     |  305 ------------------------
 gigolo-0.4.1.wafupdate.patch        |  438 -----------------------------------
 gigolo.spec                         |   55 ++---
 sources                             |    2 +-
 6 files changed, 20 insertions(+), 805 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 275c5b3..14ad80b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 gigolo-0.4.0.tar.bz2
 gigolo-0.4.1.tar.bz2
+/gigolo-0.4.2.tar.bz2
diff --git a/gigolo.spec b/gigolo.spec
index f5f6acc..48c00db 100644
--- a/gigolo.spec
+++ b/gigolo.spec
@@ -1,19 +1,12 @@
 Name:           gigolo
-Version:        0.4.1
-Release:        11%{?dist}
+Version:        0.4.2
+Release:        1%{?dist}
 Summary:        GIO/GVFS management application
 
 Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://goodies.xfce.org/projects/applications/gigolo/
 Source0:        http://archive.xfce.org/src/apps/%{name}/0.4/%{name}-%{version}.tar.bz2
-# http://git.xfce.org/apps/gigolo/commit/?id=95a37d4c
-Patch0:         gigolo-0.4.1-update-de.po.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=748228
-# patch from http://git.xfce.org/apps/gigolo/commit/?id=0e53ec5c
-Patch1:         gigolo-0.4.1-fix-crash-748228.patch
-# Update wscript to handle waf 1.6 (already upstream)
-Patch2:         gigolo-0.4.1.wafupdate.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python
@@ -21,8 +14,6 @@ BuildRequires:  gettext
 BuildRequires:  intltool
 BuildRequires:  gtk2-devel
 BuildRequires:  desktop-file-utils
-# Currently using bundled waf to build. 
-#BuildRequires:  waf
 
 Requires:       gvfs-fuse
 
@@ -35,51 +26,41 @@ bookmarks of such.
 
 %prep
 %setup -q
-%patch0 -p1 -b .updat
-%patch1 -p1 -b .fix
-# use bundled waf for now.
-#patch2 -p1 -b .wafupdate
+
 
 %build
 #rm -f waf
-export CFLAGS="%{optflags}"
-./waf configure --prefix=%{_prefix} \
-              --exec-prefix=%{_exec_prefix} \
-              --bindir=%{_bindir} \
-              --sbindir=%{_sbindir} \
-              --sysconfdir=%{_sysconfdir} \
-              --datadir=%{_datadir} \
-              --includedir=%{_includedir} \
-              --libdir=%{_libdir} \
-              --libexecdir=%{_libexecdir} \
-              --localstatedir=%{_localstatedir} \
-              --sharedstatedir=%{_sharedstatedir} \
-              --mandir=%{_mandir} --infodir=%{_infodir} --enable-debug
-
-./waf build -v
+%configure
+make %{?_smp_mflags} V=1
+
 
 %install
-rm -rf $RPM_BUILD_ROOT
-DESTDIR=$RPM_BUILD_ROOT ./waf install 
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="install -p"
+%find_lang %{name}
 
-# remove docs that waf installs in the wrong place
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/gigolo
+# remove duplicate docs
+rm -rf %{buildroot}/%{_datadir}/doc/gigolo
 
-desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README README.I18N TODO THANKS
+%doc AUTHORS ChangeLog COPYING NEWS README TODO THANKS
 %{_bindir}/gigolo
 %{_datadir}/applications/gigolo.desktop
 %{_mandir}/man1/gigolo.1.gz
 
 %changelog
+* Thu Jan 09 2014 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
+- Update to 0.4.2
+- Drop included upstream patches
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index d2f31f3..56dc4ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-760bdc5753768214b379733a728b0c80  gigolo-0.4.1.tar.bz2
+4abc6fde56572adf3ec3a0181092584c  gigolo-0.4.2.tar.bz2