rpms/jgroups/devel jgroups.spec,1.14,1.15

[fedora-cvs-commits at redhat.com]

Author: vivekl

Update of /cvs/dist/rpms/jgroups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19109

Modified Files:
	jgroups.spec 
Log Message:
- Resync with latest from JPP.
- Re-enable bouncycastle dependencies.




Index: jgroups.spec
===================================================================
RCS file: /cvs/dist/rpms/jgroups/devel/jgroups.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jgroups.spec	24 Jul 2006 04:52:41 -0000	1.14
+++ jgroups.spec	11 Aug 2006 22:51:42 -0000	1.15
@@ -43,7 +43,7 @@
 
 Name:		jgroups
 Version:	2.2.9.2
-Release:	2jpp_2fc
+Release:	3jpp.1
 Epoch:		0
 Summary:	Toolkit for reliable multicast communication.
 License:	LGPL
@@ -59,8 +59,7 @@
 Requires:	log4j
 Requires:	mx4j
 Requires:	xalan-j2
-#FIXME: Dont we ship bouncycastle with gcj-compat anyway?
-#Requires:	bouncycastle
+Requires:	bouncycastle
 BuildRequires:	ant >= 0:1.6
 BuildRequires:	bsh
 BuildRequires:	concurrent
@@ -73,8 +72,7 @@
 BuildRequires:	log4j
 BuildRequires:	mx4j
 BuildRequires:	xalan-j2
-#FIXME: Dont we ship bouncycastle with gcj-compat anyway?
-#BuildRequires:	bouncycastle
+BuildRequires:	bouncycastle
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
@@ -103,6 +101,9 @@
 %package	javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
+Requires(post):   /bin/ln
+Requires(post):   /bin/rm
+Requires(postun): /bin/rm
 
 %description	javadoc
 %{summary}.
@@ -121,7 +122,6 @@
 done
 
 # this test requires bouncycastle
-#FIXME: Dont we ship bouncycastle with gcj-compat anyway?
 rm tests/junit/org/jgroups/protocols/ENCRYPTAsymmetricTest.java
 
 %patch0 -b .sav
@@ -137,8 +137,6 @@
 ln -sf $(build-classpath log4j) .
 ln -sf $(build-classpath mx4j/mx4j-jmx) .
 popd
-#FIXME: Dont we ship bouncycastle with gcj-compat anyway?
-#ln -sf $(build-classpath build-classpath gcj-endorsed/bcprov) .
 %if %{without_tests}
 ant jar javadoc jboss-service jgroups-service
 %else
@@ -227,6 +225,10 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Fri Aug 11 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.2.9.2-3jpp.1
+- Resync with latest from JPP.
+- Re-enable bouncycastle dependencies.
+
 * Mon Jul 24 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.2.9.2-2jpp_2fc
 - Rebuild.