[voms/el4] Don't build java in parallel Remove the data.3 man page (too common name)

[Mattias Ellert]

commit 74b3eac7b91578c4b006e53692c40be64228b55f
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Oct 15 13:19:16 2011 +0200

    Don't build java in parallel
    Remove the data.3 man page (too common name)

 voms-no-parallel-java.patch |   10 ++++++++++
 voms.spec                   |   12 ++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/voms-no-parallel-java.patch b/voms-no-parallel-java.patch
new file mode 100644
index 0000000..449c64e
--- /dev/null
+++ b/voms-no-parallel-java.patch
@@ -0,0 +1,10 @@
+diff -ur voms-2.0.6.orig/src/api/java/Makefile.am voms-2.0.6/src/api/java/Makefile.am
+--- voms-2.0.6.orig/src/api/java/Makefile.am	2011-07-22 12:17:52.000000000 +0200
++++ voms-2.0.6/src/api/java/Makefile.am	2011-10-01 12:58:06.898803520 +0200
+@@ -88,4 +88,5 @@
+ 	rm -f $(top_builddir)/src/api/java/vomsjapi.jar
+ 	find $(top_builddir)/src/api/java -name '*.class' -exec rm -f '{}' ';'
+ 
+-#java_JAVA =  privateinternal.java
++# Do not build java classes in parallel
++.NOTPARALLEL: %.class
diff --git a/voms.spec b/voms.spec
index 08be1cc..2d9b341 100644
--- a/voms.spec
+++ b/voms.spec
@@ -25,10 +25,10 @@
 %endif
 
 %global version1 1.9.19.2
-%global release1 4
+%global release1 5
 
 %global version2 2.0.6
-%global release2 1
+%global release2 2
 
 Name:		voms
 Version:	%{version2}
@@ -111,6 +111,8 @@ Patch21:	%{name}-doc-race.patch
 Patch22:	%{name}-gsoap.patch
 #		Work around bug in old autotools (RHEL4)
 Patch23:	%{name}-old-autotools.patch
+#		Don't build java in patallel
+Patch24:	%{name}-no-parallel-java.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	globus-gssapi-gsi-devel%{?_isa}
@@ -334,6 +336,7 @@ popd
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
 
 # Remove embedded gsoap sources
 rm src/server/stdsoap2.c src/server/stdsoap2.h src/server/soap*
@@ -413,6 +416,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 rm $RPM_BUILD_ROOT%{_mandir}/man8/voms-install-replica.8
+rm $RPM_BUILD_ROOT%{_mandir}/man3/data.3*
 
 sed -e 's/\$PREFIX//' -e 's/\.glite/.voms/' -e 's/RThis/R This/' \
     -i $RPM_BUILD_ROOT%{_mandir}/man1/voms-proxy-init.1
@@ -604,6 +608,10 @@ fi
 %endif
 
 %changelog
+* Sat Oct  1 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.6-2
+- Don't build java in parallel
+- Remove the data.3 man page (too common name)
+
 * Tue Aug 30 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.6-1
 - Update to version 2.0.6