From c0a11fa0c783031dc7519b3b4384af1e654c8f08 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@fedoraproject.org>
Date: Tue, 16 Dec 2008 16:14:53 +0000
Subject: [PATCH] drop integrated patches

---
 icu.icu5557.safety.patch | 14 --------------
 icu.spec                 | 19 ++++++++++---------
 2 files changed, 10 insertions(+), 23 deletions(-)
 delete mode 100644 icu.icu5557.safety.patch

diff --git a/icu.icu5557.safety.patch b/icu.icu5557.safety.patch
deleted file mode 100644
index 682caa1..0000000
--- a/icu.icu5557.safety.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- icu.orig/source/layout/CoverageTables.cpp	2007-01-09 12:57:41.000000000 +0000
-+++ icu/source/layout/CoverageTables.cpp	2007-01-09 12:59:09.000000000 +0000
-@@ -44,6 +44,11 @@
-     le_uint16 count = SWAPW(glyphCount);
-     le_uint8 bit = OpenTypeUtilities::highBit(count);
-     le_uint16 power = 1 << bit;
-+
-+    if (count == 0) {
-+        return -1;
-+    }
-+
-     le_uint16 extra = count - power;
-     le_uint16 probe = power;
-     le_uint16 index = 0;
diff --git a/icu.spec b/icu.spec
index 28a4083..64d71e1 100644
--- a/icu.spec
+++ b/icu.spec
@@ -1,6 +1,6 @@
 Name:      icu
 Version:   4.0
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT
@@ -12,10 +12,9 @@ BuildRequires: doxygen, autoconf
 Patch1:  icu-config
 Patch2:  icu-3.4-multiarchdevel.patch
 Patch3:  icu.icuXXXX.virama.prevnext.patch
-Patch4:  icu.icu5557.safety.patch
-Patch5:  icu.icu6008.arm.padding.patch
-Patch6:  icu.icu6213.worstcase.patch
-Patch7:  icu.icu6284.strictalias.patch
+Patch4:  icu.icu6008.arm.padding.patch
+Patch5:  icu.icu6213.worstcase.patch
+Patch6:  icu.icu6284.strictalias.patch
 
 %description
 Tools and utilities for developing with icu.
@@ -56,10 +55,9 @@ Group:   Documentation
 %setup -q -n %{name}
 %patch2 -p1 -b .multiarchdevel
 %patch3 -p1 -b .icuXXXX.virama.prevnext.patch
-%patch4 -p1 -b .icu5557.safety.patch
-%patch5 -p1 -b .icu6008.arm.padding.patch
-%patch6 -p1 -b .icu6213.worstcase.patch
-%patch7 -p1 -b .icu6284.strictalias.patch
+%patch4 -p1 -b .icu6008.arm.padding.patch
+%patch5 -p1 -b .icu6213.worstcase.patch
+%patch6 -p1 -b .icu6284.strictalias.patch
 
 %build
 cd source
@@ -132,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Tue Dec 16 2008 Caolan McNamara <caolanm@redhat.com> - 4.0-5
+- drop integrated icu.icu5557.safety.patch
+
 * Thu Nov 20 2008 Caolan McNamara <caolanm@redhat.com> - 4.0-4
 - annoyingly upstream tarball was repacked apparently to remove 
   some unused/cached dirs