rpms/jonas/devel jonas.spec, 1.80, 1.81 jonas-gifencoder.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/jonas/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4331

Modified Files:
	jonas.spec 
Removed Files:
	jonas-gifencoder.patch 
Log Message:
Revert gifencoder changes for now


Index: jonas.spec
===================================================================
RCS file: /cvs/dist/rpms/jonas/devel/jonas.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- jonas.spec	30 Jun 2005 15:34:08 -0000	1.80
+++ jonas.spec	4 Jul 2005 12:53:29 -0000	1.81
@@ -126,7 +126,6 @@
 # Use system packages for various things
 Patch21: jonas-mx4j.patch
 Patch22: jonas-axis.patch
-Patch23: jonas-gifencoder.patch
 
 # Various libgcj workarounds
 Patch30: jonas-rmi-protocols.patch
@@ -250,9 +249,6 @@
 BuildRequires:	xalan-j2 >= 0:2.6.0
 BuildRequires:	xerces-j2 >= 0:2.6.2
 
-# Miscellaneous
-BuildRequires:	gif89encoder
-
 # Needed by the JAXR-RI
 BuildRequires:  castor >= 0.9.3.9
 
@@ -389,9 +385,6 @@
 Requires:	xalan-j2 >= 0:2.6.0
 Requires:	xerces-j2 >= 0:2.6.2
 
-# Miscellaneous
-Requires:	gif89encoder
-
 # Needed by the JAXR-RI
 Requires:  	castor >= 0.9.3.9
 
@@ -494,7 +487,6 @@
 # Fedora specific
 %patch21 -p2 -b .orig
 %patch22 -p2 -b .orig
-%patch23 -p2 -b .orig
 %patch30 -p1
 %patch31 -p1 -b .orig
 %patch32 -p1 -b .orig
@@ -740,16 +732,6 @@
 # ------------------------------------------------------
 #
 
-# Other stuff
-# ------------------------------------------------------
-pushd externals/jonasAdmin
-	rm -f AcmeGifEncoder.jar
-	# XXX something doesn't like square brackets in the war
-	build-jar-repository -s -p . gif89encoder
-popd
-# ------------------------------------------------------
-#
-
 # ------------------------------------------
 # Build JOnAS from sources (no IIOP version)
 # ------------------------------------------


--- jonas-gifencoder.patch DELETED ---