rpms/globus-common/F-11 globus-common-usr.patch, 1.1, 1.2 globus-common.spec, 1.6, 1.7 import.log, 1.5, 1.6
Mattias Ellert
ellert at fedoraproject.org
Sun Aug 9 09:10:41 UTC 2009
- Previous message (by thread): rpms/globus-common/devel globus-common-usr.patch, 1.1, 1.2 globus-common.spec, 1.6, 1.7 import.log, 1.5, 1.6
- Next message (by thread): rpms/globus-common/F-10 globus-common-usr.patch, 1.1, 1.2 globus-common.spec, 1.6, 1.7 import.log, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ellert
Update of /cvs/pkgs/rpms/globus-common/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21084/F-11
Modified Files:
globus-common-usr.patch globus-common.spec import.log
Log Message:
* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-7
- Patch globus_location function to allow unset GLOBUS_LOCATION
- Put back config.guess file
globus-common-usr.patch:
Makefile.am | 2 -
library/globus_common_paths.c | 9 +++---
library/globus_extension.c | 13 ++++++---
programs/Makefile.am | 2 -
programs/globus-sh-exec.in | 6 +++-
programs/globus-version.in | 6 +++-
scripts/globus-hostname | 15 +++++------
scripts/globus-makefile-header | 47 +++++++++++++++++-------------------
scripts/globus-makefile-header.gpt1 | 44 +++++++++++++++------------------
scripts/globus-sh-tools.sh | 6 +++-
10 files changed, 79 insertions(+), 71 deletions(-)
Index: globus-common-usr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-11/globus-common-usr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-common-usr.patch 7 Apr 2009 07:40:27 -0000 1.1
+++ globus-common-usr.patch 9 Aug 2009 09:10:41 -0000 1.2
@@ -1,6 +1,66 @@
+diff -ur globus_common-10.2.orig/library/globus_common_paths.c globus_common-10.2/library/globus_common_paths.c
+--- globus_common-10.2.orig/library/globus_common_paths.c 2006-01-19 06:54:14.000000000 +0100
++++ globus_common-10.2/library/globus_common_paths.c 2009-08-04 16:43:07.208220052 +0200
+@@ -111,8 +111,7 @@
+ p = globus_libc_getenv(name);
+ if (!p || strlen(p)==0)
+ {
+- globus_libc_sprintf(errmsg,_GCSL("Environment variable %s is not set"), name);
+- return GLOBUS_COMMON_PATH_ERROR_INSTANCE(errmsg);
++ return GLOBUS_SUCCESS;
+ }
+
+ *bufp = globus_libc_strdup(p);
+@@ -199,17 +198,17 @@
+ if (!deploy && (result=globus_location(&deploy)))
+ return result;
+
+- filename = globus_malloc(strlen(deploy) +
++ filename = globus_malloc( ( deploy ? strlen(deploy) : 0 ) +
+ strlen(file_location) + 1 + 1 );
+ if (!filename)
+ return GLOBUS_COMMON_PATH_ERROR_INSTANCE(_GCSL("malloc error"));
+
+ globus_libc_sprintf(filename,
+ "%s/%s",
+- deploy,
++ deploy ? deploy : "",
+ file_location);
+
+- if (!deploy_path)
++ if (!deploy_path && deploy)
+ globus_free(deploy);
+
+ fp = fopen(filename,"r");
+diff -ur globus_common-10.2.orig/library/globus_extension.c globus_common-10.2/library/globus_extension.c
+--- globus_common-10.2.orig/library/globus_extension.c 2008-03-12 20:01:05.000000000 +0100
++++ globus_common-10.2/library/globus_extension.c 2009-08-03 19:57:22.077217655 +0200
+@@ -195,14 +195,17 @@
+
+ if(globus_location(&tmp) == GLOBUS_SUCCESS)
+ {
++ if(tmp)
++ {
+ #if defined(TARGET_ARCH_WIN32)
+- globus_l_globus_location =
+- globus_common_create_string("%s\\lib", tmp);
++ globus_l_globus_location =
++ globus_common_create_string("%s\\lib", tmp);
+ #else
+- globus_l_globus_location =
+- globus_common_create_string("%s/lib", tmp);
++ globus_l_globus_location =
++ globus_common_create_string("%s/lib", tmp);
+ #endif
+- globus_free(tmp);
++ globus_free(tmp);
++ }
+ }
+
+ initialized = GLOBUS_TRUE;
diff -ur globus_common-10.2.orig/Makefile.am globus_common-10.2/Makefile.am
--- globus_common-10.2.orig/Makefile.am 2004-10-11 14:53:32.000000000 +0200
-+++ globus_common-10.2/Makefile.am 2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/Makefile.am 2009-08-03 12:31:55.267481653 +0200
@@ -9,7 +9,7 @@
config \
doxygen
@@ -12,7 +72,7 @@ diff -ur globus_common-10.2.orig/Makefil
EXTRA_DIST = \
diff -ur globus_common-10.2.orig/programs/globus-sh-exec.in globus_common-10.2/programs/globus-sh-exec.in
--- globus_common-10.2.orig/programs/globus-sh-exec.in 2006-01-19 06:54:19.000000000 +0100
-+++ globus_common-10.2/programs/globus-sh-exec.in 2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/programs/globus-sh-exec.in 2009-08-03 12:31:55.268482825 +0200
@@ -17,7 +17,11 @@
#
@@ -28,7 +88,7 @@ diff -ur globus_common-10.2.orig/program
# This was done by the script initializer before V2.0
diff -ur globus_common-10.2.orig/programs/globus-version.in globus_common-10.2/programs/globus-version.in
--- globus_common-10.2.orig/programs/globus-version.in 2008-09-29 23:20:05.000000000 +0200
-+++ globus_common-10.2/programs/globus-version.in 2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/programs/globus-version.in 2009-08-03 12:31:55.269484149 +0200
@@ -43,7 +43,11 @@
usage()
@@ -44,7 +104,7 @@ diff -ur globus_common-10.2.orig/program
${GLOBUS_SH_CAT-cat} 1>&2 <<EOF
diff -ur globus_common-10.2.orig/programs/Makefile.am globus_common-10.2/programs/Makefile.am
--- globus_common-10.2.orig/programs/Makefile.am 2005-12-07 10:37:44.000000000 +0100
-+++ globus_common-10.2/programs/Makefile.am 2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/programs/Makefile.am 2009-08-03 12:31:55.269484149 +0200
@@ -3,7 +3,7 @@
if ENABLE_PROGRAMS
bin_SCRIPTS = globus-sh-exec globus-version
@@ -56,7 +116,7 @@ diff -ur globus_common-10.2.orig/program
diff -ur globus_common-10.2.orig/scripts/globus-hostname globus_common-10.2/scripts/globus-hostname
--- globus_common-10.2.orig/scripts/globus-hostname 2006-01-19 06:54:22.000000000 +0100
-+++ globus_common-10.2/scripts/globus-hostname 2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-hostname 2009-08-03 12:31:55.270483512 +0200
@@ -23,13 +23,12 @@
# domainname
@@ -97,7 +157,7 @@ diff -ur globus_common-10.2.orig/scripts
# if failed to set, use the system's hostname command
diff -ur globus_common-10.2.orig/scripts/globus-makefile-header globus_common-10.2/scripts/globus-makefile-header
--- globus_common-10.2.orig/scripts/globus-makefile-header 2008-02-20 17:03:35.000000000 +0100
-+++ globus_common-10.2/scripts/globus-makefile-header 2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-makefile-header 2009-08-03 12:31:55.271483490 +0200
@@ -25,29 +25,15 @@
my $gpt_path = $ENV{GPT_LOCATION};
@@ -196,7 +256,7 @@ diff -ur globus_common-10.2.orig/scripts
{
diff -ur globus_common-10.2.orig/scripts/globus-makefile-header.gpt1 globus_common-10.2/scripts/globus-makefile-header.gpt1
--- globus_common-10.2.orig/scripts/globus-makefile-header.gpt1 2003-02-05 03:48:31.000000000 +0100
-+++ globus_common-10.2/scripts/globus-makefile-header.gpt1 2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-makefile-header.gpt1 2009-08-03 12:31:55.272482892 +0200
@@ -15,18 +15,13 @@
my $flavor;
@@ -282,7 +342,7 @@ diff -ur globus_common-10.2.orig/scripts
if(m!\S!)
diff -ur globus_common-10.2.orig/scripts/globus-sh-tools.sh globus_common-10.2/scripts/globus-sh-tools.sh
--- globus_common-10.2.orig/scripts/globus-sh-tools.sh 2006-01-19 06:54:22.000000000 +0100
-+++ globus_common-10.2/scripts/globus-sh-tools.sh 2008-10-13 00:01:24.000000000 +0200
++++ globus_common-10.2/scripts/globus-sh-tools.sh 2009-08-03 12:31:55.273482271 +0200
@@ -18,7 +18,11 @@
if test -z "$GLOBUS_SH_VARIABLES_SET" ; then
Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-11/globus-common.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- globus-common.spec 25 Jul 2009 07:26:13 -0000 1.6
+++ globus-common.spec 9 Aug 2009 09:10:41 -0000 1.7
@@ -10,7 +10,7 @@ Name: globus-common
%global _name %(tr - _ <<< %{name})
Version: 10.2
%global setupversion 2.6
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Globus Toolkit - Common Library
Group: System Environment/Libraries
@@ -283,10 +283,6 @@ sed /globus-makefile-header/d \
sed 's!/usr/bin/env perl!/usr/bin/perl!' \
-i $RPM_BUILD_ROOT%{_bindir}/globus-makefile-header*
-# Remove config.guess file (conflicts with grid-packaging-tools package)
-rm $RPM_BUILD_ROOT%{_datadir}/globus/config.guess
-sed /config.guess/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist
-
# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -370,6 +366,10 @@ rm -f config.log config.status
%dir %{_docdir}/%{name}-%{version}/html
%changelog
+* Mon Aug 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-7
+- Patch globus_location function to allow unset GLOBUS_LOCATION
+- Put back config.guess file
+
* Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-6
- Add instruction set architecture (isa) tags
- Make doc subpackage noarch
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-11/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log 15 Jun 2009 15:37:11 -0000 1.5
+++ import.log 9 Aug 2009 09:10:41 -0000 1.6
@@ -3,3 +3,4 @@ globus-common-10_2-2_fc9:F-11:globus-com
globus-common-10_2-3_fc9:F-11:globus-common-10.2-3.fc9.src.rpm:1240329014
globus-common-10_2-4_fc9:F-11:globus-common-10.2-4.fc9.src.rpm:1240864567
globus-common-10_2-5_fc9:F-11:globus-common-10.2-5.fc9.src.rpm:1245080209
+globus-common-10_2-7_fc11:F-11:globus-common-10.2-7.fc11.src.rpm:1249809012
- Previous message (by thread): rpms/globus-common/devel globus-common-usr.patch, 1.1, 1.2 globus-common.spec, 1.6, 1.7 import.log, 1.5, 1.6
- Next message (by thread): rpms/globus-common/F-10 globus-common-usr.patch, 1.1, 1.2 globus-common.spec, 1.6, 1.7 import.log, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list