[ice/f18] Update to be compatible with JGoodies Forms 1.6.0
mef
mef at fedoraproject.org
Tue Jan 29 14:17:18 UTC 2013
commit caa2e978eb51505dbcc8acaf34cc3bfb0db33296
Author: mef3 <mefoster at gmail.com>
Date: Fri Jan 25 12:26:18 2013 +0000
Update to be compatible with JGoodies Forms 1.6.0
ice-3.4.2-jgoodies-forms-1.6.patch | 134 ++++++++++++++++++++++++++++++++++++
ice.spec | 14 +++-
2 files changed, 145 insertions(+), 3 deletions(-)
---
diff --git a/ice-3.4.2-jgoodies-forms-1.6.patch b/ice-3.4.2-jgoodies-forms-1.6.patch
new file mode 100644
index 0000000..3b0cea9
--- /dev/null
+++ b/ice-3.4.2-jgoodies-forms-1.6.patch
@@ -0,0 +1,134 @@
+diff -ur Ice-3.4.2/java/src/IceGridGUI/Application/Editor.java Ice-3.4.2.jgoodies-forms/java/src/IceGridGUI/Application/Editor.java
+--- Ice-3.4.2/java/src/IceGridGUI/Application/Editor.java 2011-06-15 20:44:00.000000000 +0100
++++ Ice-3.4.2.jgoodies-forms/java/src/IceGridGUI/Application/Editor.java 2013-01-25 11:55:46.290747449 +0000
+@@ -28,8 +28,8 @@
+ import javax.swing.event.DocumentListener;
+
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
++import com.jgoodies.forms.builder.ButtonBarBuilder2;
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.ButtonBarFactory;
+ import com.jgoodies.forms.factories.DefaultComponentFactory;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.util.LayoutStyle;
+@@ -106,7 +106,7 @@
+ protected void buildPropertiesPanel()
+ {
+ super.buildPropertiesPanel();
+- JComponent buttonBar = ButtonBarFactory.buildRightAlignedBar(_applyButton, _discardButton);
++ JComponent buttonBar = new ButtonBarBuilder2().addGlue().addButton(_applyButton, _discardButton).build();
+ buttonBar.setBorder(Borders.DIALOG_BORDER);
+ _propertiesPanel.add(buttonBar, BorderLayout.SOUTH);
+ }
+diff -ur Ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java Ice-3.4.2.jgoodies-forms/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java
+--- Ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java 2011-06-15 20:44:00.000000000 +0100
++++ Ice-3.4.2.jgoodies-forms/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java 2013-01-25 11:55:46.292747443 +0000
+@@ -29,7 +29,6 @@
+
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.ButtonBarFactory;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.util.LayoutStyle;
+
+diff -ur Ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java Ice-3.4.2.jgoodies-forms/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java
+--- Ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java 2011-06-15 20:44:00.000000000 +0100
++++ Ice-3.4.2.jgoodies-forms/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java 2013-01-25 11:55:46.292747443 +0000
+@@ -29,8 +29,8 @@
+ import javax.swing.JTextField;
+
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
++import com.jgoodies.forms.builder.ButtonBarBuilder2;
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.ButtonBarFactory;
+ import com.jgoodies.forms.layout.CellConstraints;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.util.LayoutStyle;
+@@ -128,10 +128,9 @@
+ };
+ cancelButton.addActionListener(cancelListener);
+
+- JComponent buttonBar =
+- ButtonBarFactory.buildOKCancelBar(okButton, cancelButton);
+- buttonBar.setBorder(Borders.DIALOG_BORDER);
+-
++ JComponent buttonBar = new ButtonBarBuilder2().addGlue().addButton(okButton, cancelButton).build();
++ buttonBar.setBorder(Borders.DIALOG);
++
+ contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
+ contentPane.add(builder.getPanel());
+ contentPane.add(buttonBar);
+diff -ur Ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java Ice-3.4.2.jgoodies-forms/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java
+--- Ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java 2011-06-15 20:44:00.000000000 +0100
++++ Ice-3.4.2.jgoodies-forms/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java 2013-01-25 11:55:46.292747443 +0000
+@@ -21,8 +21,8 @@
+ import javax.swing.JTextField;
+
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
++import com.jgoodies.forms.builder.ButtonBarBuilder2;
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.ButtonBarFactory;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.util.LayoutStyle;
+
+@@ -108,9 +108,8 @@
+ builder.append("Poll period (seconds)", periodField);
+ builder.nextLine();
+
+- JComponent buttonBar =
+- ButtonBarFactory.buildOKCancelBar(okButton, cancelButton);
+- buttonBar.setBorder(Borders.DIALOG_BORDER);
++ JComponent buttonBar = new ButtonBarBuilder2().addGlue().addButton(okButton, cancelButton).build();
++ buttonBar.setBorder(Borders.DIALOG);
+
+ java.awt.Container contentPane = getContentPane();
+ contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
+diff -ur Ice-3.4.2/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java Ice-3.4.2.jgoodies-forms/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java
+--- Ice-3.4.2/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java 2011-06-15 20:44:00.000000000 +0100
++++ Ice-3.4.2.jgoodies-forms/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java 2013-01-25 11:55:46.292747443 +0000
+@@ -33,8 +33,8 @@
+ import javax.swing.SwingUtilities;
+
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
++import com.jgoodies.forms.builder.ButtonBarBuilder2;
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.ButtonBarFactory;
+ import com.jgoodies.forms.layout.CellConstraints;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.util.LayoutStyle;
+@@ -169,8 +169,9 @@
+ builder.append(_stdOut);
+ builder.append(stdErr);
+ builder.nextLine();
+- JComponent buttonBar = ButtonBarFactory.buildOKCancelBar(okButton, cancelButton);
+- buttonBar.setBorder(Borders.DIALOG_BORDER);
++
++ JComponent buttonBar = new ButtonBarBuilder2().addGlue().addButton(okButton, cancelButton).build();
++ buttonBar.setBorder(Borders.DIALOG);
+
+ Container contentPane = getContentPane();
+ contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
+diff -ur Ice-3.4.2/java/src/IceGridGUI/SessionKeeper.java Ice-3.4.2.jgoodies-forms/java/src/IceGridGUI/SessionKeeper.java
+--- Ice-3.4.2/java/src/IceGridGUI/SessionKeeper.java 2011-06-15 20:44:00.000000000 +0100
++++ Ice-3.4.2.jgoodies-forms/java/src/IceGridGUI/SessionKeeper.java 2013-01-25 11:55:46.293747440 +0000
+@@ -28,8 +28,8 @@
+ import java.awt.event.ItemListener;
+
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
++import com.jgoodies.forms.builder.ButtonBarBuilder2;
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.ButtonBarFactory;
+ import com.jgoodies.forms.factories.DefaultComponentFactory;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.util.LayoutStyle;
+@@ -884,8 +884,8 @@
+ TitledBorder titledBorder = BorderFactory.createTitledBorder(Borders.DIALOG_BORDER, "SSL Configuration");
+ _sslPane.setBorder(titledBorder);
+
+- JComponent buttonBar = ButtonBarFactory.buildOKCancelBar(okButton, cancelButton);
+- buttonBar.setBorder(Borders.DIALOG_BORDER);
++ JComponent buttonBar = new ButtonBarBuilder2().addGlue().addButton(okButton, cancelButton).build();
++ buttonBar.setBorder(Borders.DIALOG);
+
+ Container contentPane = getContentPane();
+ contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
diff --git a/ice.spec b/ice.spec
index 4c74aac..eb73515 100644
--- a/ice.spec
+++ b/ice.spec
@@ -7,7 +7,7 @@
Name: ice
Version: 3.4.2
-Release: 18%{?dist}
+Release: 19%{?dist}
Summary: ZeroC Object-Oriented middleware
Group: System Environment/Libraries
@@ -52,6 +52,8 @@ 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
@@ -75,7 +77,8 @@ BuildRequires: mono-core, mono-devel
BuildRequires: libmcpp-devel >= 2.7.2
BuildRequires: dos2unix
BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jgoodies-forms jgoodies-looks
+BuildRequires: jgoodies-forms >= 1.6.0
+BuildRequires: jgoodies-looks
BuildRequires: /usr/bin/convert
BuildRequires: desktop-file-utils
@@ -134,7 +137,8 @@ Tools for developing Ice applications in Java.
Summary: IceGrid Admin Tool
Group: Development/Tools
Requires: ice-java%{?_isa} = %{version}-%{release}
-Requires: jgoodies-forms, jgoodies-looks
+Requires: jgoodies-forms >= 1.6.0
+Requires: jgoodies-looks
Requires: jpackage-utils
%description -n icegrid-gui
Graphical administration tool for IceGrid
@@ -223,6 +227,7 @@ 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
@@ -581,6 +586,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n -d extension_dir=%{buildroot}%{php
%changelog
+* Fri Jan 25 2012 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)
More information about the scm-commits
mailing list