[voms/el5: 6/6] Update to version 2.0.7
Mattias Ellert
ellert at fedoraproject.org
Mon Apr 23 18:18:01 UTC 2012
commit 6abdf7fb093f3ff8ef17d4d58ee709abd5865c30
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Mon Apr 23 20:17:03 2012 +0200
Update to version 2.0.7
- No longer build the Java API - it is in a separate package now
sources | 2 +-
voms-doc-race.patch | 47 +++++++----
voms-install-db2.patch | 38 ++--------
voms-no-parallel-java.patch | 10 ---
voms-old-autotools.patch | 15 ----
voms.spec | 179 ++++---------------------------------------
6 files changed, 52 insertions(+), 239 deletions(-)
---
diff --git a/sources b/sources
index 1f1d31c..9f9f2e3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
047f397219c766df39886c8d32cfba5b voms-1.9.19.2.tar.gz
-8349e3d830cb4b6399cb65cce70e9420 voms-2.0.6.tar.gz
+3d8113c22ea2e0cef8e6b8d4b7cde026 voms-2.0.7.tar.gz
diff --git a/voms-doc-race.patch b/voms-doc-race.patch
index da765bc..c00549c 100644
--- a/voms-doc-race.patch
+++ b/voms-doc-race.patch
@@ -1,7 +1,7 @@
-diff -ur voms-2.0.2.orig/src/api/ccapi/Makefile.am voms-2.0.2/src/api/ccapi/Makefile.am
---- voms-2.0.2.orig/src/api/ccapi/Makefile.am 2011-04-27 15:14:41.000000000 +0200
-+++ voms-2.0.2/src/api/ccapi/Makefile.am 2011-05-28 20:10:43.947356852 +0200
-@@ -72,15 +72,16 @@
+diff -ur voms-2.0.7.orig/src/api/ccapi/Makefile.am voms-2.0.7/src/api/ccapi/Makefile.am
+--- voms-2.0.7.orig/src/api/ccapi/Makefile.am 2012-02-23 11:24:35.000000000 +0100
++++ voms-2.0.7/src/api/ccapi/Makefile.am 2012-03-20 09:13:23.181824708 +0100
+@@ -64,15 +64,21 @@
CCDOCPLC_DIR = $(top_builddir)/doc/apidoc/api/VOMS_CC_API
CDOCPLC_DIR = $(top_builddir)/doc/apidoc/api/VOMS_C_API
@@ -9,40 +9,46 @@ diff -ur voms-2.0.2.orig/src/api/ccapi/Makefile.am voms-2.0.2/src/api/ccapi/Make
- $(CDOCPLC_DIR)/html/index.html
+CCHTML = $(CCDOCPLC_DIR)/html/index.html
+CHTML = $(CDOCPLC_DIR)/html/index.html
++
++HTML = $(CCHTML) $(CHTML)
if BUILD_DOCS
--MAN3 = $(CCDOCPLC_DIR)/man/man3/data.3 \
-+CCMAN3 = $(CCDOCPLC_DIR)/man/man3/data.3 \
- $(CCDOCPLC_DIR)/man/man3/voms.3 \
+
+-MAN3 = $(CCDOCPLC_DIR)/man/man3/voms.3 \
++CCMAN3 = $(CCDOCPLC_DIR)/man/man3/voms.3 \
$(CCDOCPLC_DIR)/man/man3/voms_api.h.3 \
- $(CCDOCPLC_DIR)/man/man3/vomsdata.3 \
-- $(CDOCPLC_DIR)/man/man3/voms_apic.h.3
+- $(CDOCPLC_DIR)/man/man3/voms_apic.h.3
+ $(CCDOCPLC_DIR)/man/man3/vomsdata.3
++
+CMAN3 = $(CDOCPLC_DIR)/man/man3/voms_apic.h.3
++
+MAN3 = $(CCMAN3) $(CMAN3)
++
endif
PDF = $(CCDOCPLC_DIR)/pdf/VOMS_CC_API.pdf \
-@@ -89,14 +90,13 @@
+@@ -81,14 +87,15 @@
PS = $(CCDOCPLC_DIR)/ps/VOMS_CC_API.ps \
- $(CDOCPLC_DIR)/pdf/VOMS_C_API.ps
+ $(CDOCPLC_DIR)/pdf/VOMS_C_API.ps
-LATEX = $(CCDOCPLC_DIR)/latex/Makefile \
+CCLATEX = $(CCDOCPLC_DIR)/latex/Makefile \
$(CCDOCPLC_DIR)/latex/refman.tex \
- $(CCDOCPLC_DIR)/latex/doxygen.sty \
-- $(CDOCPLC_DIR)/latex/Makefile \
+- $(CDOCPLC_DIR)/latex/Makefile \
+ $(CCDOCPLC_DIR)/latex/doxygen.sty
++
+CLATEX = $(CDOCPLC_DIR)/latex/Makefile \
$(CDOCPLC_DIR)/latex/refman.tex \
$(CDOCPLC_DIR)/latex/doxygen.sty
--
+
-DOXY = $(CCDOCPLC_DIR)/Doxyfile $(CDOCPLC_DIR)/Doxyfile $(include_HEADERS)
+LATEX = $(CCLATEX) $(CLATEX)
$(CCDOCPLC_DIR)/Doxyfile:
-mkdir -p $(CCDOCPLC_DIR)
-@@ -248,13 +248,15 @@
+@@ -237,10 +244,16 @@
apidoc: apidoc-local apidoc-recursive
if BUILD_DOCS
@@ -54,10 +60,17 @@ diff -ur voms-2.0.2.orig/src/api/ccapi/Makefile.am voms-2.0.2/src/api/ccapi/Make
doxygen $(CDOCPLC_DIR)/Doxyfile
+$(CCMAN3) $(CCLATEX): $(CCHTML)
-
--#$(OUTPUT_DIR)/man/man3/%.3: $(DOXY)
--# doxygen
++
+$(CMAN3) $(CLATEX): $(CHTML)
-
++
$(PDF): $(LATEX)
cd $(CCDOCPLC_DIR)/latex; \
+ pdflatex refman.tex; \
+@@ -274,7 +287,6 @@
+ for file in $(MAN3); do \
+ $(INSTALL_DATA) $${file} $(DESTDIR)$(mandir)/man3; \
+ done
+-
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/grid-security/vomsdir
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/grid-security/voms
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/voms
diff --git a/voms-install-db2.patch b/voms-install-db2.patch
index e2618fe..702857c 100644
--- a/voms-install-db2.patch
+++ b/voms-install-db2.patch
@@ -1,7 +1,7 @@
-diff -ur voms-2.0.0.orig/src/install/voms_install_db.in voms-2.0.0/src/install/voms_install_db.in
---- voms-2.0.0.orig/src/install/voms_install_db.in 2011-03-04 11:01:25.000000000 +0100
-+++ voms-2.0.0/src/install/voms_install_db.in 2011-03-07 11:08:02.829439399 +0100
-@@ -59,7 +59,7 @@
+diff -ur voms-2.0.7.orig/src/install/voms_install_db.in voms-2.0.7/src/install/voms_install_db.in
+--- voms-2.0.7.orig/src/install/voms_install_db.in 2012-02-23 11:24:35.000000000 +0100
++++ voms-2.0.7/src/install/voms_install_db.in 2012-03-20 09:00:13.854089704 +0100
+@@ -49,7 +49,7 @@
logformat=""
sqlloc=""
help=""
@@ -10,7 +10,7 @@ diff -ur voms-2.0.0.orig/src/install/voms_install_db.in voms-2.0.0/src/install/v
vomscert="/etc/grid-security/voms/hostcert.pem"
vomskey="/etc/grid-security/voms/hostkey.pem"
-@@ -70,7 +70,7 @@
+@@ -60,7 +60,7 @@
fi
@@ -19,7 +19,7 @@ diff -ur voms-2.0.0.orig/src/install/voms_install_db.in voms-2.0.0/src/install/v
if [ $? != 0 ] ; then $ECHO "Terminating..." >&2 ; exit 1 ; fi
-@@ -96,8 +96,8 @@
+@@ -86,8 +86,8 @@
--logtype) logtype=$2 ; shift 2 ;;
--logformat) logformat=$2 ; shift 2 ;;
--logdateformat) logdateformat=$2 ; shift 2 ;;
@@ -30,7 +30,7 @@ diff -ur voms-2.0.0.orig/src/install/voms_install_db.in voms-2.0.0/src/install/v
--vomscert) vomscert=$2 ; shift 2 ;;
--vomskey) vomskey=$2 ; shift 2 ;;
-h) help="yes" ; shift 1 ;;
-@@ -148,7 +148,7 @@
+@@ -138,7 +138,7 @@
$ECHO " --logtype type Specifies what to log. See the voms(8) man page for details."
$ECHO " --logformat format See the voms(8) man page for details."
$ECHO " --logdateformat format See the voms(8) man page for details."
@@ -39,27 +39,3 @@ diff -ur voms-2.0.0.orig/src/install/voms_install_db.in voms-2.0.0/src/install/v
$ECHO " --oldformat Creates AC according to the old format."
$ECHO " --help This output."
exit 0;
-@@ -277,8 +277,8 @@
-
- # Setting ownership and permission for voms_password_query file
- mkdir -p $datapath/etc/voms/$voms_vo
--mkdir -p $@VAR_LOCATION_ENV@/log/
--#$datapath/log
-+mkdir -p $@VAR_LOCATION_ENV@/log/voms
-+
- $ECHO $voms_password_query > $datapath/etc/voms/$voms_vo/voms.pass
- chown root.voms $datapath/etc/voms/$voms_vo/voms.pass
- chmod 640 $datapath/etc/voms/$voms_vo/voms.pass
-@@ -286,10 +286,10 @@
- if test -z $voms_vo ; then
- logname=voms
- else
-- logname=voms.$voms_vo
-+ logname=$voms_vo
- fi
-
--$ECHO -en "--vo=$voms_vo\n--dbname=$voms_database\n--port=$port\n--username=$voms_username_query\n--passfile=$datapath/etc/voms/$voms_vo/voms.pass\n--sqlloc=$sqlloc\n--logfile=$@VAR_LOCATION_ENV@/log/$logname\n" > $datapath/etc/voms/$voms_vo/voms.conf
-+$ECHO -en "--vo=$voms_vo\n--dbname=$voms_database\n--port=$port\n--username=$voms_username_query\n--passfile=$datapath/etc/voms/$voms_vo/voms.pass\n--sqlloc=$sqlloc\n--logfile=$@VAR_LOCATION_ENV@/log/voms/$logname\n" > $datapath/etc/voms/$voms_vo/voms.conf
- $ECHO -en "--socktimeout=$timeout\n--loglevel=$loglevel\n--logtype=$logtype\n" >>$datapath/etc/voms/$voms_vo/voms.conf
-
- if test "x$compat_mode" = "x-compat"; then
diff --git a/voms.spec b/voms.spec
index 9014710..781261d 100644
--- a/voms.spec
+++ b/voms.spec
@@ -1,34 +1,14 @@
-%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
-
%if %{?fedora}%{!?fedora:0} >= 16 || %{?rhel}%{!?rhel:0} >= 7
%global compat 0
%else
%global compat 1
%endif
-%if %{?fedora}%{!?fedora:0} >= 16 || %{?rhel}%{!?rhel:0} >= 7
-%global with_gcj %{!?_with_gcj:0}%{?_with_gcj:1}
-%else
-%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-%endif
-
%global version1 1.9.19.2
-%global release1 5
+%global release1 6
-%global version2 2.0.6
-%global release2 5
+%global version2 2.0.7
+%global release2 1
Name: voms
Version: %{version2}
@@ -39,10 +19,10 @@ Group: System Environment/Libraries
License: ASL 2.0
URL: http://glite.web.cern.ch/glite/
# This source tarball is created from a git checkout:
-# git clone git://testbed002.cnaf.infn.it/opt/gits/voms.git
+# git clone git://github.com/italiangrid/voms.git
# cd voms
-# git archive --format tar --prefix voms-2.0.6/ voms_R_2_0_6 | \
-# gzip - > ../voms-2.0.6.tar.gz
+# git archive --format tar --prefix voms-2.0.7/ 2_0_7 | \
+# gzip - > ../voms-2.0.7.tar.gz
Source0: %{name}-%{version2}.tar.gz
# This source tarball is created from a CVS checkout:
# cvs -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite co \
@@ -109,10 +89,6 @@ Patch20: %{name}-install-db2.patch
Patch21: %{name}-doc-race.patch
# Don't use embedded gsoap sources
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}
@@ -131,18 +107,6 @@ BuildRequires: tex(latex)
BuildRequires: tetex-latex
%endif
-%if %{withjava}
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
-BuildRequires: bouncycastle >= 1.39
-BuildRequires: jakarta-commons-cli
-BuildRequires: jakarta-commons-lang
-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
by parties external to the resource provider, users may be grouped to
@@ -237,47 +201,6 @@ 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
-Requires: java
-Requires: jpackage-utils
-Requires: bouncycastle >= 1.39
-Requires: jakarta-commons-cli
-Requires: jakarta-commons-lang
-Requires: log4j
-%if %{with_gcj}
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%else
-%if %{?fedora}%{!?fedora:0} >= 10
-BuildArch: noarch
-%endif
-%endif
-
-%description -n vomsjapi
-In grid computing, and whenever the access to resources may be controlled
-by parties external to the resource provider, users may be grouped to
-Virtual Organizations (VOs). This package provides a VO Membership Service
-(VOMS), which informs on that association between users and their VOs:
-groups, roles and capabilities.
-
-This package offers a java client API for VOMS.
-
-%package -n vomsjapi-javadoc
-Summary: Virtual Organization Membership Service Java API Documentation
-Group: Documentation
-%if %{?fedora}%{!?fedora:0} >= 10
-BuildArch: noarch
-%endif
-Requires: jpackage-utils
-Requires: vomsjapi = %{version}-%{release}
-
-%description -n vomsjapi-javadoc
-Virtual Organization Membership Service (VOMS) Java API Documentation.
-%endif
-
%prep
%if %{compat}
%setup -q -a 1
@@ -335,8 +258,6 @@ popd
%patch20 -p1
%patch21 -p1
%patch22 -p1
-%patch23 -p1
-%patch24 -p1
# Remove embedded gsoap sources
rm src/server/stdsoap2.c src/server/stdsoap2.h src/server/soap*
@@ -353,9 +274,6 @@ touch -r src/utils/vomsfake.y src/utils/vomsparser.h
touch -r src/utils/vomsfake.y src/utils/vomsparser.c
touch -r src/utils/vomsfake.y src/utils/lex.yy.c
-# Do not force java target
-sed 's/-target 1.5//' -i src/api/java/Makefile.am
-
# rebootstrap
./autogen.sh
@@ -371,33 +289,14 @@ make %{?_smp_mflags}
popd
%endif
-%configure --disable-glite --libexecdir=%{_datadir} --sysconfdir=%{_datadir} \
- --disable-static --enable-docs \
-%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
+%configure --disable-glite --libexecdir=%{_datadir} \
+ --disable-static --enable-docs
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 \
- bcprov log4j commons-cli commons-lang) \
-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
@@ -415,31 +314,19 @@ 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
-mv $RPM_BUILD_ROOT%{_datadir}/vomses.template \
- $RPM_BUILD_ROOT%{_datadir}/%{name}
-
-mv $RPM_BUILD_ROOT%{_datadir}/m4 $RPM_BUILD_ROOT%{_datadir}/aclocal
-
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/vomsdir
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
# Turn off default enabling of the service
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
sed -e 's/\(chkconfig: \)\w*/\1-/' \
-e '/Default-Start/d' \
-e 's/\(Default-Stop:\s*\).*/\10 1 2 3 4 5 6/' \
- $RPM_BUILD_ROOT%{_datadir}/init.d/%{name} > \
- $RPM_BUILD_ROOT%{_initrddir}/%{name}
-chmod 755 $RPM_BUILD_ROOT%{_initrddir}/%{name}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/init.d
+ -i $RPM_BUILD_ROOT%{_initrddir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
echo VOMS_USER=voms > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
@@ -461,20 +348,6 @@ 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
-
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
-cp -pr javadoc $RPM_BUILD_ROOT%{_javadocdir}/vomsjapi-%{version}
-ln -s vomsjapi-%{version} $RPM_BUILD_ROOT%{_javadocdir}/vomsjapi
-
-%if %{with_gcj}
-%{_bindir}/aot-compile-rpm
-%endif
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -516,18 +389,6 @@ 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
-%endif
-
-%postun -n vomsjapi
-%if %{with_gcj}
-[ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db
-%endif
-%endif
-
%files
%defattr(-,root,root,-)
%{_libdir}/libvomsapi.so.1*
@@ -591,24 +452,12 @@ fi
%{_mandir}/man8/voms.8*
%doc README.Fedora
-%if %{withjava}
-%files -n vomsjapi
-%defattr(-,root,root,-)
-%{_javadir}/vomsjapi.jar
-%{_javadir}/vomsjapi-%{version}.jar
-%if %{with_gcj}
-%{_libdir}/gcj/%{name}
-%endif
-%doc AUTHORS LICENSE
-
-%files -n vomsjapi-javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/vomsjapi
-%doc %{_javadocdir}/vomsjapi-%{version}
-%endif
-
%changelog
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.6-4.1
+* Mon Apr 23 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.7-1
+- Update to version 2.0.7
+- No longer build the Java API - it is in a separate package now
+
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.6-5
- Rebuilt for c++ ABI breakage
* Fri Feb 10 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.6-4
More information about the scm-commits
mailing list