Mon Jun 9 15:40:09 UTC 2008

Author: mef

Update of /cvs/pkgs/rpms/ice/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14444

Modified Files:
	.cvsignore IceGridAdmin.desktop ice.spec sources 
Added Files:
	Ice-3.3-dont-build-demo-test.patch Ice-3.3.0-README.Fedora 
	Ice-3.3.0-java-Timer.patch Ice-3.3.0-java-build.patch 
	Ice-3.3.0-jgoodies.patch 
Removed Files:
	527d1189575595-patch-1-ice-3-2-1-icedotnet-patch1.txt 
	530d1190105491-patch-2-ice-3-2-1-fix-icegrid-application-update-bug-patch.txt 
	531d1190619626-patch-3-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch3.txt 
	534d1192152933-patch-4-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch4.txt 
	541d1194844106-1-attachment-s-patch-5-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch5.txt 
	Ice-3.2.0-chkconfig-pidfiles.patch 
	Ice-3.2.0-chkconfig-runlevels.patch 
	Ice-3.2.0-dont-build-test.patch Ice-3.2.0-remove-assert.patch 
	Ice-3.2.1-README.Fedora Ice-3.2.1-gcc43.patch 
	Ice-3.2.1-template-path.patch 
	IceCS-3.2.1-dont-build-test.patch IceCS-3.2.1-use-gac.patch 
	IceJ-3.2.0-build-gui.patch IceJ-3.2.0-use-java2.patch 
	IceJ-3.2.0-use-java5.patch 
Log Message:
Update to 3.3


Ice-3.3-dont-build-demo-test.patch:

--- NEW FILE Ice-3.3-dont-build-demo-test.patch ---
diff -ur Ice-3.3.0.orig/cpp/Makefile Ice-3.3.0/cpp/Makefile
--- Ice-3.3.0.orig/cpp/Makefile	2008-05-16 18:24:00.000000000 +0100
+++ Ice-3.3.0/cpp/Makefile	2008-05-21 11:18:17.000000000 +0100
@@ -11,7 +11,7 @@
 
 include $(top_srcdir)/config/Make.rules
 
-SUBDIRS		= config src include test demo
+SUBDIRS		= config src include
 
 INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
 
diff -ur Ice-3.3.0.orig/cs/Makefile Ice-3.3.0/cs/Makefile
--- Ice-3.3.0.orig/cs/Makefile	2008-05-16 18:24:01.000000000 +0100
+++ Ice-3.3.0/cs/Makefile	2008-05-21 11:18:22.000000000 +0100
@@ -11,7 +11,7 @@
 
 include $(top_srcdir)/config/Make.rules.cs
 
-SUBDIRS		= src test demo
+SUBDIRS		= src
 
 install:: install-common
 	@if test ! -d $(install_bindir) ; \


--- NEW FILE Ice-3.3.0-README.Fedora ---
======================================================================
The Internet Communications Engine
======================================================================

Ice is a modern alternative to object middleware such as CORBA or
COM/DCOM/COM+. It is easy to learn, yet provides a powerful network
infrastructure for demanding technical applications. It features an
object-oriented specification language, easy to use C++, C#, Java,
Python, Ruby, PHP, and Visual Basic mappings, a highly efficient
protocol, asynchronous method invocation and dispatch, dynamic
transport plug-ins, TCP/IP and UDP/IP support, SSL-based security, a
firewall solution, and much more.

Ice is available under the terms of the GNU General Public License
(GPL) (see LICENSE file). Commercial licenses are available for
customers who wish to use Ice with proprietary products. Please
contact sales at zeroc.com for more information about licensing Ice.


======================================================================
About this distribution
======================================================================

This distribution is an RPM release of the Ice 3.3.0 run time for
Fedora and includes executables for the Ice services, HTML
documentation, Slice files, and the C++ runtime libraries. It has been
modified from the RPM distribution provided through
http://www.zeroc.com/download.html to meet Fedora packaging standards.

Additional Ice components are provided in separate RPM packages:

- Run time libraries for Java, Python, PHP, Ruby and C# (Mono). These
  libraries enable you to execute Ice applications. (ice-java,
  ice-python, ice-php, ice-ruby, ice-csharp)

- Development kits for C++, Java, Python, Ruby, and C# (Mono). A
  development kit is required for building Ice applications using a
  supported language mapping. (ice-devel, ice-java-devel,
  ice-python-devel, ice-ruby-devel, ice-csharp-devel)

- Sample /etc/init.d scripts. (ice-servers)

- The graphical IceGrid administrative tool. (icegrid-gui)

These RPMS can all also be installed through yum.


======================================================================
Setting up your environment to use Ice
======================================================================


C++
---

No additional compiler or linker options are required for an RPM
installation of the Ice for C++ development kit.


Java
----

To use Ice for Java with Java5 or Java6, add Ice.jar to your CLASSPATH,
as shown in the following bash command:

$ export CLASSPATH=`build-classpath Ice`:$CLASSPATH

Note that the Freeze component of Ice for Java requires Berkeley DB.
In order to use Freeze, you must add db.jar to your CLASSPATH. In
addition, the JVM requires the directory containing the Berkeley DB
libraries to be listed in java.library.path, therefore you must add
this directory to your LD_LIBRARY_PATH. Assuming you are using the RPM
installation of Berkeley DB, the bash command is shown below:

$ export LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH

On a x86_64 system with a 64-bit JVM, the 64-bit Berkeley DB libraries
are installed in /usr/lib64, so use instead:

$ export LD_LIBRARY_PATH=/usr/lib64:$LD_LIBRARY_PATH

When using the Ice for Java SSL plugin (IceSSL), you may experience
occasional hangs. The most likely reason is that your system's entropy
pool is empty. If you have sufficient system privileges, you can solve
this issue by editing the following file

<java.home>/jre/lib/security/java.security

and changing it to use /dev/urandom instead of /dev/random. If you do
not have permission to modify the security file, you can also use the
command-line option shown below:

$ java -Djava.security.egd=file:/dev/urandom MyClass ...

On SuSE Linux Enterprise Server, you may experience occasional hangs 
the first time an Ice object adapter is activated within a JVM. A 
work-around is to disable IPv6 support by setting the Java property 
java.net.preferIPv4Stack to true. For example:

$ java -Djava.net.preferIPv4Stack=true MyClass ...

For more information on this issue, refer to Sun's bug database:

  http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6483406


Python
------

The RPM installation puts the Python libraries into the correct
sitelib directories; there is no need for any additional configuration
to use them.


C#/Mono
-------

The RPM installation adds the C# runtime libraries to the global
assembly cache (GAC), so that no changes to your environment are
necessary to locate the assemblies.

The instructions for running the demos assume that you have configured
your kernel to automatically execute the Mono interpreter. To do this,
run the following commands as root (replace /usr/bin/mono with the
location of your mono interpreter):

    if [ ! -e /proc/sys/fs/binfmt_misc/register ]; then
        /sbin/modprobe binfmt_misc 
        mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
    fi 
    if [ -e /proc/sys/fs/binfmt_misc/register ]; then
        echo ':CLR:M::MZ::/usr/bin/mono:' > /proc/sys/fs/binfmt_misc/register
    else
        echo "No binfmt_misc support" exit 1
    fi 

If you don't want to do this you need to run the executable with
mono. For example,

$ mono server.exe


Ruby
----

The RPM installation puts the Ruby libraries into the correct
sitelib directories; there is no need for any additional configuration
to use them.


PHP
---

The Ice extension for PHP is loaded automatically when the interpreter
loads the contents of the file /etc/php.d/ice.ini.

extension=IcePHP.so

You can modify this file to include additional configuration 
directives, such as those used by the Ice extension.

At run time, the PHP interpreter requires the Ice shared libraries as 
well as the Slice preprocessor (icecpp).

You can verify that the Ice extension is installed properly by 
examining the output of the "php -m" command, or by calling the
phpinfo() function from a script.


SELinux Notes
--------------------------------------------------

SELinux augments the traditional Unix permissions with a number of
new features. In particular, SELinux can prevent the httpd daemon from
opening network connections and reading files without the proper
SELinux types.

If you suspect that your IcePHP application does not work due to
SELinux restrictions, we recommend that you first try it with SELinux
disabled. As root, run:

# setenforce 0

to disable SELinux until the next reboot of your computer.

If you want to run httpd with IcePHP and SELinux enabled, you must do
the following:

- Allow httpd to open network connections:

  # setsebool httpd_can_network_connect=1 

  (add the -P option to make this setting persistent across reboots)

- Make sure any .ice file used by your PHP scripts can be read by 
  httpd. The enclosing directory also needs to be accessible. For
  example:

  # chcon -R -t httpd_sys_content_t /opt/MyApp/slice 

For more information on SELinux, refer to the link below:

  http://www.redhat.com/docs/manuals/enterprise/RHEL-4-Manual/selinux-guide/


======================================================================
/etc/init.d scripts
======================================================================

The ice-servers includes the following sample /etc/init.d scripts and
associated configuration files:

- /etc/init.d/icegridregistry and /etc/icegridregistry.conf
- /etc/init.d/icegridnode and /etc/icegridnode.conf
- /etc/init.d/glacier2router and /etc/glacier2router.conf

This RPM also creates an "iceuser" account to run the services.

None of these services are enabled during the RPM installation; you 
need to manually enable the desired service(s) using the chkconfig
command, for example:

# chkconfig --add icegridregistry

Before doing so, please review the script itself and its associated
configuration file. For icegridregistry and icegridnode, you also need
to create 'data' directories with the proper permissions (refer to the
.conf files).


======================================================================
Using the IceGrid Administrative Console
======================================================================

The Java-based graphical tool for administering IceGrid applications
can be run as follows:

$ icegridgui

Full documentation of this tool is at the following URL:

    http://www.zeroc.com/doc/latest/IceGridAdmin/


======================================================================
Demos and documentation
======================================================================

Sample programs are provided in the Ice-3.3.0-demos.tar.gz package,
which can be downloaded from the ZeroC web site at

  http://www.zeroc.com/download.html

Please refer to the README.DEMOS file included in that package for
more information.

See doc/README.html for information on the documentation included with
this distribution.


======================================================================
Binary compatibility
======================================================================

Patch releases of Ice are binary compatible. For example, version
<x>.<y>.1 is compatible with <x>.<y>.0, so you can run applications
compiled with <x>.<y>.0 with the <x>.<y>.1 runtime without having to
recompile.

With the binary installers, simply uninstall the previous version of
Ice and install the new one. Already deployed applications that were
compiled against the <x>.<y>.0 runtime will automatically use the
<x>.<y>.1 runtime.

Note: Under Mono, binary compatibility currently does not work due to
      issues with Mono. Until this problem in Mono is fixed, you
      cannot run applications compiled with previous minor versions of
      Ice against a newer version of the Ice assemblies. For example,
      an application compiled with version <x>.<y>.0 of Ice cannot run
      with the <x>.<y>.1 Ice assemblies.

[ This file was modified by Mary Ellen Foster from the original
README.Linux-RPM distributed by ZeroC. ]

Ice-3.3.0-java-Timer.patch:

--- NEW FILE Ice-3.3.0-java-Timer.patch ---
diff -urN Ice-3.3.0.orig/java/src/IceInternal/Timer.java Ice-3.3.0/java/src/IceInternal/Timer.java
--- Ice-3.3.0.orig/java/src/IceInternal/Timer.java	2008-05-16 18:24:03.000000000 +0100
+++ Ice-3.3.0/java/src/IceInternal/Timer.java	2008-05-22 10:20:36.000000000 +0100
@@ -9,20 +9,6 @@
 
 package IceInternal;
 
-//
-// NOTE: We don't use the java.util.Timer class for few reasons. The
-// Java TimerTask is a class not an interface making it more difficult
-// to use. The API is also a bit different, cancel() is a TimerTask
-// method not a Timer method and calling purge() on the timer on a
-// regular basis is required to allow canceled timer task objects to
-// be garbage collected.
-//
-
-interface TimerTask
-{
-    void runTimerTask();
-}
-
 public final class Timer extends Thread
 {
     //
diff -urN Ice-3.3.0.orig/java/src/IceInternal/TimerTask.java Ice-3.3.0/java/src/IceInternal/TimerTask.java
--- Ice-3.3.0.orig/java/src/IceInternal/TimerTask.java	1970-01-01 01:00:00.000000000 +0100
+++ Ice-3.3.0/java/src/IceInternal/TimerTask.java	2008-05-22 10:20:36.000000000 +0100
@@ -0,0 +1,16 @@
+package IceInternal;
+
+//
+// NOTE: We don't use the java.util.Timer class for few reasons. The
+// Java TimerTask is a class not an interface making it more difficult
+// to use. The API is also a bit different, cancel() is a TimerTask
+// method not a Timer method and calling purge() on the timer on a
+// regular basis is required to allow canceled timer task objects to
+// be garbage collected.
+//
+
+public interface TimerTask
+{
+    void runTimerTask();
+}
+

Ice-3.3.0-java-build.patch:

--- NEW FILE Ice-3.3.0-java-build.patch ---
diff -ur Ice-3.3.0.orig/java/build.xml Ice-3.3.0/java/build.xml
--- Ice-3.3.0.orig/java/build.xml	2008-05-16 18:24:02.000000000 +0100
+++ Ice-3.3.0/java/build.xml	2008-05-21 11:21:45.000000000 +0100
@@ -188,10 +188,6 @@
             <exclude name="IceGridGUI/**"/>
             <exclude name="ant/**"/>
             <exclude name="*.jar"/>
-            <manifest>
-                <attribute name="Built-By" value="ZeroC, Inc."/>
-                <attribute name="Class-Path" value="db.jar /usr/share/java/db-${db.version}.jar ../db.jar"/>
-            </manifest>
         </jar>
     </target>
 
@@ -220,13 +216,12 @@
     </condition>
 
     <target name="icegridadmin-plain-jar" depends="icegridadmin-compile" if="build-icegridadmin-plain-jar">
-        <manifest file="${lib.dir}/icegridgui.mf">
-            <attribute name="Class-Path" value="Ice.jar ../resources/"/>
-        </manifest>
-        <jar jarfile="${lib.dir}/IceGridGUI.jar" manifest="${lib.dir}/icegridgui.mf" basedir="${lib.dir}">
+        <jar jarfile="${lib.dir}/IceGridGUI.jar" basedir="${lib.dir}">
             <include name="IceGridGUI/**"/>
         </jar>
-        <delete file="${lib.dir}/icegridgui.mf" />
+        <jar jarfile="${lib.dir}/IceGridGUI.jar" basedir="resources" update="true">
+            <include name="icons/**"/>
+        </jar>
     </target>
 
     <target name="icegridadmin-pro-jar" depends="icegridadmin-compile" if="build-icegridadmin-pro-jar">
@@ -284,8 +279,10 @@
     <target name="jar" depends="ice-jar, icegridadmin-plain-jar, icegridadmin-pro-jar"/>
 
     <target name="all" depends="jar">
+      <!--
         <ant inheritAll="false" dir="demo"/>
         <ant inheritAll="false" dir="test"/>
+      -->
     </target>
 
     <target name="install-common">
diff -ur Ice-3.3.0.orig/java/config/build.properties Ice-3.3.0/java/config/build.properties
--- Ice-3.3.0.orig/java/config/build.properties	2008-05-16 18:24:02.000000000 +0100
+++ Ice-3.3.0/java/config/build.properties	2008-05-21 11:22:17.000000000 +0100
@@ -36,7 +36,7 @@
 # These properties only need to be set if you want to build the
 # standalone jar for the IceGrid GUI.
 #
-jgoodies.forms  = /usr/share/java/forms-1.2.0.jar
-jgoodies.looks  = /usr/share/java/looks-2.1.4.jar
+jgoodies.forms  = /usr/share/java/jgoodies-forms.jar
+jgoodies.looks  = /usr/share/java/jgoodies-looks.jar
 #jgoodies.forms = C:/Ice-3.3.0-ThirdParty-VC80/lib/forms-1.2.0.jar
 #jgoodies.looks = C:/Ice-3.3.0-ThirdParty-VC80/lib/looks-2.1.4.jar

Ice-3.3.0-jgoodies.patch:

--- NEW FILE Ice-3.3.0-jgoodies.patch ---
diff -ur Ice-3.3.0.orig/java/src/IceGridGUI/ApplicationPane.java Ice-3.3.0/java/src/IceGridGUI/ApplicationPane.java
--- Ice-3.3.0.orig/java/src/IceGridGUI/ApplicationPane.java	2008-05-16 18:24:02.000000000 +0100
+++ Ice-3.3.0/java/src/IceGridGUI/ApplicationPane.java	2008-05-21 11:22:58.000000000 +0100
@@ -26,9 +26,6 @@
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
-import com.jgoodies.looks.Options;
-import com.jgoodies.looks.plastic.PlasticLookAndFeel;
-import com.jgoodies.looks.windows.WindowsLookAndFeel;
 import com.jgoodies.forms.factories.Borders;
 
 import IceGrid.*;
diff -ur Ice-3.3.0.orig/java/src/IceGridGUI/LiveDeploymentPane.java Ice-3.3.0/java/src/IceGridGUI/LiveDeploymentPane.java
--- Ice-3.3.0.orig/java/src/IceGridGUI/LiveDeploymentPane.java	2008-05-16 18:24:02.000000000 +0100
+++ Ice-3.3.0/java/src/IceGridGUI/LiveDeploymentPane.java	2008-05-21 11:23:07.000000000 +0100
@@ -26,9 +26,6 @@
 import javax.swing.tree.TreeSelectionModel;
 import javax.swing.tree.TreePath;
 
-import com.jgoodies.looks.Options;
-import com.jgoodies.looks.plastic.PlasticLookAndFeel;
-import com.jgoodies.looks.windows.WindowsLookAndFeel;
 import com.jgoodies.forms.factories.Borders;
 
 import IceGrid.*;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Aug 2007 05:02:22 -0000	1.2
+++ .cvsignore	9 Jun 2008 15:39:16 -0000	1.3
@@ -1,7 +1,3 @@
-Ice-3.2.1.tar.gz
-Ice-rpmbuild-3.2.0.tar.gz
-IceCS-3.2.1.tar.gz
-IceJ-3.2.1-java5.tar.gz
-IcePHP-3.2.1.tar.gz
-IcePy-3.2.1.tar.gz
-IceRuby-3.2.1.tar.gz
+Ice-3.3.0-man-pages.tbz
+Ice-3.3.0.tar.gz
+Ice-rpmbuild-3.3.0.tar.gz


Index: IceGridAdmin.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-9/IceGridAdmin.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IceGridAdmin.desktop	21 Nov 2007 15:48:02 -0000	1.2
+++ IceGridAdmin.desktop	9 Jun 2008 15:39:16 -0000	1.3
@@ -4,7 +4,7 @@
 GenericName=IceGrid Admin
 Comment=Graphical administration tool for IceGrid
 Exec=icegridgui
-Icon=icegrid.png
+Icon=icegrid
 Terminal=false
 Type=Application
 Categories=Development;


Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-9/ice.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ice.spec	22 Feb 2008 14:53:11 -0000	1.11
+++ ice.spec	9 Jun 2008 15:39:16 -0000	1.12
@@ -9,68 +9,42 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
 Name: ice
-Version: 3.2.1
-Release: 17%{?dist}
+Version: 3.3b
+Release: 1%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
 License: GPLv2 with exceptions
 URL: http://www.zeroc.com/
-Source0:        http://www.zeroc.com/download/Ice/3.2/Ice-%{version}.tar.gz
-Source1:        http://www.zeroc.com/download/Ice/3.2/Ice-rpmbuild-3.2.0.tar.gz
-Source2:        http://www.zeroc.com/download/Ice/3.2/IceJ-%{version}-java5.tar.gz
-Source3:        http://www.zeroc.com/download/Ice/3.2/IcePHP-%{version}.tar.gz
-Source4:        http://www.zeroc.com/download/Ice/3.2/IcePy-%{version}.tar.gz
-Source5:        http://www.zeroc.com/download/Ice/3.2/IceRuby-%{version}.tar.gz
-Source6:        http://www.zeroc.com/download/Ice/3.2/IceCS-%{version}.tar.gz
-Source7:        %{name}.pth
+Source0:        http://www.zeroc.com/download/Ice/3.3/Ice-%{version}.tar.gz
+Source1:        http://www.zeroc.com/download/Ice/3.2/Ice-rpmbuild-%{version}.tar.gz
 Source8:        icegridgui
 Source9:        IceGridAdmin.desktop
-Source10:       Ice-3.2.1-README.Fedora
-Patch0:         Ice-3.2.0-chkconfig-runlevels.patch
-Patch1:         Ice-3.2.0-chkconfig-pidfiles.patch
-Patch2:         Ice-3.2.0-remove-assert.patch
-Patch3:         IceJ-3.2.0-build-gui.patch
-Patch4:         IceJ-3.2.0-use-java2.patch
-Patch5:         IceJ-3.2.0-use-java5.patch
-Patch6:         Ice-3.2.0-dont-build-test.patch
-Patch7:         IceCS-3.2.1-dont-build-test.patch
-Patch8:         IceCS-3.2.1-use-gac.patch
-Patch9:         http://www.zeroc.com/forums/attachments/patches/527d1189575595-patch-1-ice-3-2-1-icedotnet-patch1.txt
-Patch10:        http://www.zeroc.com/forums/attachments/patches/530d1190105491-patch-2-ice-3-2-1-fix-icegrid-application-update-bug-patch.txt
-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
-# Based on the Debian patch by Francisco Moya at 
-# http://www.zeroc.com/forums/patches/3504-ice-c-missing-includes.html
-Patch15:        Ice-3.2.1-gcc43.patch
+Source9:        IceGridAdmin.desktop
+Source10:       Ice-3.3-README.Fedora
+Patch0:         ice-file-compare.patch.txt
+Patch1:         Ice-3.3b-java-compile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ice doesn't officially support this architecture at all
 ExcludeArch:    ppc64
 
 # Some file suffixes we need to grab the right stuff for the file lists
-%define soversion 32
+%define soversion 33b
 
 BuildRequires: db4-devel, expat-devel, openssl-devel, bzip2-devel
 BuildRequires: ant, ant-nodeps, jpackage-utils, db4-java
 BuildRequires: php, php-devel
 BuildRequires: ruby, ruby(abi) = 1.8, ruby-devel
 BuildRequires: python-devel
-BuildRequires: mono-core
+BuildRequires: mono-core, mono-devel
+BuildRequires: libmcpp-devel >= 2.7.1
 
-%if %{java5}
 BuildRequires:  java-devel >= 1.5.0
-%else
-BuildRequires:  java-devel >= 1.4.2
-%endif
 
-%if %{icegridgui}
 BuildRequires:  jgoodies-forms, jgoodies-looks
 BuildRequires:  /usr/bin/convert
 BuildRequires:  desktop-file-utils
-%endif
 
 %description
 Ice is a modern alternative to object middleware such as CORBA or
@@ -190,88 +164,44 @@
 
 %prep
 %setup -n Ice-%{version} -q
-%patch6 -p1
-%patch9 -p2
-%patch10 -p2
-%patch11 -p2
-%patch12 -p2
-%patch14 -p2
-%patch15 -p1
-
-# Fix some permission issues/
-chmod a-x config/*.py
-chmod a-x doc/images/*.gif
-
-# Delete the pre-compiled .class file so we can rebuild it later
-rm src/ca/ImportKey.class
-
-%setup -c -q -n Ice-rpmbuild-%{version} -T -b 1
 %patch0 -p1
-%patch1 -p1
-%patch13 -p1
-
-%setup -q -n IceJ-%{version}-java5 -T -b 2
-%patch2 -p1
-%if %{icegridgui}
-%patch3 -p1
-%endif
-%if %{java5}
-%patch5 -p1
-%else
-%patch4 -p1
-%endif
-
-%setup -q -n IcePHP-%{version} -T -b 3
-%setup -q -n IcePy-%{version} -T -b 4
-%setup -q -n IceRuby-%{version} -T -b 5
-%setup -q -n IceCS-%{version} -T -b 6
-%patch7 -p1
-%patch8 -p1
+%setup -q -n Ice-rpmbuild-%{version} -T -b 1
+cd ${RPM_BUILD_DIR}/Ice-%{version}/java
+%patch1 -p2
 
 %build
 # Compile the main Ice runtime
-cd ${RPM_BUILD_DIR}/Ice-%{version}
+cd ${RPM_BUILD_DIR}/Ice-%{version}/cpp/src
 make CXXFLAGS="%{optflags} -fPIC" CFLAGS="%{optflags} -fPIC" embedded_runpath_prefix=""
 
-# Point to the newly-built ICE stuff so other compiles work
-export ICE_HOME=$RPM_BUILD_DIR/Ice-%{version} 
-export LD_LIBRARY_PATH=$ICE_HOME/lib:$LD_LIBRARY_PATH
-
 # Set the CLASSPATH correctly for subsequent compiles
 export CLASSPATH=`build-classpath db jgoodies-forms jgoodies-looks ant`
 
 # Rebuild the Java class
-cd src/ca
-javac -source 1.4 -target 1.4 ImportKey.java
-
-# Stuff for java-devel
-cd $RPM_BUILD_DIR/IceJ-%{version}-java5/ant
+cd ca
 rm *.class
-javac -d . -source 1.4 -target 1.4 *.java
-jar cvf ant-ice-%{version}.jar *.class
+# javac -source 1.4 -target 1.4 ImportKey.java
+javac ImportKey.java
 
-# Build the Java stuff
-cd $RPM_BUILD_DIR/IceJ-%{version}-java5
+# Stuff for java-devel
+cd $RPM_BUILD_DIR/Ice-%{version}/java
 ant clean
-ant ice-jar
+ant jar
 
-%if %{icegridgui}
-ant icegridadmin-plain-jar
-# Create a .png icon
+# Create the IceGrid icon
 cd resources/icons
 convert icegrid.ico temp.png
 mv temp-8.png icegrid.png
 rm temp*.png
-%endif
 
-cd $RPM_BUILD_DIR/IceCS-%{version}
+cd $RPM_BUILD_DIR/Ice-%{version}/cs/src
 make OPTIMIZE=yes
 
-cd $RPM_BUILD_DIR/IcePHP-%{version}
+cd $RPM_BUILD_DIR/Ice-%{version}/php/src
 make CXXFLAGS="%{optflags} -fPIC" embedded_runpath_prefix=""
-cd $RPM_BUILD_DIR/IcePy-%{version}
+cd $RPM_BUILD_DIR/Ice-%{version}/py
 make CXXFLAGS="%{optflags} -fPIC" embedded_runpath_prefix=""
-cd $RPM_BUILD_DIR/IceRuby-%{version}
+cd $RPM_BUILD_DIR/Ice-%{version}/rb
 make CXXFLAGS="%{optflags} -fPIC" embedded_runpath_prefix=""
 
 %install
@@ -279,30 +209,21 @@
 
 # Do the basic "make install"
 cd $RPM_BUILD_DIR/Ice-%{version}
-make prefix=$RPM_BUILD_ROOT embedded_runpath_prefix="" install
-# We don't want visual basic :)
-rm $RPM_BUILD_ROOT/bin/slice2vb
-
-cd $RPM_BUILD_DIR/IcePy-%{version}
-make ICE_HOME=$RPM_BUILD_DIR/Ice-%{version} prefix=$RPM_BUILD_ROOT embedded_runpath_prefix="" install
-
-cd $RPM_BUILD_DIR/IcePHP-%{version}
-make ICE_HOME=$RPM_BUILD_DIR/Ice-%{version} prefix=$RPM_BUILD_ROOT install
-
-cd $RPM_BUILD_DIR/IceRuby-%{version}
-make OPTIMIZE=yes ICE_HOME=$RPM_BUILD_DIR/Ice-%{version} prefix=$RPM_BUILD_ROOT embedded_runpath_prefix="" install
+make prefix=$RPM_BUILD_ROOT GACINSTALL=yes GAC_ROOT=$RPM_BUILD_ROOT%{_libdir} embedded_runpath_prefix="" install
 
 # Install Java stuff where it wants to be
 mkdir -p ${RPM_BUILD_ROOT}%{_javadir}
-cp -p ${RPM_BUILD_DIR}/IceJ-%{version}-java5/lib/Ice.jar ${RPM_BUILD_ROOT}%{_javadir}/Ice-%{version}.jar
+mv ${RPM_BUILD_ROOT}/lib/ant-ice.jar $RPM_BUILD_ROOT%{_javadir}/ant-ice-%{version}.jar
+ln -s ant-ice-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant-ice.jar
+mv ${RPM_BUILD_ROOT}/lib/Ice.jar $RPM_BUILD_ROOT%{_javadir}/Ice-%{version}.jar
 ln -s Ice-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/Ice.jar
 
-# Install the GUI if we need it
-%if %{icegridgui}
+
+# Install the IceGrid GUI
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
-cp -p ${RPM_BUILD_DIR}/IceJ-%{version}-java5/lib/IceGridGUI.jar ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
+mv ${RPM_BUILD_ROOT}/lib/IceGridGUI.jar $RPM_BUILD_ROOT%{_datadir}/Ice-%{version}
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/
-cp -p ${RPM_BUILD_DIR}/IceJ-%{version}-java5/resources/icons/icegrid.png \
+cp -p ${RPM_BUILD_DIR}/Ice-%{version}/java/resources/icons/icegrid.png \
         ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 cp -p %{SOURCE8} ${RPM_BUILD_ROOT}%{_bindir}
@@ -310,19 +231,10 @@
 desktop-file-install \
         --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
         %{SOURCE9}
-%endif
-
-# Install the Mono stuff, using gacutil
-cd $RPM_BUILD_DIR/IceCS-%{version}
-mkdir $RPM_BUILD_ROOT%{_prefix}/lib
-make ICE_HOME=$RPM_BUILD_DIR/Ice-%{version} prefix=$RPM_BUILD_ROOT GAC_ROOT=$RPM_BUILD_ROOT%{_libdir} install
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mv $RPM_BUILD_ROOT/bin/iceboxnet.exe $RPM_BUILD_ROOT%{_bindir}
 
-# "Cleanup extra files" (from original ZeroC SRPM)
-rm    $RPM_BUILD_ROOT/config/Make.rules.cs
-
 # Move other rpm-specific files into the right place (README, service stuff)
 mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/Ice-%{version}
 cp -p %{SOURCE10} $RPM_BUILD_ROOT/%{_defaultdocdir}/Ice-%{version}/README.Fedora
@@ -347,13 +259,15 @@
 mv $RPM_BUILD_ROOT/include/* ${RPM_BUILD_ROOT}%{_includedir}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
 mv $RPM_BUILD_ROOT/%{_lib}/* $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/Ice-%{version}
+mv $RPM_BUILD_ROOT/help/* $RPM_BUILD_ROOT%{_defaultdocdir}/Ice-%{version}
 
 # .NET spec files (for csharp-devel)
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 
-for f in icecs glacier2cs iceboxcs icegridcs icepatch2cs icestormcs; 
+for f in IceGrid Glacier2 IceBox Ice IceStorm IcePatch2;
 do 
-    cp -p $RPM_BUILD_DIR/IceCS-%{version}/lib/pkgconfig/$f.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig 
+    cp -p $RPM_BUILD_DIR/Ice-%{version}/cs/lib/pkgconfig/$f.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig 
 done
 
 # Put the PHP stuff into the right place
@@ -371,10 +285,10 @@
 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}
+cp -p $RPM_BUILD_DIR/Ice-rpmbuild-%{version}/ice.pth $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}
+cp -p $RPM_BUILD_DIR/Ice-rpmbuild-%{version}/ice.pth $RPM_BUILD_ROOT%{python_sitearch}
 mv ${RPM_BUILD_ROOT}/python/* ${RPM_BUILD_ROOT}%{python_sitelib}/Ice
 
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
@@ -383,18 +297,14 @@
 # Somehow, some files under "slice" end up with executable permissions -- ??
 find ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version} -name "*.ice" | xargs chmod a-x
 # Move ImportKey.class into the share directory
-mv $RPM_BUILD_ROOT%{_bindir}/ImportKey.class ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
+mv $RPM_BUILD_ROOT%{_libdir}/ImportKey.class ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
 
 mkdir -p ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version}
-mv $RPM_BUILD_ROOT/doc/reference ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version}
-rm -rf $RPM_BUILD_ROOT/doc
+# mv $RPM_BUILD_ROOT/doc/reference ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version}
+# rm -rf $RPM_BUILD_ROOT/doc
 mv $RPM_BUILD_ROOT/ICE_LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version}/ICE_LICENSE
 mv $RPM_BUILD_ROOT/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version}/LICENSE
 
-# Copy the Ant task files into the right place
-mkdir -p ${RPM_BUILD_ROOT}%{_javadir}
-cp -p -r ${RPM_BUILD_DIR}/IceJ-%{version}-java5/ant/ant-ice-%{version}.jar ${RPM_BUILD_ROOT}%{_javadir}
-ln -s ant-ice-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant-ice.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -408,11 +318,11 @@
 %{_bindir}/glacier2router
 %{_bindir}/icebox
 %{_bindir}/iceboxadmin
-%{_bindir}/icecpp
 %{_bindir}/icepatch2calc
 %{_bindir}/icepatch2client
 %{_bindir}/icepatch2server
 %{_bindir}/icestormadmin
+%{_bindir}/icestormmigrate
 %{_bindir}/slice2docbook
 %{_bindir}/slice2html
 %{_bindir}/icegridadmin
@@ -449,8 +359,7 @@
 %{_datadir}/Ice-%{version}/ImportKey.class
 %attr(755,root,root) %{_datadir}/Ice-%{version}/convertssl.py*
 %attr(755,root,root) %{_datadir}/Ice-%{version}/upgradeicegrid.py*
-%attr(755,root,root) %{_datadir}/Ice-%{version}/upgradeicestorm.py*
-%{_datadir}/Ice-%{version}/icegrid-slice.3.1.ice.gz
+%{_datadir}/Ice-%{version}/icegrid-slice.*.ice.gz
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -546,35 +455,40 @@
 
 %files csharp
 %defattr(-,root,root,-)
-%dir %{_libdir}/mono/gac/glacier2cs
-%{_libdir}/mono/gac/glacier2cs/%{version}.*/
-%{_libdir}/mono/glacier2cs/
-%dir %{_libdir}/mono/gac/icecs
-%{_libdir}/mono/gac/icecs/%{version}.*/
-%{_libdir}/mono/icecs/
-%dir %{_libdir}/mono/gac/iceboxcs
-%{_libdir}/mono/gac/iceboxcs/%{version}.*/
-%{_libdir}/mono/iceboxcs/
-%dir %{_libdir}/mono/gac/icegridcs
-%{_libdir}/mono/gac/icegridcs/%{version}.*/
-%{_libdir}/mono/icegridcs/
-%dir %{_libdir}/mono/gac/icepatch2cs
-%{_libdir}/mono/gac/icepatch2cs/%{version}.*/
-%{_libdir}/mono/icepatch2cs/
-%dir %{_libdir}/mono/gac/icestormcs
-%{_libdir}/mono/gac/icestormcs/%{version}.*/
-%{_libdir}/mono/icestormcs/
+%dir %{_libdir}/mono/Glacier2/
+%{_libdir}/mono/Glacier2/Glacier2.dll
+%dir %{_libdir}/mono/Ice/
+%{_libdir}/mono/Ice/Ice.dll
+%dir %{_libdir}/mono/IceBox/
+%{_libdir}/mono/IceBox/IceBox.dll
+%dir %{_libdir}/mono/IceGrid/
+%{_libdir}/mono/IceGrid/IceGrid.dll
+%dir %{_libdir}/mono/IcePatch2/
+%{_libdir}/mono/IcePatch2/IcePatch2.dll
+%dir %{_libdir}/mono/IceStorm/
+%{_libdir}/mono/IceStorm/IceStorm.dll
+
+%{_libdir}/mono/gac/Glacier2/*
+%{_libdir}/mono/gac/Ice/*
+%{_libdir}/mono/gac/IceBox/*
+%{_libdir}/mono/gac/IceGrid/*
+%{_libdir}/mono/gac/IcePatch2/*
+%{_libdir}/mono/gac/IceStorm/*
+
+%{_libdir}/mono/gac/policy*
+%{_libdir}/mono/policy*
+
 %{_bindir}/iceboxnet.exe
 
 %files csharp-devel
 %defattr(-,root,root,-)
 %{_bindir}/slice2cs
-%{_libdir}/pkgconfig/icecs.pc
-%{_libdir}/pkgconfig/glacier2cs.pc
-%{_libdir}/pkgconfig/iceboxcs.pc
-%{_libdir}/pkgconfig/icegridcs.pc
-%{_libdir}/pkgconfig/icepatch2cs.pc
-%{_libdir}/pkgconfig/icestormcs.pc
+%{_libdir}/pkgconfig/Glacier2.pc
+%{_libdir}/pkgconfig/Ice.pc
+%{_libdir}/pkgconfig/IceBox.pc
+%{_libdir}/pkgconfig/IceGrid.pc
+%{_libdir}/pkgconfig/IcePatch2.pc
+%{_libdir}/pkgconfig/IceStorm.pc
 
 %files python
 %defattr(644,root,root,755)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Aug 2007 05:02:22 -0000	1.2
+++ sources	9 Jun 2008 15:39:16 -0000	1.3
@@ -1,7 +1,3 @@
-77bb04788747d0f4f7ef35f7a4c2800f  Ice-3.2.1.tar.gz
-b79dd6b6c205519c5bae1900379d1b6c  Ice-rpmbuild-3.2.0.tar.gz
-a95b99fd09d214dec4cd430638d9adcc  IceCS-3.2.1.tar.gz
-2f93e7abed123ea36bbd2b8e2840eb29  IceJ-3.2.1-java5.tar.gz
-e32a8988dfae57775d9c71e7ace4c687  IcePHP-3.2.1.tar.gz
-2fdd8add2ea6271894392645f768e147  IcePy-3.2.1.tar.gz
-17c61065ab67c232283d8710302379d3  IceRuby-3.2.1.tar.gz
+c6c17ee1be2e6b615af5b40edae88b75  Ice-3.3.0-man-pages.tbz
+0500306d9cdbc0fbb553fbb529de557a  Ice-3.3.0.tar.gz
+a2ec3283dc17feb2d1089391e369f838  Ice-rpmbuild-3.3.0.tar.gz


--- 527d1189575595-patch-1-ice-3-2-1-icedotnet-patch1.txt DELETED ---


--- 530d1190105491-patch-2-ice-3-2-1-fix-icegrid-application-update-bug-patch.txt DELETED ---


--- 531d1190619626-patch-3-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch3.txt DELETED ---


--- 534d1192152933-patch-4-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch4.txt DELETED ---


--- 541d1194844106-1-attachment-s-patch-5-ice-3-2-1-fix-slice2cs-ice-3.2.1-patch5.txt DELETED ---


--- Ice-3.2.0-chkconfig-pidfiles.patch DELETED ---


--- Ice-3.2.0-chkconfig-runlevels.patch DELETED ---


--- Ice-3.2.0-dont-build-test.patch DELETED ---


--- Ice-3.2.0-remove-assert.patch DELETED ---


--- Ice-3.2.1-README.Fedora DELETED ---


--- Ice-3.2.1-gcc43.patch DELETED ---


--- Ice-3.2.1-template-path.patch DELETED ---


--- IceCS-3.2.1-dont-build-test.patch DELETED ---


--- IceCS-3.2.1-use-gac.patch DELETED ---


--- IceJ-3.2.0-build-gui.patch DELETED ---


--- IceJ-3.2.0-use-java2.patch DELETED ---


--- IceJ-3.2.0-use-java5.patch DELETED ---


