From d5187d9cd1f5243e851364551c92143ffb4a3120 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Jul 26 2016 15:17:21 +0000
Subject: sip-4.18.1


---

diff --git a/.gitignore b/.gitignore
index cee1f7e..001d61d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /sip-4.17.tar.gz
 /sip-4.18.tar.gz
+/sip-4.18.1.tar.gz
diff --git a/sip-4.18-diamond_inheritance.patch b/sip-4.18-diamond_inheritance.patch
deleted file mode 100644
index 7e30258..0000000
--- a/sip-4.18-diamond_inheritance.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up sip-4.18/sipgen/gencode.c.diamond_inheritance sip-4.18/sipgen/gencode.c
---- sip-4.18/sipgen/gencode.c.diamond_inheritance	2016-03-10 11:08:27.000000000 -0600
-+++ sip-4.18/sipgen/gencode.c	2016-06-13 09:04:29.683237098 -0500
-@@ -5937,7 +5937,7 @@ static void generateClassFunctions(sipSp
- 
-         for (mro = cd->mro; mro != NULL; mro = mro->next)
-         {
--            if (needsCast(mro))
-+            if (needsCast(mro) && !isDuplicateSuper(mro) && !hasDuplicateSuper(mro))
-             {
-                 prcode(fp,
- "    if (targetType == sipType_%C)\n"
diff --git a/sip-4.18-shadow_build.patch b/sip-4.18-shadow_build.patch
deleted file mode 100644
index 34167d9..0000000
--- a/sip-4.18-shadow_build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up sip-4.18/configure.py.shadow_build sip-4.18/configure.py
---- sip-4.18/configure.py.shadow_build	2016-04-13 04:43:31.000000000 -0500
-+++ sip-4.18/configure.py	2016-06-13 09:02:29.811442629 -0500
-@@ -474,7 +474,7 @@ macx {
-                         cfg.sip_inc_dir)]
- 
-         if opts.pyi:
--            installs.append(([os.path.join(build_dir, 'sip.pyi')], pyi_dir))
-+            installs.append(([os.path.join(src_dir, 'sip.pyi')], pyi_dir))
- 
-         makefile = sipconfig.ModuleMakefile(
-             configuration=cfg,
diff --git a/sip.spec b/sip.spec
index bf2c165..801a494 100644
--- a/sip.spec
+++ b/sip.spec
@@ -16,8 +16,8 @@
 
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
-Version: 4.18
-Release: 3%{?dist}
+Version: 4.18.1
+Release: 1%{?dist}
 
 # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison)
 License: GPLv2 or GPLv3 and (GPLv3+ with exceptions)
@@ -27,8 +27,6 @@ Source0:  http://downloads.sourceforge.net/pyqt/sip-%{version}%{?snap:-snapshot-
 #Source0:  http://www.riverbankcomputing.com/static/Downloads/sip4/sip-%{version}.tar.gz
 
 ## upstream patches
-Patch1: sip-4.18-diamond_inheritance.patch
-Patch2: sip-4.18-shadow_build.patch
 
 ## upstreamable patches
 # make install should not strip (by default), kills -debuginfo
@@ -114,9 +112,6 @@ classes library.
 
 %setup -q -n %{name}-%{version}%{?snap:-snapshot-%{snap}}
 
-%patch1 -p1 -b .diamond_inheritance
-%patch2 -p1 -b .shadow_build
-
 %patch50 -p1 -b .no_strip
 %patch51 -p1 -b .no_rpath
 
@@ -198,6 +193,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip
 
 
 %changelog
+* Tue Jul 26 2016 Rex Dieter <rdieter@fedoraproject.org> - 4.18.1-1
+- sip-4.18.1
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.18-3
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 
diff --git a/sources b/sources
index 4313eac..eb3cd5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78724bf2a79878201c3bc81a1d8248ea  sip-4.18.tar.gz
+9d664c33e8d0eabf1238a7ff44a399e9  sip-4.18.1.tar.gz