rpms/globus-proxy-utils/F-11 globus-proxy-utils-mingw.patch, NONE, 1.1 globus-proxy-utils.spec, 1.1, 1.2 import.log, 1.1, 1.2

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-proxy-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6291/F-11

Modified Files:
	globus-proxy-utils.spec import.log 
Added Files:
	globus-proxy-utils-mingw.patch 
Log Message:
* Wed Jun 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.5-2
- Update to official Fedora Globus packaging guidelines


globus-proxy-utils-mingw.patch:

--- NEW FILE globus-proxy-utils-mingw.patch ---
diff -ur globus_proxy_utils-2.5.orig/programs/grid_cert_diagnostics.c globus_proxy_utils-2.5/programs/grid_cert_diagnostics.c
--- globus_proxy_utils-2.5.orig/programs/grid_cert_diagnostics.c	2008-08-20 20:08:04.000000000 +0200
+++ globus_proxy_utils-2.5/programs/grid_cert_diagnostics.c	2009-05-09 13:54:37.000000000 +0200
@@ -3,6 +3,9 @@
 #include "globus_gsi_credential.h"
 #include "globus_gss_assist.h"
 #include "openssl/bn.h"
+#ifdef WIN32
+#include "openssl/applink.c"
+#endif
 
 char *
 indent_string(const char * str)
diff -ur globus_proxy_utils-2.5.orig/programs/grid_proxy_destroy.c globus_proxy_utils-2.5/programs/grid_proxy_destroy.c
--- globus_proxy_utils-2.5.orig/programs/grid_proxy_destroy.c	2009-05-09 14:10:54.000000000 +0200
+++ globus_proxy_utils-2.5/programs/grid_proxy_destroy.c	2009-05-09 13:54:08.000000000 +0200
@@ -34,7 +34,7 @@
 #include "globus_gsi_credential.h"
 #include "globus_gsi_system_config.h"
 #ifdef WIN32
-#include "globus_gssapi_config.h"
+#include "openssl/applink.c"
 #endif
 
 int                                     debug = 0;
diff -ur globus_proxy_utils-2.5.orig/programs/grid_proxy_info.c globus_proxy_utils-2.5/programs/grid_proxy_info.c
--- globus_proxy_utils-2.5.orig/programs/grid_proxy_info.c	2009-05-09 14:10:54.000000000 +0200
+++ globus_proxy_utils-2.5/programs/grid_proxy_info.c	2009-05-09 13:53:41.000000000 +0200
@@ -34,7 +34,7 @@
 #include "globus_gsi_credential.h"
 #include "globus_openssl.h"
 #ifdef WIN32
-#include "globus_gssapi_config.h"
+#include "openssl/applink.c"
 #endif
 
 int                                     debug = 0;
diff -ur globus_proxy_utils-2.5.orig/programs/grid_proxy_init.c globus_proxy_utils-2.5/programs/grid_proxy_init.c
--- globus_proxy_utils-2.5.orig/programs/grid_proxy_init.c	2009-05-09 14:10:54.000000000 +0200
+++ globus_proxy_utils-2.5/programs/grid_proxy_init.c	2009-05-09 13:52:56.000000000 +0200
@@ -36,7 +36,7 @@
 #include "proxycertinfo.h"
 #include "openssl/asn1.h"
 #ifdef WIN32
-#include "globus_gssapi_config.h"
+#include "openssl/applink.c"
 #endif
 
 #define SHORT_USAGE_FORMAT \


Index: globus-proxy-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-proxy-utils/F-11/globus-proxy-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-proxy-utils.spec	23 May 2009 09:05:18 -0000	1.1
+++ globus-proxy-utils.spec	15 Jun 2009 17:48:07 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-proxy-utils
 %global _name %(tr - _ <<< %{name})
 Version:	2.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus GSI Proxy Utility Programs
 
 Group:		Applications/Internet
@@ -23,6 +23,9 @@ Source:		%{_name}-%{version}.tar.gz
 #		Do not overwrite LDFLAGS:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6738
 Patch0:		%{name}-ldflag-overwrt.patch
+#		Fixes for mingw compilation:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
+Patch1:		%{name}-mingw.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-openssl >= 1
@@ -52,6 +55,7 @@ Globus GSI Proxy Utility Programs
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 # Remove files that should be replaced during bootstrap
@@ -71,12 +75,14 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
+
 # Install license file
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 # Generate package filelists
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
+cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
   | sed s!^!%{_prefix}! > package.filelist
 
 %clean
@@ -89,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Wed Jun 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.5-2
+- Update to official Fedora Globus packaging guidelines
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.5-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-proxy-utils/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	23 May 2009 09:05:18 -0000	1.1
+++ import.log	15 Jun 2009 17:48:07 -0000	1.2
@@ -1 +1,2 @@
 globus-proxy-utils-2_5-1_fc9:F-11:globus-proxy-utils-2.5-1.fc9.src.rpm:1243069485
+globus-proxy-utils-2_5-2_fc9:F-11:globus-proxy-utils-2.5-2.fc9.src.rpm:1245088068