[globus-authz-callout-error/el5: 4/4] Update to Globus Toolkit 6.0
Mattias Ellert
ellert at fedoraproject.org
Thu Sep 18 10:01:48 UTC 2014
commit 571213dd85871fb557e9b3749487c3d44ee81666
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Thu Sep 18 11:59:59 2014 +0200
Update to Globus Toolkit 6.0
- Drop GPT build system and GPT packaging metadata
globus-authz-callout-error-doxygen.patch | 38 ++++++++++++
globus-authz-callout-error.spec | 98 +++++++++--------------------
sources | 2 +-
3 files changed, 70 insertions(+), 68 deletions(-)
---
diff --git a/globus-authz-callout-error-doxygen.patch b/globus-authz-callout-error-doxygen.patch
new file mode 100644
index 0000000..85fd558
--- /dev/null
+++ b/globus-authz-callout-error-doxygen.patch
@@ -0,0 +1,38 @@
+diff --git a/Makefile.am b/Makefile.am
+index 4bf90ec..5708d63 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -35,7 +35,7 @@ all-local: $(DOC_STAMPS)
+ install-data-local: $(DOC_STAMPS)
+ if test -d doc/man/man3; then \
+ install -d -m 755 $(DESTDIR)$(mandir)/man3; \
+- $(INSTALL) -m 644 doc/man/man3/globus*.3 $(DESTDIR)$(mandir)/man3 ; \
++ $(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \
+ fi
+ if test -d doc/html; then \
+ for dir in `(cd doc; find html -type d)`; do \
+diff --git a/Makefile.in b/Makefile.in
+index 4bf90ec..5708d63 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -35,7 +35,7 @@ all-local: $(DOC_STAMPS)
+ install-data-local: $(DOC_STAMPS)
+ if test -d doc/man/man3; then \
+ install -d -m 755 $(DESTDIR)$(mandir)/man3; \
+- $(INSTALL) -m 644 doc/man/man3/globus*.3 $(DESTDIR)$(mandir)/man3 ; \
++ $(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \
+ fi
+ if test -d doc/html; then \
+ for dir in `(cd doc; find html -type d)`; do \
+diff --git a/globus_gsi_authz_callout_error.h b/globus_gsi_authz_callout_error.h
+index c892c0c..1fb692c 100644
+--- a/globus_gsi_authz_callout_error.h
++++ b/globus_gsi_authz_callout_error.h
+@@ -19,6 +19,7 @@
+
+ /**
+ * @file globus_gsi_authz_callout_error.h
++ * @brief GSI Authorization Callout Error API
+ */
+
+ #include "globus_common.h"
diff --git a/globus-authz-callout-error.spec b/globus-authz-callout-error.spec
index c40df57..efcd937 100644
--- a/globus-authz-callout-error.spec
+++ b/globus-authz-callout-error.spec
@@ -1,55 +1,29 @@
-%ifarch aarch64 alpha ia64 %{power64} s390x sparc64 x86_64
-%global flavor gcc64
-%else
-%global flavor gcc32
-%endif
-
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
Name: globus-authz-callout-error
%global _name %(tr - _ <<< %{name})
-Version: 2.2
-Release: 11%{?dist}
+Version: 3.4
+Release: 1%{?dist}
Summary: Globus Toolkit - Globus authz error library
Group: System Environment/Libraries
License: ASL 2.0
URL: http://www.globus.org/
-Source: http://www.globus.org/ftppub/gt5/5.2/5.2.1/packages/src/%{_name}-%{version}.tar.gz
+Source: http://www.globus.org/ftppub/gt6/packages/%{_name}-%{version}.tar.gz
# README file
Source8: GLOBUS-GSIC
+# Doxygen fixes
+Patch0: %{name}-doxygen.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-common%{?_isa} >= 14
-BuildRequires: grid-packaging-tools >= 3.4
-BuildRequires: globus-core >= 8
-BuildRequires: globus-common-devel >= 14
+BuildRequires: globus-common-devel >= 15
BuildRequires: doxygen
-BuildRequires: graphviz
-%if "%{?rhel}" == "5"
-BuildRequires: graphviz-gd
-%endif
-BuildRequires: ghostscript
-BuildRequires: tex(latex)
-%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 7
-BuildRequires: tex(fullpage.sty)
-BuildRequires: tex(multirow.sty)
-BuildRequires: tex(sectsty.sty)
-BuildRequires: tex(tocloft.sty)
-BuildRequires: tex(xtab.sty)
-BuildRequires: tex-ec
-BuildRequires: tex-courier
-BuildRequires: tex-helvetic
-BuildRequires: tex-times
-BuildRequires: tex-symbol
-BuildRequires: tex-rsfs
-%endif
%package devel
Summary: Globus Toolkit - Globus authz error library Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-common-devel%{?_isa} >= 14
+Requires: globus-common-devel%{?_isa} >= 15
%package doc
Summary: Globus Toolkit - Globus authz error library Documentation Files
@@ -57,7 +31,6 @@ Group: Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch: noarch
%endif
-Requires: %{name} = %{version}-%{release}
%description
The Globus Toolkit is an open source software toolkit used for building Grid
@@ -88,21 +61,16 @@ Globus authz error library (used by globus authz callouts) Documentation Files
%prep
%setup -q -n %{_name}-%{version}
+%patch0 -p1
%build
-# Remove files that should be replaced during bootstrap
-rm -f doxygen/Doxyfile*
-rm -f doxygen/Makefile.am
-rm -f pkgdata/Makefile.am
-rm -f globus_automake*
-rm -rf autom4te.cache
-
-unset GLOBUS_LOCATION
-unset GPT_LOCATION
-%{_datadir}/globus/globus-bootstrap.sh
+# Reduce overlinking
+export LDFLAGS="-Wl,--as-needed -Wl,-z,defs %{?__global_ldflags}"
-%configure --disable-static --with-flavor=%{flavor} \
- --enable-doxygen --with-docdir=%{_pkgdocdir}
+%configure --disable-static \
+ --includedir='${prefix}/include/globus' \
+ --libexecdir='${datadir}/globus' \
+ --docdir=%{_pkgdocdir}
# Reduce overlinking
sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
@@ -113,28 +81,12 @@ make %{?_smp_mflags}
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
-GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages
-
# Remove libtool archives (.la files)
-find %{buildroot}%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
-sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
-
-# Move license file to main package
-grep GLOBUS_LICENSE $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
- >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
-sed /GLOBUS_LICENSE/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
+rm %{buildroot}%{_libdir}/*.la
# Install README file
install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
-# Generate package filelists
-cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
- | sed s!^!%{_prefix}! > package.filelist
-cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
- | sed s!^!%{_prefix}! > package-devel.filelist
-cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
- | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
-
%clean
rm -rf %{buildroot}
@@ -142,17 +94,29 @@ rm -rf %{buildroot}
%postun -p /sbin/ldconfig
-%files -f package.filelist
-%dir %{_datadir}/globus/packages/%{_name}
+%files
+%{_libdir}/libglobus_gsi_authz_callout_error.so.*
%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/GLOBUS_LICENSE
%doc %{_pkgdocdir}/README
-%files -f package-devel.filelist devel
+%files devel
+%{_includedir}/globus/*
+%{_libdir}/libglobus_gsi_authz_callout_error.so
+%{_libdir}/pkgconfig/%{name}.pc
-%files -f package-doc.filelist doc
+%files doc
+%doc %{_mandir}/man3/*
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/GLOBUS_LICENSE
%dir %{_pkgdocdir}/html
+%doc %{_pkgdocdir}/html/*
%changelog
+* Fri Sep 12 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.4-1
+- Update to Globus Toolkit 6.0
+- Drop GPT build system and GPT packaging metadata
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index f45568c..ea7a432 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb2a25d6be196ae9635f4397be79ffdb globus_authz_callout_error-2.2.tar.gz
+8924145a9eb43727637a5ce7a1fad054 globus_authz_callout_error-3.4.tar.gz
More information about the scm-commits
mailing list