[globus-gss-assist/el4] Update to Globus Toolkit 5.2.0 Drop patches globus-gss-assist-normalization.patch and globus-gss-ass

Mattias Ellert ellert at fedoraproject.org
Sun Jan 8 01:19:36 UTC 2012


commit cfa45488c56426740f0fda9693acdbacf65076fa
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Jan 7 15:46:17 2012 +0100

    Update to Globus Toolkit 5.2.0
    Drop patches globus-gss-assist-normalization.patch and
    globus-gss-assist-gridmapdir.patch (fixed upstream)

 .gitignore                            |    2 +-
 GLOBUS-GSIC                           |    6 +
 globus-gss-assist-deps.patch          |   19 ++
 globus-gss-assist-doxygen.patch       |   98 ++++++-
 globus-gss-assist-format.patch        |   33 +++
 globus-gss-assist-gridmapdir.patch    |  446 ---------------------------------
 globus-gss-assist-normalization.patch |   42 ---
 globus-gss-assist.spec                |  113 ++++-----
 sources                               |    2 +-
 9 files changed, 189 insertions(+), 572 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ad03908..943fe53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /epstopdf-2.9.5gw
-/globus_gss_assist-5.10.tar.gz
+/*.tar.gz
diff --git a/GLOBUS-GSIC b/GLOBUS-GSIC
index 35fe6ee..b972218 100644
--- a/GLOBUS-GSIC
+++ b/GLOBUS-GSIC
@@ -6,6 +6,9 @@ http://www.globus.org/toolkit/docs/latest-stable/security/gsic/
 Admin Guide:
 http://www.globus.org/toolkit/docs/latest-stable/security/gsic/admin/
 
+User's Guide
+http://www.globus.org/toolkit/docs/latest-stable/security/gsic/user/
+
 Developer's Guide:
 http://www.globus.org/toolkit/docs/latest-stable/security/gsic/developer/
 
@@ -20,3 +23,6 @@ http://www.globus.org/toolkit/docs/latest-stable/security/gsic/qp/
 
 Migrating Guide:
 http://www.globus.org/toolkit/docs/latest-stable/security/gsic/mig/
+
+Globus RPM packaging is supported by the Initiative for Globus in Europe:
+http://www.ige-project.eu/
diff --git a/globus-gss-assist-deps.patch b/globus-gss-assist-deps.patch
new file mode 100644
index 0000000..42c96d6
--- /dev/null
+++ b/globus-gss-assist-deps.patch
@@ -0,0 +1,19 @@
+diff -ur globus_gss_assist-8.1.orig/pkgdata/pkg_data_src.gpt.in globus_gss_assist-8.1/pkgdata/pkg_data_src.gpt.in
+--- globus_gss_assist-8.1.orig/pkgdata/pkg_data_src.gpt.in	2011-10-25 15:27:42.000000000 +0200
++++ globus_gss_assist-8.1/pkgdata/pkg_data_src.gpt.in	2011-12-11 16:41:11.339663517 +0100
+@@ -16,6 +16,7 @@
+                 <Version>
+                     <Simple_Version Major="14"/>
+                 </Version>
++            </Dependency>
+                 <Dependency Name="globus_gsi_sysconfig">
+                     <Version>
+                         <Simple_Version Major="5"/>
+@@ -26,7 +27,6 @@
+                         <Simple_Version Major="8"/>
+                     </Version>
+                 </Dependency>
+-            </Dependency>
+             <Dependency Name="globus_gssapi_gsi">
+                 <Version>
+                     <Simple_Version Major="9"/>
diff --git a/globus-gss-assist-doxygen.patch b/globus-gss-assist-doxygen.patch
index 4e7d844..0baed5d 100644
--- a/globus-gss-assist-doxygen.patch
+++ b/globus-gss-assist-doxygen.patch
@@ -1,7 +1,77 @@
-diff -ur globus_gss_assist-5.10.orig/gridmap.c globus_gss_assist-5.10/gridmap.c
---- globus_gss_assist-5.10.orig/gridmap.c	2011-04-22 20:16:46.000000000 +0200
-+++ globus_gss_assist-5.10/gridmap.c	2011-06-05 01:52:18.645634168 +0200
-@@ -128,7 +128,7 @@
+diff -ur globus_gss_assist-8.1.orig/globus_gss_assist_constants.h globus_gss_assist-8.1/globus_gss_assist_constants.h
+--- globus_gss_assist-8.1.orig/globus_gss_assist_constants.h	2007-08-09 16:24:23.000000000 +0200
++++ globus_gss_assist-8.1/globus_gss_assist_constants.h	2012-01-05 15:59:25.847619294 +0100
+@@ -14,6 +14,9 @@
+  * limitations under the License.
+  */
+ 
++#ifndef GLOBUS_GSI_GSS_ASSIST_CONSTANTS_H
++#define GLOBUS_GSI_GSS_ASSIST_CONSTANTS_H
++
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+  * @file globus_gss_assist_constants.h
+@@ -26,9 +29,6 @@
+  */
+ #endif
+ 
+-#ifndef GLOBUS_GSI_GSS_ASSIST_CONSTANTS_H
+-#define GLOBUS_GSI_GSS_ASSIST_CONSTANTS_H
+-
+ #ifndef EXTERN_C_BEGIN
+ #    ifdef __cplusplus
+ #        define EXTERN_C_BEGIN extern "C" {
+diff -ur globus_gss_assist-8.1.orig/globus_gss_assist.h globus_gss_assist-8.1/globus_gss_assist.h
+--- globus_gss_assist-8.1.orig/globus_gss_assist.h	2010-03-29 22:08:12.000000000 +0200
++++ globus_gss_assist-8.1/globus_gss_assist.h	2012-01-05 15:59:56.955617467 +0100
+@@ -14,6 +14,9 @@
+  * limitations under the License.
+  */
+ 
++#ifndef _GLOBUS_GSS_ASSIST_H
++#define _GLOBUS_GSS_ASSIST_H
++
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+  * @file globus_gss_assist.h
+@@ -25,9 +28,6 @@
+  */
+ #endif
+  
+-#ifndef _GLOBUS_GSS_ASSIST_H
+-#define _GLOBUS_GSS_ASSIST_H
+-
+ #ifndef EXTERN_C_BEGIN
+ #    ifdef __cplusplus
+ #        define EXTERN_C_BEGIN extern "C" {
+diff -ur globus_gss_assist-8.1.orig/globus_i_gss_assist.h globus_gss_assist-8.1/globus_i_gss_assist.h
+--- globus_gss_assist-8.1.orig/globus_i_gss_assist.h	2006-01-19 06:56:01.000000000 +0100
++++ globus_gss_assist-8.1/globus_i_gss_assist.h	2012-01-05 16:01:36.975611793 +0100
+@@ -15,6 +15,10 @@
+  */
+ 
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
++#ifndef GLOBUS_I_GSS_ASSIST_H
++#define GLOBUS_I_GSS_ASSIST_H
++
+ /**
+  * @file globus_i_gss_assist.h
+  * Globus GSI GSS Assist Library
+@@ -25,9 +29,6 @@
+  * $Date: 2006/01/19 05:56:01 $
+  */
+ 
+-#ifndef GLOBUS_I_GSS_ASSIST_H
+-#define GLOBUS_I_GSS_ASSIST_H
+-
+ #include "globus_gss_assist.h"
+ #include "globus_common.h"
+ 
+diff -ur globus_gss_assist-8.1.orig/gridmap.c globus_gss_assist-8.1/gridmap.c
+--- globus_gss_assist-8.1.orig/gridmap.c	2011-04-22 20:37:02.000000000 +0200
++++ globus_gss_assist-8.1/gridmap.c	2012-01-05 16:03:28.475606011 +0100
+@@ -520,7 +520,7 @@
   * If successful, the caller is responsible for freeing the string pointed
   * to by @a useridp.
   *
@@ -10,7 +80,7 @@ diff -ur globus_gss_assist-5.10.orig/gridmap.c globus_gss_assist-5.10/gridmap.c
   * file defined by the value of the GRIDMAP environment variable. If that
   * is not set, it falls back to $HOME/.gridmap.
   *
-@@ -257,12 +257,12 @@
+@@ -661,12 +661,12 @@
   * @ingroup globus_gsi_gss_assist
   *
   * @details
@@ -25,7 +95,7 @@ diff -ur globus_gss_assist-5.10.orig/gridmap.c globus_gss_assist-5.10/gridmap.c
   * file defined by the value of the GRIDMAP environment variable. If that
   * is not set, it falls back to $HOME/.gridmap.
   *
-@@ -272,7 +272,7 @@
+@@ -676,7 +676,7 @@
   *     The local account name that access is sought for.
   *
   * @return
@@ -34,7 +104,7 @@ diff -ur globus_gss_assist-5.10.orig/gridmap.c globus_gss_assist-5.10/gridmap.c
   *     @a globusid and @a userid, it returns 0; otherwise it returns 1.
   *
   * @retval GLOBUS_SUCCESS
-@@ -380,7 +380,7 @@
+@@ -790,7 +790,7 @@
   * @ingroup globus_gsi_gss_assist
   *
   * @details
@@ -43,7 +113,7 @@ diff -ur globus_gss_assist-5.10.orig/gridmap.c globus_gss_assist-5.10/gridmap.c
   * gridmap file to determine a if the user name passed as the @a local_user 
   * parameter is the default local user for a Grid ID in the gridmap file. If
   * so, it modifies @a globusidp to point to a copy of that ID. Otherwise, it
-@@ -389,7 +389,7 @@
+@@ -799,7 +799,7 @@
   * If successful, the caller is responsible for freeing the string pointed to
   * by the @a globusidp pointer.
   *
@@ -52,7 +122,7 @@ diff -ur globus_gss_assist-5.10.orig/gridmap.c globus_gss_assist-5.10/gridmap.c
   * gridmap file defined by the value of the GRIDMAP environment variable. If
   * that is not set, it falls back to $HOME/.gridmap.
   *
-@@ -399,9 +399,9 @@
+@@ -809,9 +809,9 @@
   *     A Grid ID that maps from the local_user.
   *
   * @return
@@ -64,7 +134,7 @@ diff -ur globus_gss_assist-5.10.orig/gridmap.c globus_gss_assist-5.10/gridmap.c
   *     value pointed to by @a globusidp is undefined.
   *
   * @retval GLOBUS_SUCCESS
-@@ -1358,7 +1358,7 @@
+@@ -1782,7 +1782,7 @@
   * @ingroup globus_gsi_gss_assist
   *
   * @details
@@ -73,7 +143,7 @@ diff -ur globus_gss_assist-5.10.orig/gridmap.c globus_gss_assist-5.10/gridmap.c
   * gridmap file and finds all Grid IDs that map to a local user ID.
   * The @a dns parameter is modified to point to an array of Grid ID
   * strings from the gridmap file, and the @a dn_count parameter is
-@@ -1366,7 +1366,7 @@
+@@ -1790,7 +1790,7 @@
   * The caller is responsible for freeing the array using the macro
   * @a GlobusGssAssistFreeDNArray().
   *
@@ -82,7 +152,7 @@ diff -ur globus_gss_assist-5.10.orig/gridmap.c globus_gss_assist-5.10/gridmap.c
   * gridmap file defined by the value of the GRIDMAP environment variable. If
   * that is not set, it falls back to $HOME/.gridmap.
   *
-@@ -1382,10 +1382,10 @@
+@@ -1806,10 +1806,10 @@
   *     entries in the array returned via the @a dns parameter.
   *
   * @return
@@ -95,7 +165,7 @@ diff -ur globus_gss_assist-5.10.orig/gridmap.c globus_gss_assist-5.10/gridmap.c
   *     that can be resolved to an error object and the values
   *     pointed to by @a dns and @a dn_count are undefined.
   *
-@@ -1552,12 +1552,12 @@
+@@ -1976,12 +1976,12 @@
   * value passed as the @a identity_buffer_length parameter.
   *
   * If authorization callouts are defined in the callout configuration
@@ -110,7 +180,7 @@ diff -ur globus_gss_assist-5.10.orig/gridmap.c globus_gss_assist-5.10/gridmap.c
   * first looks for a file defined by the value of the GRIDMAP environment
   * variable. If that is not set, it falls back to $HOME/.gridmap.
   *
-@@ -1577,10 +1577,10 @@
+@@ -2001,10 +2001,10 @@
   *     Length of the @a identity_buffer array.
   *
   * @return
diff --git a/globus-gss-assist-format.patch b/globus-gss-assist-format.patch
new file mode 100644
index 0000000..7f0d0c5
--- /dev/null
+++ b/globus-gss-assist-format.patch
@@ -0,0 +1,33 @@
+diff -ur globus_gss_assist-8.1.orig/globus_i_gss_assist.h globus_gss_assist-8.1/globus_i_gss_assist.h
+--- globus_gss_assist-8.1.orig/globus_i_gss_assist.h	2006-01-19 06:56:01.000000000 +0100
++++ globus_gss_assist-8.1/globus_i_gss_assist.h	2011-12-28 08:46:49.566990108 +0100
+@@ -60,7 +60,7 @@
+           char *                        _tmp_str_ = \
+               globus_common_create_nstring _MESSAGE_; \
+           globus_libc_fprintf(globus_i_gsi_gss_assist_debug_fstream, \
+-                              _tmp_str_); \
++                              "%s", _tmp_str_); \
+           globus_libc_free(_tmp_str_); \
+         } \
+     }
+diff -ur globus_gss_assist-8.1.orig/tokens_f.c globus_gss_assist-8.1/tokens_f.c
+--- globus_gss_assist-8.1.orig/tokens_f.c	2007-08-09 16:24:23.000000000 +0200
++++ globus_gss_assist-8.1/tokens_f.c	2011-12-28 08:53:11.418997004 +0100
+@@ -120,7 +120,7 @@
+         {
+             GLOBUS_I_GSI_GSS_ASSIST_DEBUG_FPRINTF(
+                 3, (globus_i_gsi_gss_assist_debug_fstream,
+-                    _GASL("FAILED READING EXTRA BYTE\n")));
++                    "%s", _GASL("FAILED READING EXTRA BYTE\n")));
+             return_value =  GLOBUS_GSS_ASSIST_TOKEN_EOF;
+             goto exit;
+         }
+@@ -384,7 +384,7 @@
+             
+             GLOBUS_I_GSI_GSS_ASSIST_DEBUG_FPRINTF(
+                 3, (globus_i_gsi_gss_assist_debug_fstream,
+-                    _GASL("with 4 byte length")));
++                    "%s", _GASL("with 4 byte length")));
+             
+             if (fwrite(int_buf ,1 ,4 , fd) != 4)
+             {
diff --git a/globus-gss-assist.spec b/globus-gss-assist.spec
index 9f0fe2f..c3759ae 100644
--- a/globus-gss-assist.spec
+++ b/globus-gss-assist.spec
@@ -1,50 +1,41 @@
 %ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
 %else
-%global flavor gcc32pthr
+%global flavor gcc32
 %endif
 
 Name:		globus-gss-assist
 %global _name %(tr - _ <<< %{name})
-Version:	5.10
+Version:	8.1
 Release:	1%{?dist}
 Summary:	Globus Toolkit - GSSAPI Assist library
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
-#		Source is extracted from the globus toolkit installer:
-#		wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.4/installers/src/gt5.0.4-all-source-installer.tar.bz2
-#		tar -jxf gt5.0.4-all-source-installer.tar.bz2
-#		mv gt5.0.4-all-source-installer/source-trees/gsi/gss_assist/source globus_gss_assist-5.10
-#		cp -p gt5.0.4-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gss_assist-5.10
-#		tar -zcf globus_gss_assist-5.10.tar.gz globus_gss_assist-5.10
-Source:		%{_name}-%{version}.tar.gz
+Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.0/packages/src/%{_name}-%{version}.tar.gz
 #		README file
 Source8:	GLOBUS-GSIC
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 Source9:	epstopdf-2.9.5gw
-#		the GRIDMAPDIR patch from VDT:
-#		http://vdt.cs.wisc.edu/patches/1.10.1/011__gss_assist_gridmap.diff
-Patch0:		%{name}-gridmapdir.patch
-#		globus_i_gss_assist_gridmap_parse_globusid and
-#		X509_NAME_oneline don't normalize DNs the same way:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=1417
-Patch1:		%{name}-normalization.patch
-#		Fix doxygen markup
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7185
-Patch2:		%{name}-doxygen.patch
+Patch0:		%{name}-doxygen.patch
+Patch1:		%{name}-deps.patch
+Patch2:		%{name}-format.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	globus-common
-BuildRequires:	grid-packaging-tools
-BuildRequires:	globus-gsi-cert-utils-devel%{?_isa} >= 2
-BuildRequires:	globus-gsi-sysconfig-devel%{?_isa} >= 1
-BuildRequires:	globus-common-devel%{?_isa} >= 3
-BuildRequires:	globus-callout-devel%{?_isa}
-BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 4
-BuildRequires:	globus-core%{?_isa} >= 4
+Requires:	globus-gsi-cert-utils%{?_isa} >= 8
+Requires:	globus-gsi-sysconfig%{?_isa} >= 5
+Requires:	globus-common%{?_isa} >= 14
+Requires:	globus-callout%{?_isa} >= 2
+Requires:	globus-gssapi-gsi%{?_isa} >= 9
+BuildRequires:	grid-packaging-tools >= 3.4
+BuildRequires:	globus-core%{?_isa} >= 8
+BuildRequires:	globus-gsi-cert-utils-devel%{?_isa} >= 8
+BuildRequires:	globus-gsi-sysconfig-devel%{?_isa} >= 5
+BuildRequires:	globus-common-devel%{?_isa} >= 14
+BuildRequires:	globus-callout-devel%{?_isa} >= 2
+BuildRequires:	globus-gssapi-gsi-devel%{?_isa} >= 9
 BuildRequires:	doxygen
 BuildRequires:	graphviz
 %if "%{?rhel}" == "5"
@@ -61,18 +52,18 @@ BuildRequires:	tetex-latex
 Summary:	Globus Toolkit - GSSAPI Assist library Programs
 Group:		Applications/Internet
 Requires:	%{name}%{?_isa} = %{version}-%{release}
-Requires:	globus-common-progs >= 3
+Requires:	globus-common-progs >= 14
 
 %package devel
 Summary:	Globus Toolkit - GSSAPI Assist library Development Files
 Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
-Requires:	globus-gsi-cert-utils-devel%{?_isa} >= 2
-Requires:	globus-gsi-sysconfig-devel%{?_isa} >= 1
-Requires:	globus-common-devel%{?_isa} >= 3
-Requires:	globus-callout-devel%{?_isa}
-Requires:	globus-gssapi-gsi-devel%{?_isa} >= 4
-Requires:	globus-core%{?_isa} >= 4
+Requires:	globus-gsi-cert-utils-devel%{?_isa} >= 8
+Requires:	globus-gsi-sysconfig-devel%{?_isa} >= 5
+Requires:	globus-common-devel%{?_isa} >= 14
+Requires:	globus-callout-devel%{?_isa} >= 2
+Requires:	globus-gssapi-gsi-devel%{?_isa} >= 9
+Requires:	globus-core%{?_isa} >= 8
 
 %package doc
 Summary:	Globus Toolkit - GSSAPI Assist library Documentation Files
@@ -141,18 +132,15 @@ rm -f pkgdata/Makefile.am
 rm -f globus_automake*
 rm -rf autom4te.cache
 
-# Remove flavor tags
-for f in `find . -name Makefile.am` ; do
-  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
-      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
-      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
-done
-sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
-  -i pkgdata/pkg_data_src.gpt.in
-
+unset GLOBUS_LOCATION
+unset GPT_LOCATION
 %{_datadir}/globus/globus-bootstrap.sh
 
-%configure --with-flavor=%{flavor} --enable-doxygen
+%configure --disable-static --with-flavor=%{flavor} \
+	   --enable-doxygen --with-docdir=%{_docdir}/%{name}-%{version}
+
+# Reduce overlinking
+sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
 
 make %{?_smp_mflags}
 
@@ -168,37 +156,23 @@ GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
 
 # Remove libtool archives (.la files)
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
-sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
+sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
 
-# Remove static libraries (.a files)
-find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
-sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
-
-# 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 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
 
 # Move client man pages to progs package
-grep '.8$' $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
+grep '.[18]$' $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
   >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
-sed '/.8$/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
-
-# Move documentation to default RPM location
-mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
-  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-sed s!doc/%{_name}!doc/%{name}-%{version}! \
-  -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
+sed '/.[18]$/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
 # Remove unwanted documentation (needed for RHEL4)
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
 sed -e '/_%{_name}-%{version}_.*\.3/d' \
   -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
-# Install license file
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
 # Install README file
 install -m 644 -p %{SOURCE8} \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README
@@ -224,7 +198,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %dir %{_datadir}/globus/packages/%{_name}
 %dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 %doc %{_docdir}/%{name}-%{version}/README
 
 %files -f package-progs.filelist progs
@@ -232,13 +205,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f package-devel.filelist devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/%{name}.pc
 
 %files -f package-doc.filelist doc
 %defattr(-,root,root,-)
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Wed Dec 14 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 8.1-1
+- Update to Globus Toolkit 5.2.0
+- Drop patches globus-gss-assist-normalization.patch and
+  globus-gss-assist-gridmapdir.patch (fixed upstream)
+
 * Fri Jun 03 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.10-1
 - Update to Globus Toolkit 5.0.4
 - Fix doxygen markup
diff --git a/sources b/sources
index 50f4a3c..9db2d35 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-f497691313d93ffc33ca9d9f2f227bf4  globus_gss_assist-5.10.tar.gz
+856c4896daddd0891f4ca98df6a7d731  globus_gss_assist-8.1.tar.gz


More information about the scm-commits mailing list