[ice/f18] Revert "Update to be compatible with JGoodies Forms 1.6.0"

[mef]

commit 45fdcb0df1df99c4aca97a526ee20aac59de9f2c
Author: Mary Ellen Foster <mefoster at gmail.com>
Date:   Tue Jan 29 14:22:33 2013 +0000

    Revert "Update to be compatible with JGoodies Forms 1.6.0"
    
    This reverts commit caa2e978eb51505dbcc8acaf34cc3bfb0db33296.
    
    Conflicts:
    	ice-3.4.2-jgoodies-forms-1.6.patch
    	ice.spec

 ice-3.4.2-jgoodies-forms-1.6.patch |  134 ------------------------------------
 ice.spec                           |   14 +---
 2 files changed, 3 insertions(+), 145 deletions(-)
---
diff --git a/ice.spec b/ice.spec
index 1feded0..4c74aac 100644
--- a/ice.spec
+++ b/ice.spec
@@ -7,7 +7,7 @@
 
 Name:           ice
 Version:        3.4.2
-Release:        19%{?dist}
+Release:        18%{?dist}
 Summary:        ZeroC Object-Oriented middleware
 
 Group:          System Environment/Libraries
@@ -52,8 +52,6 @@ Patch8:         ice-3.4.2-gcc47.patch
 Patch9:         ice-3.4.2-arm.patch
 # libdb4
 Patch10:        ice-3.4.2-libdb4.patch
-# jgoodies-forms 1.6.0
-Patch11:		ice-3.4.2-jgoodies-forms-1.6.patch
 
 # Ice doesn't officially support ppc64 at all
 ExcludeArch:    ppc64
@@ -77,8 +75,7 @@ BuildRequires: mono-core, mono-devel
 BuildRequires: libmcpp-devel >= 2.7.2
 BuildRequires: dos2unix
 BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jgoodies-forms >= 1.6.0
-BuildRequires: jgoodies-looks
+BuildRequires: jgoodies-forms jgoodies-looks
 BuildRequires: /usr/bin/convert
 BuildRequires: desktop-file-utils
 
@@ -137,8 +134,7 @@ Tools for developing Ice applications in Java.
 Summary: IceGrid Admin Tool
 Group: Development/Tools
 Requires: ice-java%{?_isa} = %{version}-%{release}
-Requires: jgoodies-forms >= 1.6.0
-Requires: jgoodies-looks 
+Requires: jgoodies-forms, jgoodies-looks
 Requires: jpackage-utils
 %description -n icegrid-gui
 Graphical administration tool for IceGrid
@@ -227,7 +223,6 @@ Tools for developing Ice applications in PHP.
 %patch8 -p1 -b .gcc47
 %patch9 -p1 -b .arm
 %patch10 -p1 -b .libdb4
-%patch11 -p1 -b .jgoodies-forms
 
 tar xf %{SOURCE1}
 rm -f ice-3.4.2-man-pages/slice2docbook.1
@@ -586,9 +581,6 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n -d extension_dir=%{buildroot}%{php
 
 
 %changelog
-* Fri Jan 25 2013 Mary Ellen Foster <mefoster at gmail.com> - 3.4.2-19
-- Patch to work with jgoodies-forms 1.6.0
-
 * Wed Oct 17 2012 Haïkel Guémar <hguemar at fedoraproject.org> - 3.4.2-18
 - use macroized systemd directives (closes RHBZ #850152)