rpms/globus-io/F-10 globus-io-parens.patch, NONE, 1.1 globus-io.spec, 1.1, 1.2 import.log, 1.1, 1.2

[Mattias Ellert]

Author: ellert

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

Modified Files:
	globus-io.spec import.log 
Added Files:
	globus-io-parens.patch 
Log Message:
* Thu Jun 04 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.3-2
- Update to official Fedora Globus packaging guidelines


globus-io-parens.patch:

--- NEW FILE globus-io-parens.patch ---
diff -ur globus_io-6.3.orig/globus_io_xio_compat.c globus_io-6.3/globus_io_xio_compat.c
--- globus_io-6.3.orig/globus_io_xio_compat.c	2008-03-12 20:01:10.000000000 +0100
+++ globus_io-6.3/globus_io_xio_compat.c	2009-06-04 01:09:16.000000000 +0200
@@ -978,7 +978,7 @@
     bounce_info = (globus_l_io_bounce_t *) user_arg;
     
     if(globus_l_io_should_bounce(bounce_info) ||
-       handle != NULL && bounce_info->handle->attr->authz_data.callback)
+       (handle != NULL && bounce_info->handle->attr->authz_data.callback))
     {
         bounce_info->error = result == GLOBUS_SUCCESS 
             ? GLOBUS_NULL : globus_error_get(result);


Index: globus-io.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-io/F-10/globus-io.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-io.spec	29 May 2009 18:51:02 -0000	1.1
+++ globus-io.spec	15 Jun 2009 18:59:29 -0000	1.2
@@ -7,7 +7,7 @@
 Name:		globus-io
 %global _name %(tr - _ <<< %{name})
 Version:	6.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - uniform I/O interface
 
 Group:		System Environment/Libraries
@@ -20,6 +20,9 @@ URL:		http://www.globus.org/
 #		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_io-6.3
 #		tar -zcf globus_io-6.3.tar.gz globus_io-6.3
 Source:		%{_name}-%{version}.tar.gz
+#		Fix suggest parentheses compilator warning:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6758
+Patch0:		%{name}-parens.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-xio-gsi-driver
@@ -58,6 +61,7 @@ uniform I/O interface Development Files
 
 %prep
 %setup -q -n %{_name}-%{version}
+%patch0 -p1
 
 %build
 # Remove files that should be replaced during bootstrap
@@ -86,15 +90,15 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+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 $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist
+sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
 
 # Remove static libraries (.a files)
 find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
-sed '/lib.*\.a$/d' \
-  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
+sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
 
 # Generate pkg-config file from GPT metadata
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
@@ -106,9 +110,9 @@ mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{nam
 install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 # Generate package filelists
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
+cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
+cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
 
 %clean
@@ -129,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Thu Jun 04 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.3-2
+- Update to official Fedora Globus packaging guidelines
+
 * Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.3-1
 - Make comment about source retrieval more explicit
 - Change defines to globals


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-io/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	29 May 2009 18:51:02 -0000	1.1
+++ import.log	15 Jun 2009 18:59:29 -0000	1.2
@@ -1 +1,2 @@
 globus-io-6_3-1_fc9:F-10:globus-io-6.3-1.fc9.src.rpm:1243623034
+globus-io-6_3-2_fc9:F-10:globus-io-6.3-2.fc9.src.rpm:1245092349