rpms/ice/devel 541d1194844106-1-attachment-s-patch-5-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch5.txt, NONE, 1.1 IceGridAdmin.desktop, 1.1, 1.2 ice.spec, 1.5, 1.6

[Mary Ellen Foster (mef)]

Author: mef

Update of /cvs/pkgs/rpms/ice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24898

Modified Files:
	IceGridAdmin.desktop ice.spec 
Added Files:
	541d1194844106-1-attachment-s-patch-5-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch5.txt 
Log Message:
Add IceGridAdmin
Add new patch from ZeroC
Fix python bug



--- NEW FILE 541d1194844106-1-attachment-s-patch-5-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch5.txt ---
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp
index 0f4ff68..f96205a 100755
--- a/cpp/src/Slice/CsUtil.cpp
+++ b/cpp/src/Slice/CsUtil.cpp
@@ -808,13 +808,14 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
             out << nl << stream << ".writeSize(" << param << '.' << limitID << ");";
             out << nl << "for(int ix__ = 0; ix__ < " << param << '.' << limitID << "; ++ix__)";
             out << sb;
-            if(streamingAPI)
+            if(!isValueType(type))
             {
-                out << nl << param << "[ix__].ice_write(" << stream << ");";
+                out << nl << "(" << param << "[ix__] == null ? new " << typeS << "() : "
+                    << param << "[ix__])." << (streamingAPI ? "ice_write" : "write__") << "(" << stream << ");";
             }
             else
             {
-                out << nl << param << "[ix__].write__(" << stream << ");";
+                out << nl << param << "[ix__]." << (streamingAPI ? "ice_write" : "write__") << "(" << stream << ");";
             }
             out << eb;
             out << eb;


Index: IceGridAdmin.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/IceGridAdmin.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IceGridAdmin.desktop	31 Aug 2007 05:02:22 -0000	1.1
+++ IceGridAdmin.desktop	21 Nov 2007 15:48:02 -0000	1.2
@@ -7,5 +7,4 @@
 Icon=icegrid.png
 Terminal=false
 Type=Application
-Categories=Development
-Version=3.2.1
+Categories=Development;


Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/ice.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ice.spec	30 Oct 2007 18:05:32 -0000	1.5
+++ ice.spec	21 Nov 2007 15:48:02 -0000	1.6
@@ -1,6 +1,6 @@
 # Some defines for the Java subpackages
 %define java5 1
-%define icegridgui 0
+%define icegridgui 1
 
 # Get Python and Ruby packages into sitelib (see Fedora Wiki)
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
@@ -10,7 +10,7 @@
 
 Name: ice
 Version: 3.2.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -41,6 +41,7 @@
 Patch11:        http://www.zeroc.com/forums/attachments/patches/531d1190619626-patch-3-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch3.txt
 Patch12:        http://www.zeroc.com/forums/attachments/patches/534d1192152933-patch-4-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch4.txt
 Patch13:        Ice-3.2.1-template-path.patch
+Patch14:        http://www.zeroc.com/forums/attachments/patches/541d1194844106-1-attachment-s-patch-5-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch5.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ice doesn't officially support this architecture at all
@@ -128,6 +129,7 @@
 Requires: java
 Requires: ice-java = %{version}-%{release}, ice = %{version}-%{release}
 Requires: jgoodies-forms, jgoodies-looks
+Requires: jpackage-utils
 %description -n icegrid-gui
 Graphical administration tool for IceGrid
 %endif
@@ -190,6 +192,7 @@
 %patch10 -p2
 %patch11 -p2
 %patch12 -p2
+%patch14 -p2
 
 # Fix some permission issues/
 chmod a-x config/*.py
@@ -364,6 +367,7 @@
 mkdir -p ${RPM_BUILD_ROOT}%{ruby_sitearch}
 mv $RPM_BUILD_ROOT/ruby/* ${RPM_BUILD_ROOT}%{ruby_sitearch}
 mkdir -p ${RPM_BUILD_ROOT}%{python_sitearch}/Ice
+cp -p %{SOURCE7} $RPM_BUILD_ROOT%{python_sitearch}
 mv ${RPM_BUILD_ROOT}/python/IcePy.so* ${RPM_BUILD_ROOT}%{python_sitearch}/Ice
 mkdir -p ${RPM_BUILD_ROOT}%{python_sitelib}/Ice
 cp -p %{SOURCE7} $RPM_BUILD_ROOT%{python_sitelib}
@@ -525,7 +529,7 @@
 %defattr(-,root,root,-)
 %{_datadir}/Ice-%{version}/IceGridGUI.jar
 %attr(755,root,root) %{_bindir}/icegridgui
-%{_datadir}/applications/zeroc-IceGridAdmin.desktop
+%{_datadir}/applications/IceGridAdmin.desktop
 %{_datadir}/icons/hicolor/48x48/apps/icegrid.png
 %endif
 
@@ -572,6 +576,7 @@
 %defattr(644,root,root,755)
 %ifarch x86_64 ppc64
 %{python_sitearch}/Ice/
+%{python_sitearch}/%{name}.pth
 %endif
 %{python_sitelib}/Ice/
 %{python_sitelib}/%{name}.pth
@@ -594,6 +599,11 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Tue Nov 20 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-13
+- Enable the IceGrid GUI
+- Fix a problem with Python on 64-bit systems (bz #392751)
+- Incorporate one more Mono patch from ZeroC
+
 * Tue Oct 30 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-12
 - Put the slice2java classes into a .jar file instead of as bare classes
 - Incorporate all Ice 3.2.1 patches from ZeroC