[voms] - Upstream 1.9.18.1 (CVS tag glite-security-voms_R_1_9_18_1)

Mon Oct 4 13:30:04 UTC 2010

commit 9f43412872d78c11c8dac8b6c08fb23f32043c56
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Mon Oct 4 15:26:43 2010 +0200

    - Upstream 1.9.18.1 (CVS tag glite-security-voms_R_1_9_18_1)

 voms-portability.patch |    2 +-
 voms.spec              |   46 +++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 42 insertions(+), 6 deletions(-)
---

diff --git a/voms-portability.patch b/voms-portability.patch
index d167b02..e518f8a 100644
--- a/voms-portability.patch
+++ b/voms-portability.patch
@@ -2,7 +2,7 @@ diff -ur voms-1.9.11.orig/configure.ac voms-1.9.11/configure.ac
 --- voms-1.9.11.orig/configure.ac	2009-07-16 15:10:39.000000000 +0200
 +++ voms-1.9.11/configure.ac	2009-09-08 14:13:33.244334250 +0200
 @@ -0,5 +0,5 @@
- AC_INIT([GLite Security VOMS], [1.9.17])
+ AC_INIT([GLite Security VOMS], [1.9.18])
 -AC_PREREQ(2.59)
 +AC_PREREQ(2.57)
  AC_CONFIG_AUX_DIR([./project])
diff --git a/voms.spec b/voms.spec
index e21f15d..58a8ee5 100644
--- a/voms.spec
+++ b/voms.spec
@@ -1,8 +1,22 @@
+%if %{?fedora}%{!?fedora:0} >= 9
+%global withjava 1
+%else
+%if %{?rhel}%{!?rhel:0} >= 5
+%ifarch %{ix86} x86_64
+%global withjava 1
+%else
+%global withjava 0
+%endif
+%else
+%global withjava 0
+%endif
+%endif
+
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
 Name:		voms
-Version:	1.9.17.1
-Release:	2%{?dist}
+Version:	1.9.18.1
+Release:	1%{?dist}
 Summary:	Virtual Organization Membership Service
 
 Group:		System Environment/Libraries
@@ -10,9 +24,9 @@ License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
 #		The source tarball is created from a CVS checkout:
 #		cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
-#		  -r glite-security-voms_R_1_9_17_1 \
-#		  -d voms-1.9.17.1 org.glite.security.voms
-#		tar -z -c --exclude CVS -f voms-1.9.17.1.tar.gz voms-1.9.17.1
+#		  -r glite-security-voms_R_1_9_18_1 \
+#		  -d voms-1.9.18.1 org.glite.security.voms
+#		tar -z -c --exclude CVS -f voms-1.9.18.1.tar.gz voms-1.9.18.1
 Source:		%{name}-%{version}.tar.gz
 #		Post-install setup instructions:
 Source1:	%{name}.INSTALL
@@ -84,6 +98,7 @@ BuildRequires:	tex(latex)
 BuildRequires:	tetex-latex
 %endif
 
+%if %{withjava}
 BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	jpackage-utils
 BuildRequires:	bouncycastle >= 1.39
@@ -93,6 +108,7 @@ BuildRequires:	log4j
 %if %{with_gcj}
 BuildRequires:	java-gcj-compat-devel
 %endif
+%endif
 
 %description
 In grid computing, and whenever the access to resources may be controlled
@@ -168,6 +184,7 @@ The service can be understood as an account database, which serves the
 information in a special format (VOMS credential). The VO manager can
 administrate it remotely using command line tools or a web interface.
 
+%if %{withjava}
 %package -n vomsjapi
 Summary:	Virtual Organization Membership Service Java API
 Group:		Development/Libraries
@@ -206,6 +223,7 @@ Requires:	vomsjapi = %{version}-%{release}
 
 %description -n vomsjapi-javadoc
 Virtual Organization Membership Service (VOMS) Java API Documentation.
+%endif
 
 %prep
 %setup -q
@@ -255,16 +273,21 @@ install -m 644 %{SOURCE1} INSTALL.Fedora
 
 %build
 %configure --disable-glite --libexecdir=%{_datadir} --sysconfdir=%{_datadir} \
+%if %{withjava}
 	   --with-java-home=/usr --with-bc=/usr/share/java/bcprov.jar \
 	   --with-log4j=/usr/share/java/log4j.jar \
 	   --with-commons-cli=/usr/share/java/commons-cli.jar \
 	   --with-commons-lang=/usr/share/java/commons-lang.jar
+%else
+	   --disable-java
+%endif
 
 make %{?_smp_mflags}
 
 ( cd doc/apidoc/api/VOMS_C_API/latex ; make )
 ( cd doc/apidoc/api/VOMS_CC_API/latex ; make )
 
+%if %{withjava}
 mkdir javadoc
 cd javadoc
 CLASSPATH=../src/api/java:$(build-classpath \
@@ -273,6 +296,7 @@ javadoc ../src/api/java/org/glite/voms/*.java \
 	../src/api/java/org/glite/voms/ac/*.java \
 	../src/api/java/org/glite/voms/contact/*.java
 cd ..
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -347,6 +371,7 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/VOMS_CC_API/html/installdox
 install -m 644 doc/apidoc/api/VOMS_CC_API/latex/refman.pdf \
     $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/VOMS_CC_API
 
+%if %{withjava}
 mv $RPM_BUILD_ROOT%{_javadir}/vomsjapi.jar \
    $RPM_BUILD_ROOT%{_javadir}/vomsjapi-%{version}.jar
 ln -s vomsjapi-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/vomsjapi.jar
@@ -358,6 +383,7 @@ ln -s vomsjapi-%{version} $RPM_BUILD_ROOT%{_javadocdir}/vomsjapi
 %if %{with_gcj}
 %{_bindir}/aot-compile-rpm
 %endif
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -388,6 +414,7 @@ if [ $1 -ge 1 ]; then
     /sbin/service %{name} condrestart >/dev/null 2>&1 || :
 fi
 
+%if %{withjava}
 %post -n vomsjapi
 %if %{with_gcj}
 [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db
@@ -397,6 +424,7 @@ fi
 %if %{with_gcj}
 [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db
 %endif
+%endif
 
 %files
 %defattr(-,root,root,-)
@@ -462,6 +490,7 @@ fi
 %{_mandir}/man8/voms.8*
 %doc INSTALL.Fedora
 
+%if %{withjava}
 %files -n vomsjapi
 %defattr(-,root,root,-)
 %{_javadir}/vomsjapi.jar
@@ -475,8 +504,12 @@ fi
 %defattr(-,root,root,-)
 %doc %{_javadocdir}/vomsjapi
 %doc %{_javadocdir}/vomsjapi-%{version}
+%endif
 
 %changelog
+* Mon Oct 04 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.18.1-1
+- Upstream 1.9.18.1 (CVS tag glite-security-voms_R_1_9_18_1)
+
 * Thu Jul 08 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.17.1-2
 - Make -doc subpackage depend of main package for license reasons
 
@@ -484,6 +517,9 @@ fi
 - Upstream 1.9.17.1 (CVS tag glite-security-voms_R_1_9_17_1)
 - Drop patches voms-db-method.patch and voms-thread.patch (accepted upstream)
 
+* Sat Apr 03 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.16.1-2.1
+- Enable java for x86 and x86_64
+
 * Sun Mar 28 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.9.16.1-2
 - Add mutex lock for accessing private data
 
