rpms/ice/F-7 ice.spec,1.4,1.5

[Mary Ellen Foster (mef)]

Author: mef

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

Modified Files:
	ice.spec 
Log Message:
Move ant classes to a jar file
Include patches from ZeroC



Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-7/ice.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ice.spec	7 Sep 2007 08:37:18 -0000	1.4
+++ ice.spec	26 Sep 2007 08:45:42 -0000	1.5
@@ -10,7 +10,7 @@
 
 Name: ice
 Version: 3.2.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -36,6 +36,9 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ice doesn't officially support this architecture at all
@@ -181,6 +184,9 @@
 %prep
 %setup -n Ice-%{version} -q
 %patch6 -p1
+%patch9 -p2
+%patch10 -p2
+%patch11 -p2
 
 # Fix some permission issues/
 chmod a-x config/*.py
@@ -231,6 +237,7 @@
 cd $RPM_BUILD_DIR/IceJ-%{version}-java5/ant
 rm *.class
 javac -d . -source 1.4 -target 1.4 *.java
+jar cvf ant-ice-%{version}.jar *.class
 
 # Build the Java stuff
 cd $RPM_BUILD_DIR/IceJ-%{version}-java5
@@ -373,8 +380,9 @@
 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}%{_datadir}/Ice-%{version}
-cp -p -r ${RPM_BUILD_DIR}/IceJ-%{version}-java5/ant/ ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
+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
@@ -522,6 +530,8 @@
 %{_bindir}/slice2java
 %{_bindir}/slice2freezej
 %{_datadir}/Ice-%{version}/ant
+%{_javadir}/ant-ice-%{version}.jar
+%{_javadir}/ant-ice.jar
 
 %files csharp
 %defattr(-,root,root,-)
@@ -581,6 +591,10 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Wed Sep 26 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 patches from ZeroC
+
 * Fri Sep  7 2007 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-11
 - Also add Obsoletes: for the old zeroc names
 - Fix bad date in changelog