diff --git a/0000-hotfix.patch b/0000-hotfix.patch
deleted file mode 100644
index 473a0f4..0000000
diff --git a/libguestfs.spec b/libguestfs.spec
index 99e9155..03b7d9a 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -137,10 +137,9 @@ BuildRequires:  gtk2-devel
 Url:            http://libguestfs.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Compatibility package for guestfs-tools
+# PATCH-FIX-UPSTREAM - python3 fixes
 License:        GPL-2.0
 Group:          System/Filesystems
-Patch0:         0000-hotfix.patch
-# PATCH-FIX-UPSTREAM - python3 fixes
 Patch1:         9d25b4e5-python-add-simple-wrappers-for-PyObject-string-funct.patch
 Patch2:         f3f99a09-python-use-right-func-when-PyString_FromStringAndSiz.patch
 # PATCH-FIX-UPSTREAM - add configure --with-distro parameter
@@ -441,7 +440,7 @@ Recommends:     parted
 Recommends:     zerofree
 Recommends:     genisoimage
 Recommends:     ldmtool
-%if 0%{?is_opensuse:0} == 0
+%if ! 0%{?is_opensuse}
 Recommends:     guestfs-winsupport
 %endif
 
@@ -455,7 +454,7 @@ Obsoletes:      libguestfs-data < %{version}
 libguestfs needs for it's run a virtual machine image.
 This package provides such an image, an initrd and a kernel.
 
-%if 0%{?is_opensuse} == 0
+%if ! 0%{?is_opensuse}
 %package -n guestfs-winsupport
 Summary:        Windows guest support in libguestfs
 License:        GPL-2.0+
@@ -544,7 +543,6 @@ It can import a variety of guest operating systems from libvirt-managed hosts.
 %prep
 : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}'
 %setup -q -a 789653
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -665,7 +663,7 @@ touch %{name}.lang
 %fdupes -s %{buildroot}/
 
 # Appliance NTFS files
-%if 0%{?is_opensuse} == 0
+%if 0%{?is_opensuse}
 mkdir -p %{buildroot}/tmp/etc/alternatives
 pushd %{buildroot}/tmp/etc/alternatives
 ln -s /sbin/mount.ntfs-3g mount.ntfs
@@ -724,11 +722,10 @@ rm %{buildroot}/%{_datadir}/virt-p2v/p2v.ks.in
 %{_libdir}/guestfs/supermin.d/packages
 %{_libdir}/guestfs/supermin.d/zz-scripts.tar.gz
 
-%if 0%{?is_opensuse} == 0
+%if 0%{?is_opensuse}
 %{_libdir}/guestfs/supermin.d/zz-ntfs-symlink.tar.gz
-%endif
+%else
 
-%if 0%{?is_opensuse} == 0
 %files -n guestfs-winsupport
 %defattr(-,root,root)
 %{_libdir}/guestfs/supermin.d/zz-*winsupport*