Wed Mar 25 13:59:30 UTC 2009

Author: mef

Update of /cvs/pkgs/rpms/ice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29482

Modified Files:
	.cvsignore ice.spec sources 
Added Files:
	Ice-3.3.1-java-build.patch Ice-3.3.1-jgoodies.patch 
Removed Files:
	Ice-3.3.0-compression.patch 
	Ice-3.3.0-fix-slice2cpp-slice2freeze.patch 
	Ice-3.3.0-gcc-4.4.patch Ice-3.3.0-icegrid-assert.patch 
	Ice-3.3.0-icepatch-non-ascii.patch Ice-3.3.0-java-Timer.patch 
	Ice-3.3.0-java-build.patch Ice-3.3.0-jgoodies.patch 
	Ice-3.3.0-preprocess.patch Ice-3.3.0-python-26.patch 
	Ice-3.3.0-registry-crash.patch Ice-3.3.0-retry-intervals.patch 
	Ice-3.3.0-use-db4.7.patch 
Log Message:
Update to 3.3.1

Ice-3.3.1-java-build.patch:

--- NEW FILE Ice-3.3.1-java-build.patch ---
--- Ice-3.3.1/java/build.xml.orig	2009-03-20 18:52:15.000000000 +0100
+++ Ice-3.3.1/java/build.xml	2009-03-25 10:44:00.000000000 +0100
@@ -189,10 +189,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 db-${db.version}.jar /usr/share/java/db-${db.version}.jar ../db.jar"/>
-            </manifest>
         </jar>
     </target>
 
@@ -221,17 +217,12 @@
     </condition>
 
     <target name="icegridadmin-plain-jar" depends="icegridadmin-compile" if="build-icegridadmin-plain-jar">
-        <manifest file="${lib.dir}/icegridgui.mf">
-            <attribute name="Main-Class" value="IceGridGUI.Main"/>
-            <attribute name="Class-Path" value="Ice.jar ${jgoodies.forms} ${jgoodies.looks} ../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>
         <jar jarfile="${lib.dir}/IceGridGUI.jar" basedir="resources" update="true">
             <include name="icons/**"/>
         </jar>
-        <delete file="${lib.dir}/icegridgui.mf" />
     </target>
 
     <target name="icegridadmin-pro-jar" depends="icegridadmin-compile" if="build-icegridadmin-pro-jar">
@@ -289,8 +280,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">
--- Ice-3.3.1/java/config/build.properties.orig	2009-03-20 18:52:15.000000000 +0100
+++ Ice-3.3.1/java/config/build.properties	2009-03-25 10:44:44.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.1-ThirdParty-VC80/lib/forms-1.2.0.jar
 #jgoodies.looks = C:/Ice-3.3.1-ThirdParty-VC80/lib/looks-2.1.4.jar

Ice-3.3.1-jgoodies.patch:

--- NEW FILE Ice-3.3.1-jgoodies.patch ---
--- Ice-3.3.1/java/src/IceGridGUI/ApplicationPane.java.orig	2009-03-25 11:30:28.000000000 +0100
+++ Ice-3.3.1/java/src/IceGridGUI/ApplicationPane.java	2009-03-25 11:30:51.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.*;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Jun 2008 15:29:56 -0000	1.3
+++ .cvsignore	25 Mar 2009 13:59:00 -0000	1.4
@@ -1,3 +1,3 @@
-Ice-3.3.0.tar.gz
-Ice-rpmbuild-3.3.0.tar.gz
+Ice-3.3.1.tar.gz
+Ice-rpmbuild-3.3.1.tar.gz
 Ice-3.3.0-man-pages.tbz


Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/ice.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ice.spec	25 Feb 2009 06:36:02 -0000	1.29
+++ ice.spec	25 Mar 2009 13:59:00 -0000	1.30
@@ -3,51 +3,31 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
 Name: ice
-Version: 3.3.0
-Release: 14%{?dist}
+Version: 3.3.1
+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.3/Ice-%{version}.tar.gz
+# Extracted from http://zeroc.com/download/Ice/3.3/ice-3.3.1-1.src.rpm
 Source1:        Ice-rpmbuild-%{version}.tar.gz
 # Man pages courtesy of Francisco Moya's Debian packages
-Source2:        Ice-%{version}-man-pages.tbz
+Source2:        Ice-3.3.0-man-pages.tbz
 Source8:        icegridgui
 Source9:        IceGridAdmin.desktop
-Source10:       Ice-%{version}-README.Fedora
+Source10:       Ice-README.Fedora
 # Don't build the demo or test directories
 Patch0:         Ice-3.3-dont-build-demo-test.patch
 # Don't put manifest in jar; don't build demo or test; use system jgoodies
-Patch1:         Ice-3.3.0-java-build.patch
-# Don't include the Windows L&F
-Patch2:         Ice-3.3.0-jgoodies.patch
-# Move the TimerTask to its own source file
-Patch3:         Ice-3.3.0-java-Timer.patch
-# From http://www.zeroc.com/forums/patches/3798-patch-1-ice-3-3-0-fix-slice2cpp-slice2freeze.html
-Patch4:         Ice-3.3.0-fix-slice2cpp-slice2freeze.patch
-# Use the new DB4 methods
-Patch5:         Ice-3.3.0-use-db4.7.patch
-# Also allow Python 2.6
-Patch6:         Ice-3.3.0-python-26.patch
-# From http://www.zeroc.com/forums/patches/3895-patch-3-ice-3-3-0-c-compression-setting-not-always-honored.html
-Patch7:         Ice-3.3.0-compression.patch
-# From http://www.zeroc.com/forums/patches/3911-patch-4-ice-3-3-0-slice-translators-directory-write-access.html
-Patch8:         Ice-3.3.0-preprocess.patch
-# From http://www.zeroc.com/forums/patches/3982-patch-6-ice-3-3-0-icegrid-fixes-potential-registry-crash.html
-Patch9:         Ice-3.3.0-registry-crash.patch
-# From http://www.zeroc.com/forums/patches/4024-patch-7-ice-3-3-0-retry-bug-if-ice-retryintervals-set.html
-Patch10:        Ice-3.3.0-retry-intervals.patch
-# From http://www.zeroc.com/forums/patches/4029-patch-8-ice-3-3-0-icepatch2-non-ascii-file-names.html
-Patch11:        Ice-3.3.0-icepatch-non-ascii.patch
-# From http://www.zeroc.com/forums/patches/4076-patch-9-ice-3-3-0-icegrid-fixes-assert-when-application-synced-concurrently.html
-Patch12:        Ice-3.3.0-icegrid-assert.patch
-# From http://www.zeroc.com/forums/patches/4092-missing-include-fails-build-gcc-4-4-a.html
-Patch13:        Ice-3.3.0-gcc-4.4.patch
+Patch1:         Ice-3.3.1-java-build.patch
+# Remove reference to Windows L&F
+Patch2:         Ice-3.3.1-jgoodies.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Ice doesn't officially support this architecture at all
+# Ice doesn't officially support ppc64 at all
 # sparc64 doesnt have mono
 ExcludeArch:    ppc64 sparc64
 
@@ -184,21 +164,8 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%if 0%{?fedora} >= 10
-%patch5 -p1
-%endif
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
 %setup -q -n Ice-rpmbuild-%{version} -T -b 1
-%setup -q -n Ice-%{version}-man-pages -T -b 2
+%setup -q -n Ice-3.3.0-man-pages -T -b 2
 
 %build
 # Set the CLASSPATH correctly for the Java compile
@@ -282,7 +249,7 @@
 
 # Copy the man pages into the correct directory
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp -p $RPM_BUILD_DIR/Ice-%{version}-man-pages/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p $RPM_BUILD_DIR/Ice-3.3.0-man-pages/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 # Fix the encoding and line-endings of all the IceGridAdmin documentation files
 cd $RPM_BUILD_ROOT%{_defaultdocdir}/Ice-%{version}/IceGridAdmin
@@ -558,6 +525,14 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Wed Mar 25 2009 Mary Ellen Foster <mefoster at gmail.com> - 3.3.1-1
+- Update to new upstream 3.3.1 release
+  - Includes all previous patches
+  - Support for serializable Java and .NET types in your Slice definitions
+  - Ability to use Ice for Java in an applet and to load IceSSL files, such
+    as keystores, from class path resources
+- Details at http://www.zeroc.com/download/Ice/3.3/Ice-3.3.1-RELEASE_NOTES
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.0-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jun 2008 15:29:56 -0000	1.3
+++ sources	25 Mar 2009 13:59:00 -0000	1.4
@@ -1,3 +1,3 @@
-0500306d9cdbc0fbb553fbb529de557a  Ice-3.3.0.tar.gz
-a2ec3283dc17feb2d1089391e369f838  Ice-rpmbuild-3.3.0.tar.gz
+1f37dfcec4662fcde030553fb447d064  Ice-3.3.1.tar.gz
+62682892ba9e42f0f6effcd8a78b00d4  Ice-rpmbuild-3.3.1.tar.gz
 c6c17ee1be2e6b615af5b40edae88b75  Ice-3.3.0-man-pages.tbz


--- Ice-3.3.0-compression.patch DELETED ---


--- Ice-3.3.0-fix-slice2cpp-slice2freeze.patch DELETED ---


--- Ice-3.3.0-gcc-4.4.patch DELETED ---


--- Ice-3.3.0-icegrid-assert.patch DELETED ---


--- Ice-3.3.0-icepatch-non-ascii.patch DELETED ---


--- Ice-3.3.0-java-Timer.patch DELETED ---


--- Ice-3.3.0-java-build.patch DELETED ---


--- Ice-3.3.0-jgoodies.patch DELETED ---


--- Ice-3.3.0-preprocess.patch DELETED ---


--- Ice-3.3.0-python-26.patch DELETED ---


--- Ice-3.3.0-registry-crash.patch DELETED ---


--- Ice-3.3.0-retry-intervals.patch DELETED ---


--- Ice-3.3.0-use-db4.7.patch DELETED ---


