[libimobiledevice: 2/2] fix merge

[Peter Robinson]

commit 7df2850aa1df920d7e0528aae131354752e87a78
Merge: 2ad44ec 632f83f
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon May 5 14:13:36 2014 +0100

    fix merge

 libimobiledevice.spec |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)
---
diff --cc libimobiledevice.spec
index 266b332,271f328..20158ba
--- a/libimobiledevice.spec
+++ b/libimobiledevice.spec
@@@ -1,8 -1,13 +1,13 @@@
  %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
  
+ # python/Cython support busted on rawhide atm
+ %if 0%{?fedora} < 21
+ %global python 1
+ %endif
+ 
  Name:          libimobiledevice
 -Version:       1.1.5
 -Release:       5%{?dist}
 +Version:       1.1.6
 +Release:       1%{?dist}
  Summary:       Library for connecting to mobile devices
  
  Group:         System Environment/Libraries
@@@ -15,14 -19,15 +19,18 @@@ BuildRequires: glib2-deve
  BuildRequires: gnutls-devel
  BuildRequires: libgcrypt-devel
  BuildRequires: libplist-devel
 +BuildRequires: libplist-python
  BuildRequires: libtasn1-devel
 +BuildRequires: libusbmuxd-devel
  BuildRequires: libusbx-devel
  BuildRequires: libxml2-devel
+ BuildRequires: readline-devel
+ BuildRequires: usbmuxd-devel
+ %if 0%{?python}
  BuildRequires: python-devel
 +BuildRequires: python-setuptools
- BuildRequires: readline-devel
+ BuildRequires: Cython
+ %endif
  BuildRequires: swig
  
  %description
@@@ -91,13 -86,15 +99,20 @@@ find %{buildroot} -name '*.la' -exec r
  %{_libdir}/libimobiledevice.so
  %{_includedir}/libimobiledevice/
  
+ %if 0%{?python}
  %files python
 +#{python_sitearch}/imobiledevice*
++%else
+ %{python_sitearch}/imobiledevice*
+ %endif
  
  %changelog
 +* Mon May  5 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.1.6-1
 +- New 1.1.6 release
 +
+ * Thu Apr 24 2014 Rex Dieter <rdieter at fedoraproject.org> 1.1.5-5
+ - disable broken -python on rawhide
+ 
  * Wed Apr 23 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.1.5-4
  - Rebuild