[gfal2] Upgraded to upstream release 2.8.1
Alejandro Alvarez
aalvarez at fedoraproject.org
Mon Jan 12 09:06:11 UTC 2015
commit f97b379df8397d47f51ed2e69a661912c8bd4558
Author: Alejandro Alvarez Ayllon <alejandro.alvarez.ayllon at cern.ch>
Date: Mon Jan 12 09:53:07 2015 +0100
Upgraded to upstream release 2.8.1
gfal2-local-copy-buffer2heap.patch | 31 ----
gfal2-srm-patch-set-error.patch | 15 --
gfal2.spec | 271 +++++++++++++++++++-----------------
sources | 2 +-
4 files changed, 142 insertions(+), 177 deletions(-)
---
diff --git a/gfal2.spec b/gfal2.spec
index 2010306..c39c86d 100644
--- a/gfal2.spec
+++ b/gfal2.spec
@@ -1,189 +1,193 @@
# unversionned doc dir F20 change https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-Name: gfal2
-Version: 2.7.8
+%{!?_with_mock_plugin: %{!?_without_mock_plugin: %define _with_mock_plugin -DPLUGIN_MOCK=TRUE}}
+
+
+Name: gfal2
+Version: 2.8.1
# https://fedoraproject.org/wiki/Packaging:NamingGuidelines#Release_Tag
-Release: 3%{?dist}
-Summary: Grid file access library 2.0
-Group: Applications/Internet
-License: ASL 2.0
-URL: http://dmc.web.cern.ch
-# svn export http://svn.cern.ch/guest/lcgutil/gfal2/tags/data-gfal2_R_2_7_8 gfal2-2.7.8
-# tar czf gfal2-2.7.8.tar.gz gfal2-2.7.8
-Source0: %{name}/%{name}-%{version}.tar.gz
-# https://its.cern.ch/jira/browse/DMC-582
-Patch0: %{name}-srm-patch-set-error.patch
-# https://its.cern.ch/jira/browse/DMC-601
-Patch1: %{name}-local-copy-buffer2heap.patch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+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_1 gfal2-2.8.1
+# tar czf gfal2-2.8.1.tar.gz gfal2-2.8.1
+Source0: %{name}-%{version}.tar.gz
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
#main lib dependencies
-BuildRequires: cmake
-BuildRequires: doxygen
-%if 0%{?el5}
-BuildRequires: glib2-devel
+BuildRequires: cmake
+BuildRequires: doxygen
+%if 0%{?el5}
+BuildRequires: glib2-devel
%else
-BuildRequires: glib2-devel >= 2.28
+BuildRequires: glib2-devel
%endif
-BuildRequires: glibmm24-devel
-BuildRequires: libattr-devel
-BuildRequires: openldap-devel
+BuildRequires: libattr-devel
+BuildRequires: openldap-devel
%if ! 0%{?el5}
-BuildRequires: pugixml-devel
+BuildRequires: pugixml-devel
%endif
## libuuid is in a different rpm for el5
%if 0%{?el5}
-BuildRequires: e2fsprogs-devel
+BuildRequires: e2fsprogs-devel
%else
-BuildRequires: libuuid-devel
+BuildRequires: libuuid-devel
%endif
+#file plugin dependencies
+BuildRequires: zlib-devel
#lfc plugin dependencies
-BuildRequires: lfc-devel
+BuildRequires: lfc-devel
#rfio plugin dependencies
-BuildRequires: dpm-devel
+BuildRequires: dpm-devel
#srm plugin dependencies
-BuildRequires: srm-ifce-devel >= 1.21.3
+BuildRequires: srm-ifce-devel >= 1.21.3
#dcap plugin dependencies
-BuildRequires: dcap-devel
+BuildRequires: dcap-devel
#gridftp plugin dependencies
-BuildRequires: globus-gass-copy-devel
+BuildRequires: globus-gass-copy-devel
#http plugin dependencies
-BuildRequires: davix-devel >= 0.3.4
+BuildRequires: davix-devel >= 0.3.0
#tests dependencies
-BuildRequires: gtest-devel
+BuildRequires: gtest-devel
-Requires: %{name}-core%{?_isa} = %{version}-%{release}
-Requires: %{name}-transfer%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-core < %{version}-%{release}
+Provides: %{name}-core = %{version}-%{release}
+Obsoletes: %{name}-transfer < %{version}-%{release}
+Provides: %{name}-transfer = %{version}-%{release}
%description
-GFAL 2 offers an a single and simple POSIX-like API
+GFAL 2.0 offers an a single and simple POSIX-like API
for the file operations in grids and cloud environments.
The set of supported protocols depends
of the %{name} installed plugins.
-%package core
-Summary: Core of the Grid File access Library 2.0
-Group: Applications/Internet
-
-%if 0%{?el5}
-Requires: glib2
-%else
-Requires: glib2 >= 2.28
-%endif
-
-%description core
-The main library of %{name}.
-the %{name} protocol support relies on a plugin system.
-
-%package transfer
-Summary: File Transfer logic of %{name}
-Group: Applications/Internet
-Requires: %{name}-core%{?_isa} = %{version}-%{release}
-
-%description transfer
-%{name}-transfer is the high level API for file transfer operations
-in %{name}. It supports third-party copy.
-
%package devel
-Summary: Development files of %{name}
-Group: Applications/Internet
-Requires: %{name}-core%{?_isa} = %{version}-%{release}
-Requires: %{name}-transfer%{?_isa} = %{version}-%{release}
-Requires: glib2-devel%{?_isa}
-Requires: libattr-devel%{?_isa}
-Requires: pkgconfig
+Summary: Development files of %{name}
+Group: Applications/Internet
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: glib2-devel%{?_isa}
+Requires: libattr-devel%{?_isa}
+Requires: pkgconfig
%description devel
development files for %{name}
%package doc
-Summary: Documentation for %{name}
-Group: Documentation
+Summary: Documentation for %{name}
+Group: Documentation
%if 0%{?fedora} > 10 || 0%{?rhel}>5
-BuildArch: noarch
+BuildArch: noarch
%endif
-
%description doc
-documentation, Doxygen and examples of %{name} .
+Documentation, Doxygen and examples of %{name}.
-%package plugin-lfc
-Summary: Provide the lfc support for %{name}
-Group: Applications/Internet
-Requires: %{name}-core%{?_isa} = %{version}-%{release}
+%package plugin-file
+Summary: Provides file support for %{name}
+Group: Applications/Internet
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description plugin-file
+Provides the file support (file://) for %{name}.
+The file plugin provides local file operations, as copying from local
+to remote or the other way around.
+
+%package plugin-lfc
+Summary: Provides the lfc support for %{name}
+Group: Applications/Internet
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description plugin-lfc
-Provide the lfc support (LFN://) for %{name}.
+Provides the lfc support (lfn://) for %{name}.
The LFC plugin allows read-only POSIX operations
for the LFC catalog.
+
%package plugin-rfio
-Summary: Provide the rfio support for %{name}
-Group: Applications/Internet
-Requires: %{name}-core%{?_isa} = %{version}-%{release}
-Requires: dpm-libs%{?_isa}
+Summary: Provides the rfio support for %{name}
+Group: Applications/Internet
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: dpm-libs%{?_isa}
%description plugin-rfio
-Provide the rfio support (RFIO://) for %{name}.
+Provides the rfio support (rfio://) for %{name}.
The rfio plugin provides the POSIX operations for
the rfio URLs, the rfio protocol is used on the DPM
and on the Castor storage systems.
+
%package plugin-dcap
-Summary: Provide the support access for %{name}
-Group: Applications/Internet
-Requires: %{name}-core%{?_isa} = %{version}-%{release}
-Requires: dcap-tunnel-gsi%{?_isa}
+Summary: Provides the support access for %{name}
+Group: Applications/Internet
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: dcap-tunnel-gsi%{?_isa}
%description plugin-dcap
-Provide the dcap support (GSIDCAP://, DCAP://) for %{name}.
+Provides the dcap support (gsidcap://, dcap://) for %{name}.
The dcap plugin provides the POSIX operations for the dcap \
URLs, the dcap protocol is used on the DCACHE storage system
+
%package plugin-srm
-Summary: Provide the srm access for %{name}
-Group: Applications/Internet
-Requires: %{name}-core%{?_isa} = %{version}-%{release}
-Requires: srm-ifce >= 1.21.3
+Summary: Provides the srm access for %{name}
+Group: Applications/Internet
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: srm-ifce >= 1.21.3
%description plugin-srm
-Provide the srm support (SRM://) for %{name}.
+Provides the srm support (srm://) for %{name}.
The srm plugin provides the POSIX operations and
the third party transfer support on the SRM URLs.
+
%package plugin-gridftp
-Summary: Provide the gridftp support for %{name}
-Group: Applications/Internet
-Requires: %{name}-core%{?_isa} = %{version}-%{release}
+Summary: Provides the gridftp support for %{name}
+Group: Applications/Internet
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description plugin-gridftp
-Provide the gridftp support (GSIFTP://) for %{name}.
+Provides the gridftp support (gsiftp://) for %{name}.
The gridftp plugin provides the POSIX operations and
the third party transfer support on the GSIFTP URLs.
+
%package plugin-http
-Summary: Provide the HTTP/DAV support for %{name}
-Group: Applications/Internet
-Requires: %{name}-core%{?_isa} = %{version}-%{release}
+Summary: Provides the HTTP/DAV support for %{name}
+Group: Applications/Internet
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: davix-libs >= 0.3.2
%description plugin-http
-Provide the HTTP and WevDAV support for %{name}.
-this plugin is able to do third-party copy with Webdav
+Provides the HTTP (http[s]://) and WevDAV (dav[s]://) support for %{name}.
+this plugin is able to do third-party copy with WebDAV if the storage supports it.
+
+%if %{?_with_mock_plugin:1}%{!?_with_mock_plugin:0}
+%package plugin-mock
+Summary: Provides a Mock dummy protocol for %{name}
+Group: Applications/Internet
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description plugin-mock
+Provides a dummy mock:// protocol for %{name}.
+%endif
+
%package all
-Summary: Meta package for GFAL 2.0 install
-Group: Applications/Internet
-Requires: %{name}-core%{?_isa} = %{version}-%{release}
-Requires: %{name}-transfer%{?_isa} = %{version}-%{release}
-Requires: %{name}-plugin-lfc%{?_isa} = %{version}-%{release}
-Requires: %{name}-plugin-dcap%{?_isa} = %{version}-%{release}
-Requires: %{name}-plugin-srm%{?_isa} = %{version}-%{release}
-Requires: %{name}-plugin-rfio%{?_isa} = %{version}-%{release}
-Requires: %{name}-plugin-gridftp%{?_isa} = %{version}-%{release}
-Requires: %{name}-plugin-http%{?_isa} = %{version}-%{release}
+Summary: Meta package for GFAL 2.0 install
+Group: Applications/Internet
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-plugin-file%{?_isa} = %{version}-%{release}
+Requires: %{name}-plugin-lfc%{?_isa} = %{version}-%{release}
+Requires: %{name}-plugin-dcap%{?_isa} = %{version}-%{release}
+Requires: %{name}-plugin-srm%{?_isa} = %{version}-%{release}
+Requires: %{name}-plugin-rfio%{?_isa} = %{version}-%{release}
+Requires: %{name}-plugin-gridftp%{?_isa} = %{version}-%{release}
+Requires: %{name}-plugin-http%{?_isa} = %{version}-%{release}
%description all
@@ -196,13 +200,12 @@ make clean
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
%cmake \
-DDOC_INSTALL_DIR=%{_pkgdocdir} \
-DUNIT_TESTS=TRUE \
+%{_with_mock_plugin}\
.
make %{?_smp_mflags}
make doc
@@ -219,47 +222,44 @@ rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
-%post core -p /sbin/ldconfig
-
-%postun core -p /sbin/ldconfig
-
-%post transfer -p /sbin/ldconfig
-
-%postun transfer -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%files
%{_bindir}/gfal2_version
-%{_pkgdocdir}/DESCRIPTION
-%{_mandir}/man1/gfal2_version.1*
-
-%files core
%{_libdir}/libgfal2.so.*
+%{_libdir}/libgfal_transfer.so.*
%dir %{_libdir}/%{name}-plugins
-%dir %{_pkgdocdir}
%dir %{_sysconfdir}/%{name}.d
-%{_libdir}/%{name}-plugins/libgfal_plugin_file.so*
-%{_pkgdocdir}/README_PLUGIN_FILE
-%{_pkgdocdir}/LICENSE
%config(noreplace) %{_sysconfdir}/%{name}.d/bdii.conf
%config(noreplace) %{_sysconfdir}/%{name}.d/gfal2_core.conf
-%files transfer
-%{_libdir}/libgfal_transfer.so.*
+%{_mandir}/man1/gfal2_version.1*
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/DESCRIPTION
+%{_pkgdocdir}/README
+%{_pkgdocdir}/LICENSE
+%{_pkgdocdir}/RELEASE-NOTES
%{_pkgdocdir}/README_TRANSFER
+
%files devel
%{_includedir}/%{name}/
%{_libdir}/pkgconfig/gfal2.pc
%{_libdir}/pkgconfig/gfal_transfer.pc
%{_libdir}/libgfal2.so
%{_libdir}/libgfal_transfer.so
-%{_pkgdocdir}/RELEASE-NOTES
%files doc
+%{_pkgdocdir}/readme.html
%{_pkgdocdir}/html/
%{_pkgdocdir}/examples/
+%files plugin-file
+%{_libdir}/%{name}-plugins/libgfal_plugin_file.so*
+%{_pkgdocdir}/README_PLUGIN_FILE
+
%files plugin-lfc
%{_libdir}/%{name}-plugins/libgfal_plugin_lfc.so*
%{_pkgdocdir}/README_PLUGIN_LFC
@@ -290,11 +290,21 @@ make DESTDIR=%{buildroot} install
%{_pkgdocdir}/README_PLUGIN_HTTP
%config(noreplace) %{_sysconfdir}/%{name}.d/http_plugin.conf
+%if %{?_with_mock_plugin:1}%{!?_with_mock_plugin:0}
+%files plugin-mock
+%{_libdir}/%{name}-plugins/libgfal_plugin_mock.so*
+%{_pkgdocdir}/README_PLUGIN_MOCK
+%config(noreplace) %{_sysconfdir}/%{name}.d/mock_plugin.conf
+%endif
+
%files all
%{_pkgdocdir}/README
%changelog
+* Mon Jan 12 2015 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 2.8.1-1
+- Upgraded to upstream release 2.8.1
+
* Mon Dec 15 2014 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 2.7.8-3
- Applied patch moving buffer to heap to avoid SIGSEGV when the stack size is limited
@@ -464,3 +474,4 @@ make DESTDIR=%{buildroot} install
* Mon Dec 12 2011 Adrien Devresse <adevress at cern.ch> - 2.0.0-0.6.2012041515snap
- Initial gfal 2.0 preview release
+
diff --git a/sources b/sources
index a70d192..d42703f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eaf53137f003390ccb6cbc294a9ffead gfal2-2.7.8.tar.gz
+849a9cfc2e3fefe241479628b4af352e gfal2-2.8.1.tar.gz
More information about the scm-commits
mailing list