fix merge

libimobiledevice.spec

@@ -1,5 +1,10 @@
 %{!?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.6
 Release:       1%{?dist}
@@ -10,7 +15,6 @@ License:       LGPLv2+
 URL:           http://www.libimobiledevice.org/
 Source0:       http://www.libimobiledevice.org/downloads/%{name}-%{version}.tar.bz2
 
-BuildRequires: Cython
 BuildRequires: glib2-devel
 BuildRequires: gnutls-devel
 BuildRequires: libgcrypt-devel
@@ -20,9 +24,13 @@ 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
@@ -60,7 +68,7 @@ Python bindings for libimobiledevice.
 chmod +x docs/html
 
 %build
-%configure --disable-static --disable-openssl --enable-dev-tools
+%configure --disable-static --disable-openssl --enable-dev-tools %{!?python:--without-cython}
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -91,13 +99,20 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_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@fedoraproject.org> 1.1.6-1
 - New 1.1.6 release
 
+* Thu Apr 24 2014 Rex Dieter <rdieter@fedoraproject.org> 1.1.5-5
+- disable broken -python on rawhide
+
 * Wed Apr 23 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.1.5-4
 - Rebuild