rpms/globus-callout/EL-5 globus-callout-mingw.patch, NONE, 1.1 globus-callout-noflavext.patch, NONE, 1.1 globus-callout.spec, 1.3, 1.4 import.log, 1.3, 1.4
Mattias Ellert
ellert at fedoraproject.org
Mon Jun 15 17:26:29 UTC 2009
- Previous message (by thread): rpms/hyphen-cy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
- Next message (by thread): rpms/globus-gssapi-gsi/devel globus-gssapi-gsi.spec, 1.1, 1.2 import.log, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ellert
Update of /cvs/pkgs/rpms/globus-callout/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30483/EL-5
Modified Files:
globus-callout.spec import.log
Added Files:
globus-callout-mingw.patch globus-callout-noflavext.patch
Log Message:
* Wed Jun 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-4
- Update to official Fedora Globus packaging guidelines
- Allow loading callouts without flavor extensions
globus-callout-mingw.patch:
--- NEW FILE globus-callout-mingw.patch ---
diff -ur globus_callout-0.7.orig/library/globus_callout.c globus_callout-0.7/library/globus_callout.c
--- globus_callout-0.7.orig/library/globus_callout.c 2006-01-19 06:54:06.000000000 +0100
+++ globus_callout-0.7/library/globus_callout.c 2009-05-09 23:08:13.000000000 +0200
@@ -29,16 +29,16 @@
#include "globus_callout_constants.h"
#include "globus_i_callout.h"
+#ifndef BUILD_STATIC_ONLY
#ifdef WIN32
#include "globus_libtool_windows.h"
+#else
+#include <ltdl.h>
+#endif
#endif
#include "version.h"
-/* ToDo: HACK! This is undefined on the Windows side so do this for now */
-#ifdef WIN32
-#define flavor "win32dbg"
-#endif
#define GLOBUS_I_CALLOUT_HASH_SIZE 64
static void
diff -ur globus_callout-0.7.orig/library/globus_i_callout.h globus_callout-0.7/library/globus_i_callout.h
--- globus_callout-0.7.orig/library/globus_i_callout.h 2006-01-19 06:54:06.000000000 +0100
+++ globus_callout-0.7/library/globus_i_callout.h 2009-05-09 23:04:37.000000000 +0200
@@ -29,9 +29,6 @@
#define _GLOBUS_I_CALLOUT_H_
#include "globus_callout.h"
-#if !defined(WIN32) && !defined(BUILD_STATIC_ONLY)
-#include <ltdl.h>
-#endif
/* DEBUG MACROS */
globus-callout-noflavext.patch:
--- NEW FILE globus-callout-noflavext.patch ---
diff -ur globus_callout-0.7.orig/library/globus_callout.c globus_callout-0.7/library/globus_callout.c
--- globus_callout-0.7.orig/library/globus_callout.c 2009-05-09 23:08:13.000000000 +0200
+++ globus_callout-0.7/library/globus_callout.c 2009-05-13 07:06:42.000000000 +0200
@@ -649,6 +649,8 @@
va_list ap;
int rc;
char * dlerror;
+ char * flavor_start;
+ char * file;
static char * _function_name_ =
"globus_callout_handle_call_type";
GLOBUS_I_CALLOUT_DEBUG_ENTER;
@@ -712,6 +714,22 @@
if(*dlhandle == NULL)
{
+ flavor_start = strrchr(current_datum->file, '_');
+ if (flavor_start) {
+ file = strdup(current_datum->file);
+ if(file == NULL)
+ {
+ GLOBUS_CALLOUT_MALLOC_ERROR(result);
+ goto exit;
+ }
+ file[flavor_start - current_datum->file] = '\0';
+ *dlhandle = lt_dlopenext(file);
+ free(file);
+ }
+ }
+
+ if(*dlhandle == NULL)
+ {
GLOBUS_CALLOUT_ERROR_RESULT(
result,
GLOBUS_CALLOUT_ERROR_WITH_DL,
Index: globus-callout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/EL-5/globus-callout.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-callout.spec 27 Apr 2009 21:11:52 -0000 1.3
+++ globus-callout.spec 15 Jun 2009 17:25:58 -0000 1.4
@@ -7,7 +7,7 @@
Name: globus-callout
%global _name %(tr - _ <<< %{name})
Version: 0.7
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Globus Toolkit - Globus Callout Library
Group: System Environment/Libraries
@@ -23,6 +23,12 @@ Source: %{_name}-%{version}.tar.gz
# This is a workaround for the broken epstopdf script in RHEL5
# See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9: epstopdf-2.9.5gw
+# Allow loading callouts without flavor extensions:
+# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6741
+Patch0: %{name}-noflavext.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-libtool >= 1
@@ -31,18 +37,11 @@ BuildRequires: globus-libtool-devel >= 1
BuildRequires: globus-common-devel >= 3
BuildRequires: globus-core >= 4
BuildRequires: doxygen
-%if %{?fedora}%{!?fedora:0} >= 3
-BuildRequires: graphviz
-BuildRequires: ghostscript
-%else
-%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires: graphviz
BuildRequires: ghostscript
%if "%{?rhel}" == "5"
BuildRequires: graphviz-gd
%endif
-%endif
-%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires: tex(latex)
%else
@@ -96,6 +95,8 @@ Globus Callout Library Documentation Fil
%prep
%setup -q -n %{_name}-%{version}
+%patch0 -p1
+%patch1 -p1
%if "%{rhel}" == "5"
mkdir bin
@@ -137,15 +138,15 @@ export PATH=$PWD/bin:$PATH
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
@@ -156,25 +157,23 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgco
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
- -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
-# Remove unwanted documentation
-rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
+# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
-sed -e '/deprecated\.3/d' \
- -e '/_%{_name}-%{version}_.*\.3/d' \
- -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+sed -e '/_%{_name}-%{version}_.*\.3/d' \
+ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
# 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}_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
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
+cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
| sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
%clean
@@ -199,6 +198,10 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_docdir}/%{name}-%{version}/html
%changelog
+* Wed Jun 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-4
+- Update to official Fedora Globus packaging guidelines
+- Allow loading callouts without flavor extensions
+
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-3
- Rebuild with updated libtool
@@ -216,7 +219,7 @@ rm -rf $RPM_BUILD_ROOT
* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.4
- Add s390x to the list of 64 bit platforms
-* Thu Jan 1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.3
+* Thu Jan 01 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.3
- Adapt to updated GPT package
* Wed Oct 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.7-0.2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-callout/EL-5/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log 27 Apr 2009 21:11:52 -0000 1.3
+++ import.log 15 Jun 2009 17:25:58 -0000 1.4
@@ -1,3 +1,4 @@
globus-callout-0_7-1_fc9:EL-5:globus-callout-0.7-1.fc9.src.rpm:1240007094
globus-callout-0_7-2_fc9:EL-5:globus-callout-0.7-2.fc9.src.rpm:1240379949
globus-callout-0_7-3_fc9:EL-5:globus-callout-0.7-3.fc9.src.rpm:1240866654
+globus-callout-0_7-4_fc9:EL-5:globus-callout-0.7-4.fc9.src.rpm:1245086739
- Previous message (by thread): rpms/hyphen-cy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
- Next message (by thread): rpms/globus-gssapi-gsi/devel globus-gssapi-gsi.spec, 1.1, 1.2 import.log, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list