From efadbc701aa787d3bca6f7c681fc291beaa53c3493a4746bc512352a18144751 Mon Sep 17 00:00:00 2001
From: Otto Dassau <dassau@gbd-consult.de>
Date: Mon, 6 Jun 2011 13:47:30 +0000
Subject: [PATCH] removed obsolete patch

OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=132
---
 qgis.spec          |   4 --
 qgis16_pyqt4.patch | 123 ---------------------------------------------
 2 files changed, 127 deletions(-)
 delete mode 100644 qgis16_pyqt4.patch

diff --git a/qgis.spec b/qgis.spec
index 8fc2de0..1169a45 100644
--- a/qgis.spec
+++ b/qgis.spec
@@ -6,7 +6,6 @@ Group:          Applications/GIS
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
 Source2:	%{name}.rpmlintrc
-Patch0:         qgis16_pyqt4.patch
 Url:            http://www.qgis.org/
 Summary:        Quantum GIS (QGIS) is a Geographic Information System (GIS)
 Packager:       Otto Dassau <dassau@gbd-consult.de>
@@ -80,9 +79,6 @@ GRASS plugin for Quantum GIS development branch 1.x required to interface with G
 
 %prep
 %setup
-%if 0%{?suse_version} > 1130
-#%patch0 -p1
-%endif
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
diff --git a/qgis16_pyqt4.patch b/qgis16_pyqt4.patch
deleted file mode 100644
index 7b86493..0000000
--- a/qgis16_pyqt4.patch
+++ /dev/null
@@ -1,123 +0,0 @@
---- qgis-1.6.0/python/CMakeLists.txt	2010-10-04 22:05:12.000000000 +0200
-+++ qgis_trunk/python/CMakeLists.txt	2011-03-15 21:42:01.776231982 +0100
-@@ -43,6 +45,10 @@
-   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
- ENDIF(NOT PYQT4_VERSION_NUM LESS 263941)
- 
-+IF(NOT PYQT4_VERSION_NUM LESS 264194)	# 0x040802
-+  SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETTYPE_CONVERSION)
-+ENDIF(NOT PYQT4_VERSION_NUM LESS 264194)
-+
- # core module
- FILE(GLOB sip_files_core core/*.sip)
- set(SIP_EXTRA_FILES_DEPEND ${sip_files_core})
---- qgis-1.6.0/python/core/conversions.sip	2010-10-03 11:11:28.000000000 +0200
-+++ qgis_trunk/python/core/conversions.sip	2011-03-15 21:42:19.106229754 +0100
-@@ -15,6 +15,7 @@
- */
- 
- %Feature QSETINT_CONVERSION
-+%Feature QSETTYPE_CONVERSION
- 
- %ModuleHeaderCode
- // From Python 2.5, some functions use Py_ssize_t instead of int
-@@ -35,6 +36,8 @@
- #include <QVector>
- #if (SIP_VERSION >= 0x040900)
- #define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-+#endif
-+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
- #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
- #endif
- %End
-@@ -115,6 +118,8 @@
- #include <QVector>
- #if (SIP_VERSION >= 0x040900)
- #define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-+#endif
-+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
- #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
- #endif
- %End
-@@ -273,6 +278,8 @@
- #include <QSet>
- #if (SIP_VERSION >= 0x040900)
- #define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-+#endif
-+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
- #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
- #endif
- %End
-@@ -320,7 +327,7 @@
- };
- %End
- 
--
-+%If (QSETTYPE_CONVERSION)
- template <TYPE>
- %MappedType QSet<TYPE>
- {
-@@ -328,6 +335,8 @@
- #include <QSet>
- #if (SIP_VERSION >= 0x040900)
- #define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-+#endif
-+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
- #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
- #endif
- %End
-@@ -394,8 +403,7 @@
- %End
- 
- };
--
--
-+%End
- 
- template<TYPE>
- %MappedType QMap<int, QMap<int, TYPE> >
-@@ -404,6 +412,8 @@
- #include <QMap>
- #if (SIP_VERSION >= 0x040900)
- #define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-+#endif
-+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
- #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
- #endif
- %End
-@@ -525,6 +535,8 @@
- #include <QMap>
- #if (SIP_VERSION >= 0x040900)
- #define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-+#endif
-+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
- #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
- #endif
- %End
-@@ -630,6 +642,8 @@
- #include <QMap>
- #if (SIP_VERSION >= 0x040900)
- #define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-+#endif
-+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
- #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
- #endif
- %End
-@@ -842,6 +856,8 @@
- #include <QMultiMap>
- #if (SIP_VERSION >= 0x040900)
- #define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-+#endif
-+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
- #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
- #endif
- %End
-@@ -964,6 +980,8 @@
- #include <QMap>
- #if (SIP_VERSION >= 0x040900)
- #define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
-+#endif
-+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
- #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
- #endif
- %End