[ice] Update to 3.5.0
mef
mef at fedoraproject.org
Mon Apr 1 12:44:19 UTC 2013
commit 55834883dba7cf5816333d175620591f54f34868
Author: Mary Ellen Foster <mefoster at gmail.com>
Date: Mon Apr 1 13:43:25 2013 +0100
Update to 3.5.0
.gitignore | 1 +
ice-3.5.0-arm.patch | 11 ++
ice-3.5.0-libdb4.patch | 15 +++
ice-3.5.0-remove-javafx.patch | 232 +++++++++++++++++++++++++++++++++++++++++
ice.spec | 26 +++--
sources | 2 +-
6 files changed, 274 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6df56e1..8d60dd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ Ice-3.3.0-man-pages.tbz
/Ice-3.4.2.tar.gz
/Ice-3.5b
/Ice-3.5b.tar.gz
+/Ice-3.5.0.tar.gz
diff --git a/ice-3.5.0-arm.patch b/ice-3.5.0-arm.patch
new file mode 100644
index 0000000..59e7473
--- /dev/null
+++ b/ice-3.5.0-arm.patch
@@ -0,0 +1,11 @@
+--- Ice-3.5.0/cpp/include/IceUtil/Config.h.orig 2013-04-01 11:20:37.000000000 +0100
++++ Ice-3.5.0/cpp/include/IceUtil/Config.h 2013-04-01 11:22:31.136976843 +0100
+@@ -23,7 +23,7 @@
+ #if defined(__i386) || defined(_M_IX86) || defined(__x86_64) || \
+ defined(_M_X64) || defined(_M_IA64) || defined(__alpha__) || \
+ defined(__ARMEL__) || defined(_M_ARM_FP) || \
+- defined(__MIPSEL__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN))
++ defined(__MIPSEL__) || defined(__arm__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN))
+ # define ICE_LITTLE_ENDIAN
+ #elif defined(__sparc) || defined(__sparc__) || defined(__hppa) || \
+ defined(__ppc__) || defined(__powerpc) || defined(_ARCH_COM) || \
diff --git a/ice-3.5.0-libdb4.patch b/ice-3.5.0-libdb4.patch
new file mode 100644
index 0000000..0bd7cb6
--- /dev/null
+++ b/ice-3.5.0-libdb4.patch
@@ -0,0 +1,15 @@
+--- Ice-3.5.0/cpp/config/Make.rules.orig 2013-03-11 15:19:48.000000000 +0000
++++ Ice-3.5.0/cpp/config/Make.rules 2013-04-01 11:25:07.723542703 +0100
+@@ -225,9 +225,9 @@
+ endif
+ DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir)$(cpp11suffix))
+ else
+- ifeq ($(shell if [ -d /usr/include/db53 -a -d /usr/$(libsubdir)/db53 ] ; then echo yes; fi), yes)
+- DB_FLAGS = -I/usr/include/db53
+- DB_LIBS = -L/usr/$(libsubdir)/db53 -ldb_cxx
++ ifeq ($(shell if [ -d /usr/include/libdb4 -a -d /usr/$(libsubdir)/libdb4 ] ; then echo yes; fi), yes)
++ DB_FLAGS = -I/usr/include/libdb4
++ DB_LIBS = -L/usr/$(libsubdir)/libdb4 -ldb_cxx
+ else
+ ifeq ($(shell if [ -d /usr/local/include/db53 -a -d /usr/local/$(libsubdir)/db53 ] ; then echo yes; fi), yes)
+ DB_FLAGS = -I/usr/local/include/db53
diff --git a/ice-3.5.0-remove-javafx.patch b/ice-3.5.0-remove-javafx.patch
new file mode 100644
index 0000000..77a7f8d
--- /dev/null
+++ b/ice-3.5.0-remove-javafx.patch
@@ -0,0 +1,232 @@
+diff -ur Ice-3.5.0.orig/java/src/IceGridGUI/Coordinator.java Ice-3.5.0/java/src/IceGridGUI/Coordinator.java
+--- Ice-3.5.0.orig/java/src/IceGridGUI/Coordinator.java 2013-04-01 11:30:57.266528041 +0100
++++ Ice-3.5.0/java/src/IceGridGUI/Coordinator.java 2013-04-01 13:28:42.674186697 +0100
+@@ -57,7 +57,6 @@
+ import javax.naming.ldap.LdapName;
+ import javax.naming.ldap.Rdn;
+
+-import IceGridGUI.LiveDeployment.GraphView;
+
+ //
+ // This class coordinates the communications between the various objects
+@@ -337,7 +336,6 @@
+ // New Graph sub-menu
+ //
+ _newMenu.addSeparator();
+- _newMenu.add(_newGraph);
+
+ fileMenu.addSeparator();
+ fileMenu.add(_login);
+@@ -1230,15 +1228,6 @@
+ }
+ _liveApplications.clear();
+
+- //
+- // Close al graphs
+- //
+- java.util.List<GraphView> views = new java.util.ArrayList<GraphView>(_graphViews);
+- for(GraphView v : views)
+- {
+- v.close();
+- }
+-
+ _logout.setEnabled(false);
+ _showLiveDeploymentFilters.setEnabled(false);
+ _openApplicationFromRegistry.setEnabled(false);
+@@ -2646,22 +2635,6 @@
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+- if(_graphViews.size() > 0)
+- {
+- if(JOptionPane.YES_OPTION != JOptionPane.showConfirmDialog(getMainFrame(),
+- "Close all open Metrics Graph Views and logout?",
+- "Confirm logout",
+- JOptionPane.YES_NO_OPTION))
+- {
+- return;
+- }
+-
+- java.util.List<GraphView> views = new java.util.ArrayList<GraphView>(_graphViews);
+- for(GraphView v : views)
+- {
+- v.close();
+- }
+- }
+ _sessionKeeper.logout(true);
+ }
+ };
+@@ -2701,15 +2674,6 @@
+ "Release exclusive write access on the registry");
+ _releaseExclusiveWriteAccess.setEnabled(false);
+
+- _newGraph = new AbstractAction("Metrics Graph")
+- {
+- public void actionPerformed(ActionEvent e)
+- {
+- createGraphView();
+- }
+- };
+- _newGraph.setEnabled(false);
+-
+ _showLiveDeploymentFilters = new AbstractAction("Filter live deployment")
+ {
+ public void actionPerformed(ActionEvent e)
+@@ -3120,20 +3084,6 @@
+ _mainFrame.getContentPane().add(_mainPane, BorderLayout.CENTER);
+ }
+
+- public GraphView createGraphView()
+- {
+- StringBuilder title = new StringBuilder();
+- title.append("Metrics Graph");
+- if(_graphViews.size() > 0)
+- {
+- title.append(" - ");
+- title.append(Integer.toString(_graphViews.size()));
+- }
+- GraphView view = new GraphView(Coordinator.this, title.toString());
+- _graphViews.add(view);
+- return view;
+- }
+-
+ public LiveDeploymentPane getLiveDeploymentPane()
+ {
+ return _liveDeploymentPane;
+@@ -3248,23 +3198,6 @@
+
+ void exit(int status)
+ {
+- if(_graphViews.size() > 0)
+- {
+- if(JOptionPane.YES_OPTION != JOptionPane.showConfirmDialog(getMainFrame(),
+- "Close all open windows and exit?",
+- "Confirm exit",
+- JOptionPane.YES_NO_OPTION))
+- {
+- return;
+- }
+-
+- java.util.List<GraphView> views = new java.util.ArrayList<GraphView>(_graphViews);
+- for(GraphView v : views)
+- {
+- v.close();
+- }
+- }
+-
+ if(_openChooser != null)
+ {
+ File dir = _openChooser.getCurrentDirectory();
+@@ -3476,11 +3409,6 @@
+ enableTreeEditActions();
+ }
+
+- public void removeGraphView(GraphView view)
+- {
+- _graphViews.remove(view);
+- }
+-
+ public boolean traceObservers()
+ {
+ return _traceObservers;
+@@ -3505,7 +3433,6 @@
+ {
+ _connected = connected;
+ _statusBar.setConnected(connected);
+- _newGraph.setEnabled(connected);
+ }
+
+ public boolean connected()
+@@ -3576,11 +3503,6 @@
+ return _dataDir;
+ }
+
+- public GraphView[] getGraphViews()
+- {
+- return _graphViews.toArray(new GraphView[_graphViews.size()]);
+- }
+-
+ //
+ // May run in any thread
+ //
+@@ -3753,8 +3675,6 @@
+ private Action _acquireExclusiveWriteAccess;
+ private Action _releaseExclusiveWriteAccess;
+
+- private Action _newGraph;
+-
+ private Action _showLiveDeploymentFilters;
+ private Action _openApplicationFromFile;
+ private Action _openApplicationFromRegistry;
+@@ -3827,7 +3747,5 @@
+
+ private X509Certificate _trasientCert;
+
+- private java.util.List<GraphView> _graphViews = new java.util.ArrayList<GraphView>();
+-
+ static private final int HISTORY_MAX_SIZE = 20;
+ }
+diff -ur Ice-3.5.0.orig/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java Ice-3.5.0/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java
+--- Ice-3.5.0.orig/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java 2013-04-01 11:30:57.266528041 +0100
++++ Ice-3.5.0/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java 2013-04-01 13:28:15.369567071 +0100
+@@ -706,60 +706,6 @@
+ table.addMouseListener(new ButtonMouseListener(table));
+ table.setAutoCreateRowSorter(true);
+ table.setTransferHandler(new TransferHandler(node));
+- table.addMouseListener(new MouseAdapter()
+- {
+- @Override
+- public void mousePressed(MouseEvent e)
+- {
+- createAndShowMenu(e);
+- }
+-
+- @Override
+- public void mouseReleased(MouseEvent e)
+- {
+- createAndShowMenu(e);
+- }
+-
+- public void createAndShowMenu(MouseEvent e)
+- {
+- if(e.isPopupTrigger())
+- {
+- JPopupMenu popup = new JPopupMenu();
+- JMenu addToGraph = new JMenu("Add To Metrics Graph");
+- popup.add(addToGraph);
+- final Map<String, List<MetricsCell>> rows = getSelectedRows(table, true);
+- addToGraph.setEnabled(rows.size() > 0);
+- JMenuItem newGraph = new JMenuItem("New Metrics Graph");
+- newGraph.addActionListener(new ActionListener()
+- {
+- public void actionPerformed(ActionEvent e)
+- {
+- GraphView view = node.getCoordinator().createGraphView();
+- view.addSeries(new MetricsViewTransferableData(new MetricsViewInfo(node),
+- entry.getKey(), rows));
+- }
+- });
+- addToGraph.add(newGraph);
+-
+- GraphView[] graphs = node.getCoordinator().getGraphViews();
+- for(final GraphView view : graphs)
+- {
+- JMenuItem item = new JMenuItem(view.getTitle());
+- addToGraph.add(item);
+- item.addActionListener(new ActionListener()
+- {
+- public void actionPerformed(ActionEvent e)
+- {
+- view.addSeries(new MetricsViewTransferableData(new MetricsViewInfo(node),
+- entry.getKey(), rows));
+- }
+- });
+- }
+- popup.show(e.getComponent(), e.getX(), e.getY());
+- }
+- }
+- });
+-
+ for(Map.Entry<Integer, MetricsField> fieldEntry : model.getMetricFields().entrySet())
+ {
+ if(fieldEntry.getValue().getCellRenderer() != null)
diff --git a/ice.spec b/ice.spec
index d175215..0ee96e8 100644
--- a/ice.spec
+++ b/ice.spec
@@ -6,18 +6,17 @@
%global systemddir /lib/systemd/system
# Some file suffixes we need to grab the right stuff for the file lists
-%global soversion 35b
-%global tar_version 3.5b
+%global soversion 35
Name: ice
-Version: 3.5
-Release: 0.4.b%{?dist}
+Version: 3.5.0
+Release: 1%{?dist}
Summary: ZeroC Object-Oriented middleware
Group: System Environment/Libraries
License: GPLv2 with exceptions
URL: http://www.zeroc.com/
-Source0: http://zeroc.com/download/Ice/3.5/Ice-%{tar_version}.tar.gz
+Source0: http://zeroc.com/download/Ice/3.5/Ice-%{version}.tar.gz
# Man pages courtesy of Francisco Moya's Debian packages
Source1: ice-3.4.2-man-pages.tar.gz
Source3: IceGridAdmin.desktop
@@ -39,11 +38,11 @@ Patch1: ice-3.5b-dont-build-demo-test.patch
# disable the CSharp interface
Patch2: ice-3.4.2-no-mono.patch
# ARM
-Patch3: ice-3.5b-arm.patch
+Patch3: ice-3.5.0-arm.patch
# libdb4
-Patch4: ice-3.5b-libdb4.patch
+Patch4: ice-3.5.0-libdb4.patch
# javafx
-Patch5: ice-3.5b-remove-javafx.patch
+Patch5: ice-3.5.0-remove-javafx.patch
# Ice doesn't officially support ppc64 at all
ExcludeArch: ppc64
@@ -202,7 +201,7 @@ Requires: ice-php%{?_isa} = %{version}-%{release}
Tools for developing Ice applications in PHP.
%prep
-%setup -q -n Ice-%{tar_version}
+%setup -q -n Ice-%{version}
%patch0 -p1 -b .s390
%patch1 -p1 -b .demo
%if ! 0%{?with_mono}
@@ -220,7 +219,7 @@ rm -f ice-3.4.2-man-pages/slice2docbook.1
%build
# Set the CLASSPATH correctly for the Java compile
-export CLASSPATH=`build-classpath db jgoodies-forms jgoodies-looks jgoodies-common`
+export CLASSPATH=`build-classpath db4 jgoodies-forms jgoodies-looks jgoodies-common`
# Compile the main Ice runtime
make CXXFLAGS="%{optflags} -fPIC -fpermissive" CFLAGS="%{optflags} -fPIC -fpermissive" embedded_runpath_prefix="" libsubdir=%{_lib}
@@ -425,7 +424,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n -d extension_dir=%{buildroot}%{php
%{_bindir}/icestormmigrate
%{_bindir}/slice2html
%{_bindir}/transformdb
-%{_libdir}/lib*.so.%{tar_version}
+%{_libdir}/lib*.so.%{version}
%{_libdir}/lib*.so.%{soversion}
%{_datadir}/Ice-%{version}
@@ -543,6 +542,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n -d extension_dir=%{buildroot}%{php
%changelog
+* Mon Apr 1 2013 Mary Ellen Foster <mefoster at gmail.com> - 3.5.0-1
+- Update to 3.5.0 final release
+
* Fri Mar 22 2013 Remi Collet <rcollet at redhat.com> - 3.5-0.4.b
- rebuild for http://fedoraproject.org/wiki/Features/Php55
@@ -811,7 +813,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n -d extension_dir=%{buildroot}%{php
ZeroC RPMs
- Also don't build "test" or "demo" for IceCS
-* Sun Aug 18 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-2
+* Sat Aug 18 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-2
- ExcludeArch ppc64
- Fix one more hard-coding problem for x86_64
diff --git a/sources b/sources
index 520f700..51c7de5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+19a9c137ef78aad2a21ad851de99ed27 Ice-3.5.0.tar.gz
9de1981bdb81c6fc4c5d1c0fef73dd5b ice-3.4.2-man-pages.tar.gz
-957a29dcfadbc19443d1441f6f2beaf2 Ice-3.5b.tar.gz
More information about the scm-commits
mailing list