aalvarez pushed to gfal2 (epel7). "Merge branch 'master' into epel7"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 16 14:54:23 UTC 2015
>From 19d456101c257aa3d130bc0d56e8981955605a8b Mon Sep 17 00:00:00 2001
From: Alejandro Alvarez Ayllon <aalvarez at cern.ch>
Date: Thu, 16 Apr 2015 14:30:48 +0200
Subject: Upgraded to upstream release 2.9.1
diff --git a/gfal2-c++11.patch b/gfal2-c++11.patch
deleted file mode 100644
index ed9a1cf..0000000
--- a/gfal2-c++11.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/cmake/modules/CMakeCXX11Support.cmake b/cmake/modules/CMakeCXX11Support.cmake
-new file mode 100644
-index 0000000..1afccd1
---- /dev/null
-+++ b/cmake/modules/CMakeCXX11Support.cmake
-@@ -0,0 +1,37 @@
-+include(CheckCXXSourceCompiles REQUIRED)
-+
-+
-+if(CMAKE_COMPILER_IS_GNUCXX)
-+ execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
-+ if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
-+ SET(HAVE_CXX011_FULL_SUPPORT TRUE)
-+ SET(HAVE_CXX011_PARTIAL_SUPPORT TRUE)
-+ SET(CXX11_FLAG_ENABLE "-std=c++11")
-+ elseif(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
-+ message(STATUS "C++11 partial support")
-+ SET(HAVE_CXX011_PARTIAL_SUPPORT TRUE)
-+ SET(CXX11_FLAG_ENABLE "-std=c++0x")
-+ else ()
-+ message(STATUS "C++11 no support ")
-+ SET(CXX11_FLAG_ENABLE "")
-+ endif()
-+else(CMAKE_COMPILER_IS_GNUCXX)
-+ message(STATUS "C++11 activated full")
-+ SET(HAVE_CXX011_FULL_SUPPORT TRUE)
-+ SET(HAVE_CXX011_PARTIAL_SUPPORT TRUE)
-+ SET(CXX11_FLAG_ENABLE "-std=c++0x")
-+endif(CMAKE_COMPILER_IS_GNUCXX)
-+
-+
-+## Check TR1
-+CHECK_CXX_SOURCE_COMPILES("
-+#include <tr1/functional>
-+int main() { return 0; }"
-+ HAVE_TR1_SUPPORT)
-+
-+if(HAVE_TR1_SUPPORT)
-+message(STATUS "TR1 support detected")
-+else(HAVE_TR1_SUPPORT)
-+message(STATUS "no TR1 support")
-+endif(HAVE_TR1_SUPPORT)
-+
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aab7333..282eb41 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -37,6 +37,10 @@ include(MacroCopyFile REQUIRED)
- include(ReleaseDebugAutoFlags REQUIRED)
- include(CMakeGeneratePkgConfig REQUIRED)
- include(MacroAddDoxygen REQUIRED)
-+include(CMakeCXX11Support REQUIRED)
-+
-+# Enable C++11 support
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAG_ENABLE}")
-
- find_package(PkgConfig REQUIRED)
-
diff --git a/gfal2-gfal_srm_contruct_key.patch b/gfal2-gfal_srm_contruct_key.patch
deleted file mode 100644
index 36eb05b..0000000
--- a/gfal2-gfal_srm_contruct_key.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/plugins/srm/gfal_srm.h b/src/plugins/srm/gfal_srm.h
-index ad316ce..8b2e62b 100644
---- a/src/plugins/srm/gfal_srm.h
-+++ b/src/plugins/srm/gfal_srm.h
-@@ -116,7 +116,7 @@ void gfal_srm_destroyG(plugin_handle ch);
- void gfal_srm_opt_initG(gfal_srmv2_opt* opts, gfal2_context_t handle);
-
-
--inline char* gfal_srm_construct_key(const char* url, const char* prefix, char* buff, const size_t s_buff);
-+char* gfal_srm_construct_key(const char* url, const char* prefix, char* buff, const size_t s_buff);
-
- void gfal_set_default_storageG(gfal_srmv2_opt* opts, enum gfal_srm_proto proto);
-
diff --git a/gfal2.spec b/gfal2.spec
index ff464c6..e481e03 100644
--- a/gfal2.spec
+++ b/gfal2.spec
@@ -5,17 +5,19 @@
Name: gfal2
-Version: 2.8.4
+Version: 2.9.1
Release: 1%{?dist}
Summary: Grid file access library 2.0
Group: Applications/Internet
License: ASL 2.0
URL: http://dmc.web.cern.ch/projects/gfal-2/home
-# svn export http://svn.cern.ch/guest/lcgutil/gfal2/tags/data-gfal2_R_2_8_4 gfal2-2.8.4
-# tar czf gfal2-2.8.4.tar.gz gfal2-2.8.4
+# git clone https://gitlab.cern.ch/dmc/gfal2.git gfal2-2.9.1
+# pushd gfal2-2.9.1
+# git checkout v2.9.1
+# git submodule init && git submodule update
+# popd
+# tar czf gfal2-2.9.1.tar.gz gfal2-2.9.1
Source0: %{name}-%{version}.tar.gz
-Patch0: %{name}-gfal_srm_contruct_key.patch
-Patch1: %{name}-c++11.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
#main lib dependencies
@@ -24,7 +26,7 @@ BuildRequires: doxygen
%if 0%{?el5}
BuildRequires: glib2-devel
%else
-BuildRequires: glib2-devel
+BuildRequires: glib2-devel >= 2.28
%endif
BuildRequires: libattr-devel
BuildRequires: openldap-devel
@@ -45,13 +47,13 @@ BuildRequires: lfc-devel
#rfio plugin dependencies
BuildRequires: dpm-devel
#srm plugin dependencies
-BuildRequires: srm-ifce-devel >= 1.21.3
+BuildRequires: srm-ifce-devel >= 1.23.1
#dcap plugin dependencies
BuildRequires: dcap-devel
#gridftp plugin dependencies
BuildRequires: globus-gass-copy-devel
#http plugin dependencies
-BuildRequires: davix-devel >= 0.3.0
+BuildRequires: davix-devel >= 0.4.0
#tests dependencies
BuildRequires: gtest-devel
@@ -138,7 +140,7 @@ URLs, the dcap protocol is used on the DCACHE storage system
Summary: Provides the srm access for %{name}
Group: Applications/Internet
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: srm-ifce >= 1.21.3
+Requires: srm-ifce >= 1.23.1
%description plugin-srm
Provides the srm support (srm://) for %{name}.
@@ -201,8 +203,6 @@ make clean
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
%cmake \
@@ -305,6 +305,9 @@ make DESTDIR=%{buildroot} install
%changelog
+* Thu Apr 16 2015 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 2.9.1-1
+- Upgraded to upstream release 2.9.1
+
* Mon Mar 02 2015 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 2.8.4-1
- Upgraded to upstream release 2.8.4
diff --git a/sources b/sources
index ee6e356..c68dfab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b48d5da01543292d3b2a43efaa29ee62 gfal2-2.8.4.tar.gz
+9727b60a5f85be92850f8122764d7879 gfal2-2.9.1.tar.gz
--
cgit v0.10.2
>From 8ddf0571b94a134251ea35652f55e3e468ef5244 Mon Sep 17 00:00:00 2001
From: Alejandro Alvarez Ayllon <aalvarez at cern.ch>
Date: Thu, 16 Apr 2015 16:11:21 +0200
Subject: Fixing build in rawhide
diff --git a/gfal2-version.patch b/gfal2-version.patch
new file mode 100644
index 0000000..1b7d640
--- /dev/null
+++ b/gfal2-version.patch
@@ -0,0 +1,14 @@
+diff --git a/src/core/common/gfal_common_plugin_interface.h b/src/core/common/gfal_common_plugin_interface.h
+index 24e7b9e..28598ea 100644
+--- a/src/core/common/gfal_common_plugin_interface.h
++++ b/src/core/common/gfal_common_plugin_interface.h
+@@ -45,7 +45,7 @@ extern "C"
+ /*
+ * Helper for the versioned plugin names
+ */
+-#define GFAL2_PLUGIN_VERSIONED(plugin, version) plugin"-"version
++#define GFAL2_PLUGIN_VERSIONED(plugin, version) plugin "-" version
+
+ /**
+ classical data access plugin
+
diff --git a/gfal2.spec b/gfal2.spec
index e481e03..4bb8f60 100644
--- a/gfal2.spec
+++ b/gfal2.spec
@@ -18,6 +18,7 @@ URL: http://dmc.web.cern.ch/projects/gfal-2/home
# popd
# tar czf gfal2-2.9.1.tar.gz gfal2-2.9.1
Source0: %{name}-%{version}.tar.gz
+Patch0: %{name}-version.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
#main lib dependencies
@@ -203,6 +204,7 @@ make clean
%prep
%setup -q
+%patch0 -p1
%build
%cmake \
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/gfal2.git/commit/?h=epel7&id=c905bf365ae6e642bac7e0d71c8209f7ce60a979
More information about the scm-commits
mailing list