From f56d4080034c3ec2c80c81b8f62ef40a20954aeb Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Aug 08 2010 17:42:10 +0000
Subject: Merge branch 'master' into f14


Conflicts:
	globus-common.spec

---

diff --git a/globus-common-setup.patch b/globus-common-setup.patch
index 5901f65..53b9847 100644
--- a/globus-common-setup.patch
+++ b/globus-common-setup.patch
@@ -297,7 +297,7 @@ diff -ur globus_common_setup-2.6.orig/setup-globus-common.pl globus_common_setup
 -}
 -
 -my $setupdir = "$globusdir/setup/globus/";
-+require Globus::Core::Paths;
++use Globus::Core::Paths;
 +my $setupdir = $Globus::Core::Paths::setupdir;
 +my $libexecdir = $Globus::Core::Paths::libexecdir;
 +my $bindir = $Globus::Core::Paths::bindir;
diff --git a/globus-common-usr.patch b/globus-common-usr.patch
index 7346b28..80fb6b2 100644
--- a/globus-common-usr.patch
+++ b/globus-common-usr.patch
@@ -218,7 +218,7 @@ diff -ur globus_common-11.2.orig/scripts/globus-makefile-header globus_common-11
  
 +    @INC = ("$globus_path/lib/perl", @INC);
 +
-+    require Globus::Core::Paths;
++    use Globus::Core::Paths;
 +    my $includedir = $Globus::Core::Paths::includedir;
 +    my $flavorincludedir = $Globus::Core::Paths::flavorincludedir;
 +    my $libdir = $Globus::Core::Paths::libdir;
diff --git a/globus-common.spec b/globus-common.spec
index c3677db..648de29 100644
--- a/globus-common.spec
+++ b/globus-common.spec
@@ -10,7 +10,7 @@ Name:		globus-common
 %global _name %(tr - _ <<< %{name})
 Version:	11.5
 %global setupversion 2.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -379,6 +379,9 @@ rm -f config.log config.status
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Sun Aug 08 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 11.5-2
+- Fix perl dependncies (use vs. require)
+
 * Sat Jul 17 2010 Mattias Ellert <mattias.ellert@fysast.uu.se> - 11.5-1
 - Update to Globus Toolkit 5.0.2