[rest/f21: 7/7] fix merge

[Peter Robinson]

commit abf799b22044e5849e351f0241edb57847d50c6f
Merge: 530fdf3 1684293
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Mar 20 17:39:06 2015 +0000

    fix merge

 rest.spec | 22 ++++++++++++----------
 sources   |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)
---
diff --cc rest.spec
index da3bab7,4c4dddc..2ffb411
--- a/rest.spec
+++ b/rest.spec
@@@ -6,11 -6,8 +6,11 @@@ Summary:       A library for access to 
  Group:         System Environment/Libraries
  License:       LGPLv2
  URL:           http://www.gnome.org
- Source0:       ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.7/%{name}-%{version}.tar.xz
+ Source0:       http://download.gnome.org/sources/%{name}/0.7/%{name}-%{version}.tar.xz
  
 +# https://bugzilla.gnome.org/show_bug.cgi?id=742644
 +Patch0:        0001-oauth-Add-missing-include.patch
 +
  BuildRequires: glib2-devel
  BuildRequires: gobject-introspection-devel
  BuildRequires: libsoup-devel
@@@ -40,10 -33,8 +36,9 @@@ Files for development with %{name}
  
  %prep
  %setup -q
 +%patch0 -p1
  
  %build
- autoreconf -vif
  %configure --disable-static --enable-gtk-doc --enable-introspection=yes
  
  make %{?_smp_mflags} V=1