[gfal] - fix a gsoap related problem on rawhide
Devresse
adev at fedoraproject.org
Mon Feb 4 16:52:34 UTC 2013
commit 29d2c08a5f2a486bb5604be492a651ab04b8b932
Author: Adrien Devresse <adrien.devresse at cern.ch>
Date: Mon Feb 4 17:52:05 2013 +0100
- fix a gsoap related problem on rawhide
gfal.spec | 4 +++-
rawhide-gsoap.patch | 30 ++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/gfal.spec b/gfal.spec
index 3c6e7cd..1353553 100644
--- a/gfal.spec
+++ b/gfal.spec
@@ -20,13 +20,14 @@
Name: gfal
Version: 1.14.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Grid File access library
Group: System Environment/Libraries
License: ASL 2.0
URL: https://svnweb.cern.ch/trac/lcgutil
# svn export http://svn.cern.ch/guest/lcgutil/gfal/trunk gfal
Source0: http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/%{name}/%{name}-%{version}.tar.gz
+Patch0: rawhide-gsoap.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
#Exclude ppc architecture on epel5, impossible to compile properly with the old gcc version
%if %{defined rhel} && 0%{?rhel} < 6
@@ -107,6 +108,7 @@ python26 bindings for gfal 1.0
%prep
%setup -q
+%patch0 -p1
%if 0%{?python26_support}
mkdir -p %{_builddir}/%{name}-py26-%{version};
cp -rf %{_builddir}/%{name}-%{version}/* %{_builddir}/%{name}-py26-%{version};
diff --git a/rawhide-gsoap.patch b/rawhide-gsoap.patch
new file mode 100644
index 0000000..51516ec
--- /dev/null
+++ b/rawhide-gsoap.patch
@@ -0,0 +1,30 @@
+diff --git a/src/lrc_ifce.c b/src/lrc_ifce.c
+index b029492..6f9e194 100644
+--- a/src/lrc_ifce.c
++++ b/src/lrc_ifce.c
+@@ -43,8 +43,8 @@ struct SOAP_ENV__Fault
+ #include "stdsoap2.h"
+ #undef SOAP_FMAC3
+ #define SOAP_FMAC3 static
+-#undef SOAP_FMAC5
+-#define SOAP_FMAC5 static
++//#undef SOAP_FMAC5
++//#define SOAP_FMAC5 static
+ #include "lrcH.h"
+ #include "edg_local_replica_catalogSoapBinding+.nsmap"
+ #ifdef GFAL_SECURE
+diff --git a/src/rmc_ifce.c b/src/rmc_ifce.c
+index e053e14..a1e9cb5 100644
+--- a/src/rmc_ifce.c
++++ b/src/rmc_ifce.c
+@@ -45,8 +45,8 @@ struct SOAP_ENV__Fault
+ #include "stdsoap2.h"
+ #undef SOAP_FMAC3
+ #define SOAP_FMAC3 static
+-#undef SOAP_FMAC5
+-#define SOAP_FMAC5 static
++//#undef SOAP_FMAC5
++//#define SOAP_FMAC5 static
+ #include "rmcH.h"
+ #include "edg_replica_metadata_catalogSoapBinding+.nsmap"
+ #ifdef GFAL_SECURE
More information about the scm-commits
mailing list