[ice] Clean up patches

[mef]

commit e154f7bdce20c16cc1d4e8d80d1ddaa22f1a497b
Author: mef3 <mefoster at gmail.com>
Date:   Fri Jan 25 14:24:00 2013 +0000

    Clean up patches

 ice-3.4.2-arm.patch                  |   11 -
 ice-3.4.2-dont-build-demo-test.patch |   39 -
 ice-3.4.2-gcc46.patch                |  119 ---
 ice-3.4.2-gcc47.patch                | 1498 ----------------------------------
 ice-3.4.2-java7.patch                |   38 -
 ice-3.4.2-jgoodies.patch             |   58 --
 ice-3.4.2-libdb4.patch               |   17 -
 ice-3.4.2-php54.patch                |  818 -------------------
 ice-3.4.2-s390.patch                 |   34 -
 ice-3.4.2-slice2cpp.patch            |   33 -
 ice.spec                             |   24 +-
 11 files changed, 12 insertions(+), 2677 deletions(-)
---
diff --git a/ice.spec b/ice.spec
index 05ca6e3..03c37c8 100644
--- a/ice.spec
+++ b/ice.spec
@@ -31,19 +31,19 @@ Source10:       icegridregistry.service
 Source11:       ice.ini
 Source12:       ice.pth
 # Add support for the s390/s390x architecture
-Patch2:         ice-3.5b-s390.patch
+Patch0:         ice-3.5b-s390.patch
 # don't build demo/test
 # TODO: should we keep it or not ?
 # significantly reduce compile time but shipping demos could be useful
-Patch3:         ice-3.5b-dont-build-demo-test.patch
+Patch1:         ice-3.5b-dont-build-demo-test.patch
 # disable the CSharp interface
-Patch4:         ice-3.4.2-no-mono.patch
+Patch2:         ice-3.4.2-no-mono.patch
 # ARM
-Patch9:         ice-3.5b-arm.patch
+Patch3:         ice-3.5b-arm.patch
 # libdb4
-Patch10:        ice-3.5b-libdb4.patch
+Patch4:        ice-3.5b-libdb4.patch
 # javafx
-Patch11:        ice-3.5b-remove-javafx.patch
+Patch5:        ice-3.5b-remove-javafx.patch
 
 # Ice doesn't officially support ppc64 at all
 ExcludeArch:    ppc64
@@ -203,17 +203,17 @@ Tools for developing Ice applications in PHP.
 
 %prep
 %setup -q -n Ice-%{tar_version}
-%patch2 -p1 -b .s390
-%patch3 -p1 -b .demo
+%patch0 -p1 -b .s390
+%patch1 -p1 -b .demo
 %if ! 0%{?with_mono}
-%patch4 -p1 -b .no-mono
+%patch2 -p1 -b .no-mono
 %endif
-%patch9 -p1 -b .arm
-%patch10 -p1 -b .libdb4
+%patch3 -p1 -b .arm
+%patch4 -p1 -b .libdb4
 
 # Remove the parts of the GUI that require javafx
 rm -f java/src/IceGridGUI/LiveDeployment/GraphView.java
-%patch11 -p1 -b .javafx
+%patch5 -p1 -b .javafx
 
 tar xf %{SOURCE1}
 rm -f ice-3.4.2-man-pages/slice2docbook.1