rpms/globus-common/F-10 globus-common-doxygen-workaround.patch, NONE, 1.1 globus-common-makefile-header.patch, NONE, 1.1 globus-common.spec, 1.7, 1.8 import.log, 1.6, 1.7

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-common/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19701/F-10

Modified Files:
	globus-common.spec import.log 
Added Files:
	globus-common-doxygen-workaround.patch 
	globus-common-makefile-header.patch 
Log Message:
* Sun Nov 08 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-8
- Let globus-makefile-header fail gracefully when GPT is not present
- Workaround a bug in doxygen


globus-common-doxygen-workaround.patch:
 library/globus_callback.h      |    2 +-
 library/globus_thread_common.h |    2 +-
 scripts/Makefile.am            |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE globus-common-doxygen-workaround.patch ---
diff -ur globus_common-10.2.orig/library/globus_callback.h globus_common-10.2/library/globus_callback.h
--- globus_common-10.2.orig/library/globus_callback.h	2009-11-08 13:52:51.214078077 +0100
+++ globus_common-10.2/library/globus_callback.h	2009-11-08 13:53:51.862079194 +0100
@@ -16,7 +16,7 @@
 
 #ifndef GLOBUS_INCLUDE_GLOBUS_CALLBACK
 #define GLOBUS_INCLUDE_GLOBUS_CALLBACK
-/**
+/*
  * @file globus_callback.h Globus Callback API
  *
  * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_callback.h,v $
diff -ur globus_common-10.2.orig/library/globus_thread_common.h globus_common-10.2/library/globus_thread_common.h
--- globus_common-10.2.orig/library/globus_thread_common.h	2009-11-08 13:52:51.214078077 +0100
+++ globus_common-10.2/library/globus_thread_common.h	2009-11-08 13:54:25.901243275 +0100
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/**
+/*
  * @file globus_thread_common.h Common Thread Interface
  *
  * $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_thread_common.h,v $
diff -ur globus_common-10.2.orig/scripts/Makefile.am globus_common-10.2/scripts/Makefile.am
--- globus_common-10.2.orig/scripts/Makefile.am	2005-12-07 10:37:45.000000000 +0100
+++ globus_common-10.2/scripts/Makefile.am	2009-11-08 14:12:37.139329290 +0100
@@ -7,8 +7,7 @@
 bin_SCRIPTS = \
 	globus-hostname \
 	globus-domainname \
-	globus-makefile-header \
-	globus-makefile-header.gpt1
+	globus-makefile-header
 
 globus-domainname: globus-hostname
 	cp $(srcdir)/globus-hostname $(builddir)/globus-domainname

globus-common-makefile-header.patch:
 globus-makefile-header |   28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

--- NEW FILE globus-common-makefile-header.patch ---
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	2009-11-08 13:35:49.109079788 +0100
@@ -68,7 +68,11 @@
 }
 else
 {
-    $environment = "gpt1";
+    print "globus-makefile-header requires the GPT perl module.\n";
+    print "If you want to use it you have to install the grid-packaging-tools package.\n";
+    print "Consider using alternatives like pkg-config instead.\n";
+
+    exit 1;
 }
 
 #
@@ -111,28 +115,6 @@
 }
 @pkgs = buildMultiArg(@pkgs);
 
-if ($environment eq "gpt1")
-{
-    my($argstring, $pkgstr);
-
-    $argstring = "-flavor=$flavor ";
-
-    if ($static)
-    {
-        $argstring .= "-link=static ";
-    }
-
-    $pkgstr = join(' ', @pkgs);
-    if (length($pkgstr) > 0)
-    {
-        $argstring .= "$pkgstr ";
-    }
-
-    action("$globus_path/bin/globus-makefile-header.gpt1 $argstring");
-
-    exit;
-}
-
 if ( grep(/^ANY$/, @pkgs) )
 {
     @pkgs = ("ANY");


Index: globus-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/globus-common.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- globus-common.spec	9 Aug 2009 09:11:32 -0000	1.7
+++ globus-common.spec	8 Nov 2009 18:55:35 -0000	1.8
@@ -10,7 +10,7 @@ Name:		globus-common
 %global _name %(tr - _ <<< %{name})
 Version:	10.2
 %global setupversion 2.6
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Globus Toolkit - Common Library
 
 Group:		System Environment/Libraries
@@ -69,9 +69,15 @@ Patch10:	%{name}-mingw.patch
 #		Not all platforms defines PATH_MAX:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6755
 Patch11:	%{name}-pathmax.patch
+#		Let globus-makefile-header fail gracefully without GPT:
+#		Not really relevant for globus upstream
+Patch12:	%{name}-makefile-header.patch
+#		Workaround a bug in doxygen 1.6.0 and later:
+#		https://bugzilla.gnome.org/show_bug.cgi?id=593759
+Patch13:	%{name}-doxygen-workaround.patch
 #		Configure options not propagated in globus common setup:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6467
-Patch12:	%{name}-setup.patch
+Patch14:	%{name}-setup.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-libtool%{?_isa} >= 1
@@ -169,8 +175,10 @@ Common Library Documentation Files
 %patch9 -p1 -b .ltdlmutex
 %patch10 -p1 -b .mingw
 %patch11 -p1 -b .pathmax
+%patch12 -p1 -b .mfheader
+%patch13 -p1 -b .doxygenbug
 cd %{_name}_setup-%{setupversion}
-%patch12 -p1 -b .setup
+%patch14 -p1 -b .setup
 cd -
 
 # custom perl requires that removes dependency on gpt perl modules
@@ -281,7 +289,7 @@ sed /globus-makefile-header/d \
 
 # Don't use /usr/bin/env
 sed 's!/usr/bin/env perl!/usr/bin/perl!' \
-  -i $RPM_BUILD_ROOT%{_bindir}/globus-makefile-header*
+  -i $RPM_BUILD_ROOT%{_bindir}/globus-makefile-header
 
 # Move documentation to default RPM location
 mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
@@ -289,11 +297,6 @@ mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
 sed s!doc/%{_name}!doc/%{name}-%{version}! \
   -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
-# Fix doxygen glitches
-for f in $RPM_BUILD_ROOT%{_mandir}/man3/*.h.3 ; do
-  sed 's/P\.RS/P\n.RS/' -i $f
-done
-
 # Remove unwanted documentation (needed for RHEL4)
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
 sed -e '/_%{_name}-%{version}_.*\.3/d' \
@@ -366,6 +369,10 @@ rm -f config.log config.status
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Sun Nov 08 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-8
+- Let globus-makefile-header fail gracefully when GPT is not present
+- Workaround a bug in doxygen
+
 * 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


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-common/F-10/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	9 Aug 2009 09:11:32 -0000	1.6
+++ import.log	8 Nov 2009 18:55:35 -0000	1.7
@@ -4,3 +4,4 @@ globus-common-10_2-3_fc9:F-10:globus-com
 globus-common-10_2-4_fc9:F-10:globus-common-10.2-4.fc9.src.rpm:1240864485
 globus-common-10_2-5_fc9:F-10:globus-common-10.2-5.fc9.src.rpm:1245080151
 globus-common-10_2-7_fc11:F-10:globus-common-10.2-7.fc11.src.rpm:1249809063
+globus-common-10_2-8_fc11:F-10:globus-common-10.2-8.fc11.src.rpm:1257706517