[globus-gass-transfer/el5: 4/4] Update to Globus Toolkit 6.0

Mattias Ellert ellert at fedoraproject.org
Thu Sep 18 09:53:54 UTC 2014


commit c6163688ff84f9432cf9a444313c77ff286c03c6
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Thu Sep 18 11:53:06 2014 +0200

    Update to Globus Toolkit 6.0
    
    - Drop GPT build system and GPT packaging metadata

 globus-gass-transfer-doxygen.patch |  449 ++++++++++++++++++++++++++++++++++++
 globus-gass-transfer.spec          |  110 +++------
 sources                            |    2 +-
 3 files changed, 483 insertions(+), 78 deletions(-)
---
diff --git a/globus-gass-transfer-doxygen.patch b/globus-gass-transfer-doxygen.patch
new file mode 100644
index 0000000..9e34a34
--- /dev/null
+++ b/globus-gass-transfer-doxygen.patch
@@ -0,0 +1,449 @@
+diff --git a/library/Makefile.am b/library/Makefile.am
+index e7c6899..b35db00 100644
+--- a/library/Makefile.am
++++ b/library/Makefile.am
+@@ -44,7 +44,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/library/Makefile.in b/library/Makefile.in
+index e7c6899..b35db00 100644
+--- a/library/Makefile.in
++++ b/library/Makefile.in
+@@ -44,7 +44,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/library/globus_gass_transfer.c b/library/globus_gass_transfer.c
+index 7821596..122e121 100644
+--- a/library/globus_gass_transfer.c
++++ b/library/globus_gass_transfer.c
+@@ -16,16 +16,10 @@
+ 
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+- * @file globus_gass_transfer.c GASS transfer module descriptor
++ * @file globus_gass_transfer.c
++ * @brief GASS transfer module descriptor
+  *
+  * This module implements the GASS transfer module descriptor
+- *
+- * CVS Information:
+- *
+- * $Source$
+- * $Date$
+- * $Revision$
+- * $Author$
+  */
+ #endif
+ 
+diff --git a/library/globus_gass_transfer.h b/library/globus_gass_transfer.h
+index d344836..cbb2fe4 100644
+--- a/library/globus_gass_transfer.h
++++ b/library/globus_gass_transfer.h
+@@ -16,6 +16,7 @@
+ 
+ /**
+  * @file globus_gass_transfer.h
++ * @brief GASS transfer
+  */
+ 
+ #ifndef GLOBUS_GASS_TRANSFER_H
+@@ -37,7 +38,7 @@ extern "C" {
+ /**
+  * @defgroup globus_gass_transfer GASS Transfer API
+  * @brief GASS Transfer API
+- * @details
++ *
+  * The GASS Transfer API is the core part of the GASS
+  * (Global Access to Secondary Storage) component of the Globus Toolkit.
+  * The purpose of GASS is to provide a simple way to enable grid applications
+@@ -104,8 +105,7 @@ extern globus_module_descriptor_t		globus_i_gass_transfer_module;
+ /**
+  * @struct globus_gass_transfer_request_t
+  * @ingroup globus_gass_transfer_request
+- *
+- * Request handle.
++ * @brief Request handle.
+  *
+  * A request handle is associated with each file transfer operation. The
+  * same structure is used for both client- and server- side requests. For
+@@ -328,9 +328,10 @@ typedef void
+ /* Client Interface */
+ /**
+  * @brief GASS Transfer Client Operations
++ *
+  * @defgroup globus_gass_transfer_client Client-Initiated Operations
+  * @ingroup globus_gass_transfer
+- * @details
++ *
+  * One mode of using the GASS Transfer API is to initiate
+  * file transfers. The operations supported by the GASS Transfer API
+  * are file get, put, and append. These operations are provided for
+@@ -393,9 +394,10 @@ globus_gass_transfer_append(
+ 
+ /**
+  * @brief GASS Server Implementation
++ *
+  * @defgroup globus_gass_transfer_server Implementing Servers
+  * @ingroup globus_gass_transfer
+- * @details
++ *
+  * Another mode of using the GASS Transfer API is to implement
+  * data servers. The primary difference between the client and
+  * server parts of the GASS Transfer API are how requests are generated.
+@@ -554,9 +556,10 @@ globus_gass_transfer_fail(
+     void *					user_arg);
+ /**
+  * @brief GASS Referrals
++ *
+  * @defgroup globus_gass_transfer_referral Referrals
+  * @ingroup globus_gass_transfer
+- * @details
++ *
+  * The GASS Transfer API supports referring URL requests to alternate
+  * URLs via referrals. Referrals are essentially pointers to another
+  * URL or URLs which contain the same file as the original location which
+@@ -595,9 +598,10 @@ globus_gass_transfer_referral_destroy(
+ /* Request Accessors */
+ /**
+  * @brief Request Handles
++ *
+  * @defgroup globus_gass_transfer_request Request Handles
+  * @ingroup globus_gass_transfer
+- * @details
++ *
+  * Request handles are used by the GASS Transfer API to associate
+  * operations with a single file transfer request. Specifically,
+  * they are used to register multiple byte range buffers with
+@@ -685,7 +689,7 @@ globus_gass_transfer_request_set_type(
+ /**
+  * @defgroup globus_gass_transfer_requestattr Request Attributes
+  * @ingroup globus_gass_transfer
+- * @details
++ *
+  * The GASS Transfer library uses Globus objects to provide an
+  * extensible way of creating protocol-specific attributes.
+  */
+diff --git a/library/globus_gass_transfer_attribute.c b/library/globus_gass_transfer_attribute.c
+index 3372c37..d5b7fba 100644
+--- a/library/globus_gass_transfer_attribute.c
++++ b/library/globus_gass_transfer_attribute.c
+@@ -16,16 +16,11 @@
+ 
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+- * @file globus_gass_transfer_server.c Request and Listener Attributes
++ * @file globus_gass_transfer_server.c
++ * @brief Request and Listener Attributes
+  *
+  * This module implements the globus gass request and transfer attribute
+  * accessors
+- *
+- * CVS Information:
+- * $Source$
+- * $Date$
+- * $Revision$
+- * $Author$
+  */
+ #endif
+ 
+diff --git a/library/globus_gass_transfer_client.c b/library/globus_gass_transfer_client.c
+index 3c9886e..3783ee1 100644
+--- a/library/globus_gass_transfer_client.c
++++ b/library/globus_gass_transfer_client.c
+@@ -16,14 +16,10 @@
+ 
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+- * @file globus_gass_transfer_client.c Client Interface
++ * @file globus_gass_transfer_client.c
++ * @brief Client Interface
+  *
+  * This module implements the client interface to the GASS transfer library
+- *
+- * $Source$
+- * $Date$
+- * $Revision$
+- * $Author$
+  */
+ #endif
+ 
+diff --git a/library/globus_gass_transfer_http.c b/library/globus_gass_transfer_http.c
+index 6b5e5e3..de8853e 100644
+--- a/library/globus_gass_transfer_http.c
++++ b/library/globus_gass_transfer_http.c
+@@ -16,16 +16,11 @@
+ 
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+- * @file globus_gass_transfer_http.c http/https Protocol Module Implementation
++ * @file globus_gass_transfer_http.c
++ * @brief http/https Protocol Module Implementation
+  *
+  * This module implements the http and https URL schemes for the GASS transfer
+  * library
+- *
+- * CVS Information:
+- * $Source$
+- * $Date$
+- * $Revision$
+- * $Author$
+  */
+ #endif
+ 
+diff --git a/library/globus_gass_transfer_proto.c b/library/globus_gass_transfer_proto.c
+index f52bb32..1c3ecde 100644
+--- a/library/globus_gass_transfer_proto.c
++++ b/library/globus_gass_transfer_proto.c
+@@ -16,16 +16,10 @@
+ 
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+- * @file globus_gass_transfer_proto.c Protocol module interface.
++ * @file globus_gass_transfer_proto.c
++ * @brief Protocol module interface.
+  *
+  * This module implements the GASS transfer protocol module library
+- *
+- * CVS Information:
+- *
+- * $Source$
+- * $Date$
+- * $Revision$
+- * $Author$
+  */
+ #endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+ 
+diff --git a/library/globus_gass_transfer_proto.h b/library/globus_gass_transfer_proto.h
+index 505594c..c8396e7 100644
+--- a/library/globus_gass_transfer_proto.h
++++ b/library/globus_gass_transfer_proto.h
+@@ -16,15 +16,17 @@
+ 
+ /**
+  * @file globus_gass_transfer_proto.h
++ * @brief GASS Transfer Protocol Interface
+  *
+  * This header defines the GASS protocol module library interface
+  */
+ 
+ /**
+  * @brief Protocol Implementation API
++ *
+  * @defgroup globus_gass_transfer_protocol Protocol Modules
+  * @ingroup globus_gass_transfer
+- * @details
++ *
+  * The GASS Protocol Module API is designed to make it possible to
+  * extend the GASS client and server APIs to support additional protocols
+  * without making any changes to the core of the GASS implementation. GASS
+@@ -360,9 +362,9 @@ typedef void
+ 
+ /**
+  * @struct globus_gass_transfer_request_proto_s
+- * Protocol module request handling structure.
+- * @ingroup globus_gass_transfer_protocol
++ * @brief Protocol module request handling structure.
+  *
++ * @ingroup globus_gass_transfer_protocol
+  * This structure is created by a GASS transfer protocol module to
+  * handle a particular request. It is created in response to a
+  * @link globus_gass_transfer_listener_proto_s::accept
+@@ -423,7 +425,7 @@ struct globus_gass_transfer_request_proto_s
+ 
+ /**
+  * @struct globus_gass_transfer_listener_proto_s
+- * Protocol module listener handling structure.
++ * @brief Protocol module listener handling structure.
+  * @ingroup globus_gass_transfer_protocol
+  */
+ struct globus_gass_transfer_listener_proto_s
+@@ -440,7 +442,7 @@ struct globus_gass_transfer_listener_proto_s
+ 
+ /**
+  * @struct globus_gass_transfer_proto_descriptor_t
+- * Protocol module descriptor structure.
++ * @brief Protocol module descriptor structure.
+  *
+  * @ingroup globus_gass_transfer_protocol
+  * @see globus_gass_transfer_proto_register_protocol(),
+diff --git a/library/globus_gass_transfer_referral.c b/library/globus_gass_transfer_referral.c
+index 1996bad..87159af 100644
+--- a/library/globus_gass_transfer_referral.c
++++ b/library/globus_gass_transfer_referral.c
+@@ -16,17 +16,11 @@
+ 
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+- * @file globus_gass_transfer_referral.c Referral structure accessors.
++ * @file globus_gass_transfer_referral.c
++ * @brief Referral structure accessors.
+  *
+  * This module implements the referral accessors for the GASS transfer
+  * library
+- *
+- * CVS Information:
+- *
+- * $Source$
+- * $Date$
+- * $Revision$
+- * $Author$
+  */
+ #endif
+ 
+diff --git a/library/globus_gass_transfer_request.c b/library/globus_gass_transfer_request.c
+index b9363a4..c0642f9 100644
+--- a/library/globus_gass_transfer_request.c
++++ b/library/globus_gass_transfer_request.c
+@@ -17,15 +17,10 @@
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+  * @file globus_gass_transfer_request.c
++ * @brief GASS Transfer Request
+  *
+  * This module implements the request structure accessors for the
+  * GASS transfer library 
+- *
+- * CVS Information:
+- * $Source$
+- * $Date$
+- * $Revision$
+- * $Author$
+  */
+ #endif
+ 
+diff --git a/library/globus_gass_transfer_send_recv.c b/library/globus_gass_transfer_send_recv.c
+index d504483..f23cc9d 100644
+--- a/library/globus_gass_transfer_send_recv.c
++++ b/library/globus_gass_transfer_send_recv.c
+@@ -16,18 +16,11 @@
+ 
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+- *
+- * @file globus_gass_transfer_send_recv.c Send/Receive Data
++ * @file globus_gass_transfer_send_recv.c
++ * @brief Send/Receive Data
+  *
+  * This module implements the send and receive functionality of the
+  * GASS transfer library.
+- *  
+- * CVS Information: 
+- *
+- * $Source$
+- * $Date$
+- * $Revision$
+- * $Author$
+  */
+ #endif
+ 
+diff --git a/library/globus_gass_transfer_server.c b/library/globus_gass_transfer_server.c
+index e87d825..0d64197 100644
+--- a/library/globus_gass_transfer_server.c
++++ b/library/globus_gass_transfer_server.c
+@@ -16,17 +16,11 @@
+ 
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+- * @file globus_gass_transfer_server.c GASS Server
++ * @file globus_gass_transfer_server.c
++ * @brief GASS Server
+  * 
+  * This module implements the gass server functionality of the GASS
+  * transfer library
+- *
+- * CVS Information:
+- *
+- * $Source$
+- * $Date$
+- * $Revision$
+- * $Author$
+  */
+ #endif
+ 
+diff --git a/library/globus_i_gass_transfer.h b/library/globus_i_gass_transfer.h
+index 41f8e9e..f19b5a1 100644
+--- a/library/globus_i_gass_transfer.h
++++ b/library/globus_i_gass_transfer.h
+@@ -14,8 +14,11 @@
+  * limitations under the License.
+  */
+ 
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
+ /**
+  * @file globus_i_gass_transfer.h
++ * @brief GASS transfer internal interface
+  *
+  * This header defines the internal interface of the GASS transfer library
+  */
+@@ -215,3 +218,5 @@ globus_i_gass_transfer_deactivate_callback(
+ #endif
+ 
+ #endif /* GLOBUS_I_GASS_TRANSFER_H */
++
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+diff --git a/library/globus_i_gass_transfer_keyvalue.h b/library/globus_i_gass_transfer_keyvalue.h
+index 3eb7b2e..24d2bce 100644
+--- a/library/globus_i_gass_transfer_keyvalue.h
++++ b/library/globus_i_gass_transfer_keyvalue.h
+@@ -14,10 +14,13 @@
+  * limitations under the License.
+  */
+ 
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
+ /**
+  * @file globus_i_gass_transfer_keyvalue.h
+- *
++ * @brief GASS Transfer Key Value
+  */
++
+ #ifndef GLOBUS_GASS_TRANSFER_KEYVALUE_H
+ #define GLOBUS_GASS_TRANSFER_KEYVALUE_H
+ 
+@@ -59,3 +62,5 @@ globus_i_gass_transfer_keyvalue_destroy(
+ #endif
+ 
+ #endif /* GLOBUS_GASS_INCLUDE_GLOBUS_GASS_TRANSFER_KEYVALUE_H */
++
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+diff --git a/library/globus_l_gass_transfer_http.h b/library/globus_l_gass_transfer_http.h
+index d12482a..e3c2447 100644
+--- a/library/globus_l_gass_transfer_http.h
++++ b/library/globus_l_gass_transfer_http.h
+@@ -14,11 +14,14 @@
+  * limitations under the License.
+  */
+ 
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
+ /**
+  * @file globus_l_gass_transfer_http.h
+- * @details
+- *  This header defines the prototypes for the local functions in the
+- *  http protocol module source file
++ * @brief http protocol module
++ *
++ * This header defines the prototypes for the local functions in the
++ * http protocol module source file
+  */
+ #ifndef GLOBUS_L_GASS_TRANSFER_HTTP_H
+ #define GLOBUS_L_GASS_TRANSFER_HTTP_H
+@@ -646,3 +649,5 @@ globus_l_gass_transfer_http_listener_close(
+ #endif
+ 
+ #endif /* GLOBUS_L_GASS_TRANSFER_HTTP_H */
++
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
diff --git a/globus-gass-transfer.spec b/globus-gass-transfer.spec
index c60fd38..ddec4a9 100644
--- a/globus-gass-transfer.spec
+++ b/globus-gass-transfer.spec
@@ -1,65 +1,35 @@
-%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-transfer
 %global _name %(tr - _ <<< %{name})
-Version:	7.2
-Release:	12%{?dist}
+Version:	8.7
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus Gass Transfer
 
 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-GRIDFTP
+#		Doxygen fixes
+Patch0:		%{name}-doxygen.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	globus-common%{?_isa} >= 14
-Requires:	globus-gss-assist%{?_isa} >= 8
-Requires:	globus-io%{?_isa} >= 8
-Requires:	globus-gssapi-gsi%{?_isa} >= 9
-BuildRequires:	grid-packaging-tools >= 3.4
-BuildRequires:	globus-core >= 8
-BuildRequires:	globus-common-devel >= 14
+BuildRequires:	globus-common-devel >= 15
+BuildRequires:	globus-gssapi-gsi-devel >= 10
 BuildRequires:	globus-gss-assist-devel >= 8
 BuildRequires:	globus-io-devel >= 8
-BuildRequires:	globus-gssapi-gsi-devel >= 9
 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 Gass Transfer Development Files
 Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
-Requires:	globus-common-devel%{?_isa} >= 14
+Requires:	globus-common-devel%{?_isa} >= 15
+Requires:	globus-gssapi-gsi-devel%{?_isa} >= 10
 Requires:	globus-gss-assist-devel%{?_isa} >= 8
 Requires:	globus-io-devel%{?_isa} >= 8
-Requires:	globus-gssapi-gsi-devel%{?_isa} >= 9
-Requires:	globus-core%{?_isa} >= 8
 
 %package doc
 Summary:	Globus Toolkit - Globus Gass Transfer Documentation Files
@@ -67,7 +37,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
@@ -98,21 +67,16 @@ Globus Gass Transfer 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
@@ -123,32 +87,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
-
-# Remove directory man page
-rm -f %{buildroot}%{_mandir}/man3/*%{_name}-%{version}*
-sed /%{_name}-%{version}/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}
 
@@ -156,17 +100,29 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-%files -f package.filelist
-%dir %{_datadir}/globus/packages/%{_name}
+%files
+%{_libdir}/libglobus_gass_transfer.so.*
 %dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/GLOBUS_LICENSE
 %doc %{_pkgdocdir}/README
 
-%files -f package-devel.filelist devel
+%files devel
+%{_includedir}/globus/*
+%{_libdir}/libglobus_gass_transfer.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> - 8.7-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> - 7.2-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 9526020..d12fa0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-daebf425dc5f0b57c8572c2a0c6ba826  globus_gass_transfer-7.2.tar.gz
+e7c7cb91116168ed4ca1f16c40aff15e  globus_gass_transfer-8.7.tar.gz


More information about the scm-commits mailing list