[myproxy] Adapt to Globus toolkit 5.2
stevetraylen
stevetraylen at fedoraproject.org
Thu Feb 2 20:25:27 UTC 2012
commit 547c4be729baf7e3f2b9f8931b0d993f929ea18e
Author: Steve Traylen <steve.traylen at cern.ch>
Date: Thu Feb 2 22:28:32 2012 +0100
Adapt to Globus toolkit 5.2
myproxy.spec | 76 ++++++++++++++++++++++++++-------------------------------
1 files changed, 35 insertions(+), 41 deletions(-)
---
diff --git a/myproxy.spec b/myproxy.spec
index 30911f3..4bf8070 100644
--- a/myproxy.spec
+++ b/myproxy.spec
@@ -1,9 +1,9 @@
%{!?_initddir: %global _initddir %{_initrddir}}
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
%else
-%global flavor gcc32pthr
+%global flavor gcc32
%endif
%global with_checks 1
@@ -24,14 +24,16 @@ Source3: README.Fedora
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: globus-gss-assist-devel%{?_isa} > 3
-BuildRequires: globus-usage-devel%{?_isa}
+BuildRequires: globus-core%{?_isa} > 8
+BuildRequires: globus-common-devel%{?_isa} > 14
+BuildRequires: globus-gss-assist-devel%{?_isa} > 8
+BuildRequires: globus-usage-devel%{?_isa} > 3
BuildRequires: pam-devel%{?_isa}
BuildRequires: graphviz
BuildRequires: voms-devel%{?_isa} >= 1.9.12.1
BuildRequires: cyrus-sasl-devel%{?_isa}
BuildRequires: openldap-devel%{?_isa} >= 2.3
-BuildRequires: grid-packaging-tools
+BuildRequires: grid-packaging-tools > 3.4
BuildRequires: doxygen
%if 0%{?with_checks}
@@ -45,15 +47,12 @@ BuildRequires: voms-clients
BuildRequires: graphviz-gd
%endif
-%if %{?fedora}%{!?fedora:0} >= 9
-BuildRequires: tex(latex)
-%else
-%if %{?rhel}%{!?rhel:0} >= 6
+%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 5
BuildRequires: tex(latex)
%else
BuildRequires: tetex-latex
%endif
-%endif
+
Requires: myproxy-libs = %{version}-%{release}
Requires: globus-proxy-utils
@@ -185,9 +184,19 @@ sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
%{_datadir}/globus/globus-bootstrap.sh
-%configure --with-flavor=%{flavor} --enable-doxygen --with-openldap=%{_usr} \
- --with-voms=%{_usr} \
- --with-kerberos5=%{_usr} --with-sasl2=%{_usr}
+unset GLOBUS_LOCATION
+unset GPT_LOCATION
+
+%configure --disable-static --with-flavor=%{flavor} \
+ --enable-doxygen --with-docdir=%{_docdir}/%{name}-doc-%{version} \
+ --with-openldap=%{_usr} \
+ --with-voms=%{_usr} \
+ --with-kerberos5=%{_usr} \
+ --with-sasl2=%{_usr}
+
+# Reduce overlinking
+sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
+
make %{?_smp_mflags}
%install
@@ -196,39 +205,29 @@ make install DESTDIR=$RPM_BUILD_ROOT
GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
-find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
-sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{name}/%{flavor}_rtl.filelist
-
-# Remove static libraries (.a files)
+# Remove libtool libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
+find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{name}/%{flavor}_dev.filelist
+sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{name}/%{flavor}_dev.filelist
# Put documentation in Fedora defaults and alter GPT package lists.
mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/extras
-mv $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/{refman.pdf,html} \
- $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/.
-
-sed -i "s!/share/doc/%{name}/html/!/share/doc/%{name}-doc-%{version}/html/!" $GLOBUSPACKAGEDIR/%{name}/noflavor_doc.filelist
-sed -i "s!/share/doc/%{name}/refman.pdf!/share/doc/%{name}-doc-%{version}/refman.pdf!" $GLOBUSPACKAGEDIR/%{name}/noflavor_doc.filelist
-
-
-# We are going to zip the man pages later in the package so we need to
-# correct the gpt data in anticipation.
-sed -i "s!\(/share/man/.*\)!\1.gz!" $GLOBUSPACKAGEDIR/%{name}/noflavor_doc.filelist
-
-
-for FILE in login.html myproxy-accepted-credentials-mapapp myproxy-cert-checker myproxy-certificate-mapapp \
- myproxy-certreq-checker myproxy-crl.cron myproxy.cron myproxy-get-delegation.cgi \
- myproxy-get-trustroots.cron myproxy-passphrase-policy myproxy-revoke
+for FILE in login.html myproxy-accepted-credentials-mapapp \
+ myproxy-cert-checker myproxy-certificate-mapapp \
+ myproxy-certreq-checker myproxy-crl.cron myproxy.cron \
+ myproxy-get-delegation.cgi myproxy-get-trustroots.cron \
+ myproxy-passphrase-policy myproxy-revoke
do
mv $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE \
- $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/extras/.
- sed -i "s!%{name}/${FILE}!doc/%{name}-doc-%{version}/extras/${FILE}!" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
+ $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/extras
+ sed "s!%{name}/${FILE}!doc/%{name}-doc-%{version}/extras/${FILE}!" \
+ -i $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
done
mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}
for FILE in INSTALL LICENSE LICENSE.* PROTOCOL README VERSION
-do
+do
mv $RPM_BUILD_ROOT%{_usr}/share/%{name}/$FILE \
$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/.
sed -i "s!%{name}/${FILE}!doc/%{name}-%{version}/${FILE}!" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
@@ -242,12 +241,6 @@ do
sed -i "/share\/%{name}\/$FILE/d" $GLOBUSPACKAGEDIR/%{name}/noflavor_data.filelist
done
-# Generate pkg-config file from GPT metadata
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
- $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
-
-
# Move example configuration file into place.
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/myproxy-server.config \
@@ -382,6 +375,7 @@ fi
%changelog
* Thu Feb 2 2012 Steve Traylen <steve.traylen at cern.ch> - 5.5-3
- Drop EPEL4 packaging since EOL.
+- Adapt to Globus toolkit 5.2
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list