rpms/jotm/devel jotm-noiiop.patch, NONE, 1.1 jotm.spec, 1.11, 1.12 jotm-bz133180.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Dec 23 08:40:38 UTC 2005


Author: ashah

Update of /cvs/dist/rpms/jotm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10303

Modified Files:
	jotm.spec 
Added Files:
	jotm-noiiop.patch 
Removed Files:
	jotm-bz133180.patch 
Log Message:
- Replace bz133180 patch with one that disables iiop stub compilation.


jotm-noiiop.patch:
 rmic_sun.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jotm-noiiop.patch ---
--- archive/stubs/rmic_sun.xml.orig	2005-12-23 02:48:42.000000000 -0500
+++ archive/stubs/rmic_sun.xml	2005-12-23 02:49:33.000000000 -0500
@@ -54,7 +54,7 @@
     </condition>
     <mkdir   dir="${dist.lib}"/>
     <antcall target="-compile.sunjrmp"/>
-    <antcall target="-compile.suniiop"/>
+    <!-- <antcall target="-compile.suniiop"/> -->
   </target>
 
   <!-- compile remote interface Stub/Skel for Sun RMI/JRMP 1.2 -->


Index: jotm.spec
===================================================================
RCS file: /cvs/dist/rpms/jotm/devel/jotm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jotm.spec	22 Dec 2005 09:07:50 -0000	1.11
+++ jotm.spec	23 Dec 2005 08:40:36 -0000	1.12
@@ -1,6 +1,6 @@
 %define name		jotm
 %define version		2.0.5
-%define release 	1jpp_5fc
+%define release		1jpp_6fc
 %define	section		free
 
 Name:		%{name}
@@ -12,7 +12,7 @@
 License:	BSD-style
 Group:		Development/Libraries/Java
 Source0:	jotm-%{version}-src-RHCLEAN.tar.bz2
-Patch1:		%{name}-bz133180.patch
+Patch0:		%{name}-noiiop.patch
 
 BuildRequires:  jpackage-utils >= 0:1.5
 BuildRequires:	ant >= 0:1.6
@@ -69,7 +69,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 chmod -R go=u-w *
-%patch1 -p1 -b .orig
+%patch0
 find . -name "*.jar" -exec rm -f {} \;
 
 %build
@@ -147,6 +147,9 @@
 %{_docdir}/%{name}-%{version}
 
 %changelog
+* Fri Dec 23 2005 Archit Shah <ashah at redhat.com> 0:2.0.5-1jpp_6fc
+- Replace bz133180 patch with one that disables iiop stub compilation.
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:2.0.5-1jpp_5fc
 - rebuilt again
 


--- jotm-bz133180.patch DELETED ---




More information about the fedora-cvs-commits mailing list