[globus-gass-copy/el5: 4/4] Update to Globus Toolkit 6.0
Mattias Ellert
ellert at fedoraproject.org
Thu Sep 18 13:09:03 UTC 2014
commit b6cfad5e800ecc93666af7d01e8b8cf5556913ef
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Thu Sep 18 15:08:16 2014 +0200
Update to Globus Toolkit 6.0
- Drop GPT build system and GPT packaging metadata
- Enable checks
globus-gass-copy-doxygen.patch | 98 ++++++++++++++++++++++++++++
globus-gass-copy.spec | 137 ++++++++++++++--------------------------
sources | 2 +-
3 files changed, 147 insertions(+), 90 deletions(-)
---
diff --git a/globus-gass-copy-doxygen.patch b/globus-gass-copy-doxygen.patch
new file mode 100644
index 0000000..2ce4b66
--- /dev/null
+++ b/globus-gass-copy-doxygen.patch
@@ -0,0 +1,98 @@
+diff --git a/Makefile.am b/Makefile.am
+index 2828f33..85f1b72 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -56,7 +56,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 2828f33..85f1b72 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -56,7 +56,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_gass_copy.c b/globus_gass_copy.c
+index b493173..dca98d7 100644
+--- a/globus_gass_copy.c
++++ b/globus_gass_copy.c
+@@ -14,14 +14,16 @@
+ * limitations under the License.
+ */
+
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
+ /**
+- * @file globus_gass_copy.c Globus GASS Copy Implementation
++ * @file globus_gass_copy.c
++ * @brief Globus GASS Copy Implementation
+ */
+
+ #include "globus_gass_copy.h"
+ #include "version.h"
+
+-#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ static int globus_l_gass_copy_activate(void);
+
+ static int globus_l_gass_copy_deactivate(void);
+diff --git a/globus_gass_copy.h b/globus_gass_copy.h
+index 662b8d3..28370a8 100644
+--- a/globus_gass_copy.h
++++ b/globus_gass_copy.h
+@@ -17,8 +17,9 @@
+ #ifndef GLOBUS_GASS_COPY_H
+ #define GLOBUS_GASS_COPY_H
+
+- /**
+- * @file globus_gass_copy.h GASS Copy Library
++/**
++ * @file globus_gass_copy.h
++ * @brief GASS Copy Library
+ */
+
+ #ifndef GLOBUS_GLOBAL_DOCUMENT_SET
+@@ -585,7 +586,7 @@ typedef enum {
+ } globus_gass_copy_glob_entry_t;
+
+ /**
+- * Glob expanded entry information
++ * @brief Glob expanded entry information
+ * @ingroup globus_gass_copy
+ */
+ typedef struct
+diff --git a/globus_i_gass_copy.h b/globus_i_gass_copy.h
+index 9c08830..c8bcc33 100644
+--- a/globus_i_gass_copy.h
++++ b/globus_i_gass_copy.h
+@@ -17,8 +17,11 @@
+ #ifndef GLOBUS_I_GASS_COPY_H
+ #define GLOBUS_I_GASS_COPY_H
+
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
+ /**
+- * @file globus_i_gass_copy.h Globus GASS Copy Library Internals
++ * @file globus_i_gass_copy.h Globus GASS
++ * @brief Copy Library Internals
+ */
+
+ #include "globus_gass_copy.h"
+@@ -251,4 +254,6 @@ globus_i_gass_copy_state_new(
+ }
+ #endif
+
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
++
+ #endif /* GLOBUS_I_GASS_COPY_H */
diff --git a/globus-gass-copy.spec b/globus-gass-copy.spec
index ca53abb..60c5917 100644
--- a/globus-gass-copy.spec
+++ b/globus-gass-copy.spec
@@ -1,86 +1,55 @@
-%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-gass-copy
%global _name %(tr - _ <<< %{name})
-Version: 8.6
-Release: 10%{?dist}
+Version: 9.11
+Release: 1%{?dist}
Summary: Globus Toolkit - Globus Gass Copy
Group: System Environment/Libraries
License: ASL 2.0
URL: http://www.globus.org/
-Source: http://www.globus.org/ftppub/gt5/5.2/5.2.2/packages/src/%{_name}-%{version}.tar.gz
+Source: http://www.globus.org/ftppub/gt6/packages/%{_name}-%{version}.tar.gz
# README file
Source8: GLOBUS-GRIDFTP
+# Doxygen fixes
+Patch0: %{name}-doxygen.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-ftp-client%{?_isa} >= 7
-Requires: globus-common%{?_isa} >= 14
-Requires: globus-io%{?_isa} >= 8
-Requires: globus-gass-transfer%{?_isa} >= 7
-BuildRequires: grid-packaging-tools >= 3.4
-BuildRequires: globus-core >= 8
+BuildRequires: globus-common-devel >= 15
BuildRequires: globus-ftp-client-devel >= 7
-BuildRequires: globus-gssapi-gsi-devel >= 9
BuildRequires: globus-ftp-control-devel >= 4
-BuildRequires: globus-common-devel >= 14
BuildRequires: globus-gsi-sysconfig-devel >= 4
-BuildRequires: globus-gssapi-error-devel >= 4
BuildRequires: globus-gass-transfer-devel >= 7
BuildRequires: globus-io-devel >= 8
+BuildRequires: globus-gssapi-gsi-devel >= 9
+BuildRequires: globus-gssapi-error-devel >= 4
BuildRequires: openssl-devel
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
+# Additional requirements for make check
+BuildRequires: globus-gridftp-server-progs >= 7
+BuildRequires: openssl
+BuildRequires: perl(Test::More)
+BuildRequires: perl(URI)
%package progs
Summary: Globus Toolkit - Globus Gass Copy Programs
Group: Applications/Internet
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-ftp-client%{?_isa} >= 7
-Requires: globus-gsi-sysconfig%{?_isa} >= 4
-Requires: globus-common%{?_isa} >= 14
-Requires: globus-gssapi-error%{?_isa} >= 4
-Requires: globus-gssapi-gsi%{?_isa} >= 9
-Requires: globus-io%{?_isa} >= 8
-Requires: globus-gass-transfer%{?_isa} >= 7
%package devel
Summary: Globus Toolkit - Globus Gass Copy Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: globus-common-devel%{?_isa} >= 15
Requires: globus-ftp-client-devel%{?_isa} >= 7
-Requires: globus-gssapi-gsi-devel%{?_isa} >= 9
Requires: globus-ftp-control-devel%{?_isa} >= 4
-Requires: globus-core%{?_isa} >= 8
-Requires: globus-common-devel%{?_isa} >= 14
Requires: globus-gsi-sysconfig-devel%{?_isa} >= 4
-Requires: globus-gssapi-error-devel%{?_isa} >= 4
Requires: globus-gass-transfer-devel%{?_isa} >= 7
Requires: globus-io-devel%{?_isa} >= 8
+Requires: globus-gssapi-gsi-devel%{?_isa} >= 9
+Requires: globus-gssapi-error-devel%{?_isa} >= 4
+Requires: openssl-devel
%package doc
Summary: Globus Toolkit - Globus Gass Copy Documentation Files
@@ -88,7 +57,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
@@ -128,21 +96,17 @@ Globus Gass Copy 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}
+export GLOBUS_VERSION=6.0
+%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
@@ -153,34 +117,14 @@ 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 client man pages to progs package
-grep '.[18]$' $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
- >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
-sed '/.[18]$/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.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}_pgm.filelist \
- | sed -e s!^!%{_prefix}! -e 's!.*/man/.*!%doc &*!' > package-progs.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
+%check
+make check
%clean
rm -rf %{buildroot}
@@ -189,19 +133,34 @@ rm -rf %{buildroot}
%postun -p /sbin/ldconfig
-%files -f package.filelist
-%dir %{_datadir}/globus/packages/%{_name}
+%files
+%{_libdir}/libglobus_gass_copy.so.*
%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/GLOBUS_LICENSE
%doc %{_pkgdocdir}/README
-%files -f package-progs.filelist progs
+%files progs
+%{_bindir}/globus-url-copy
+%doc %{_mandir}/man1/globus-url-copy.1*
-%files -f package-devel.filelist devel
+%files devel
+%{_includedir}/globus/*
+%{_libdir}/libglobus_gass_copy.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> - 9.11-1
+- Update to Globus Toolkit 6.0
+- Drop GPT build system and GPT packaging metadata
+- Enable checks
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index f1b8c31..21c1bc8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf6fa93df2986a2ede327694a3fcac97 globus_gass_copy-8.6.tar.gz
+75c043324cfe3cc56deb60bcc6257338 globus_gass_copy-9.11.tar.gz
More information about the scm-commits
mailing list