diff --git a/gfal2.spec b/gfal2.spec index 465ac80..29b308d 100644 --- a/gfal2.spec +++ b/gfal2.spec @@ -1,6 +1,7 @@ %undefine __cmake_in_source_build %undefine __cmake3_in_source_build +# Require --with=tests in order to build functional tests %bcond_with tests %if %{?fedora}%{!?fedora:0} < 35 @@ -8,16 +9,16 @@ %endif Name: gfal2 -Version: 2.19.2 -Release: 3%{?dist} +Version: 2.20.4 +Release: 1%{?dist} Summary: Grid file access library 2.0 License: ASL 2.0 -URL: http://dmc.web.cern.ch/projects/gfal-2/home -# git clone --depth=1 --branch master https://gitlab.cern.ch/dmc/gfal2.git gfal2-2.14.1 -# pushd gfal2-2.15.1 -# git checkout v2.15.1 +URL: https://dmc-docs.web.cern.ch/dmc-docs/gfal2/gfal2.html +# git clone --depth=1 --branch master https://gitlab.cern.ch/dmc/gfal2.git gfal2-2.20.0 +# pushd gfal2-2.20.0 +# git checkout v2.20.0 # popd -# tar czf gfal2-2.15.1.tar.gz --exclude-vcs gfal2-2.15.1 +# tar czf gfal2-2.20.0.tar.gz --exclude-vcs gfal2-2.20.0 Source0: %{name}-%{version}.tar.gz #main lib dependencies @@ -25,28 +26,15 @@ BuildRequires: gcc-c++ BuildRequires: cmake3 BuildRequires: doxygen BuildRequires: json-c-devel -%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 6 BuildRequires: glib2-devel >= 2.28 Requires: glib2 >= 2.28 -%else -BuildRequires: glib2-devel -BuildRequires: gcc44-c++ -%endif BuildRequires: libattr-devel BuildRequires: openldap-devel -%if ! 0%{?el5} BuildRequires: pugixml-devel -%endif - -## libuuid is in a different rpm for el5 -%if 0%{?el5} -BuildRequires: e2fsprogs-devel -%else BuildRequires: libuuid-devel -%endif #file plugin dependencies BuildRequires: zlib-devel -%if (0%{?fedora} && (0%{?fedora} <= 30)) || (0%{?rhel} && (0%{?rhel} <= 7)) +%if 0%{?rhel} == 7 #lfc plugin dependencies BuildRequires: lfc-devel #rfio plugin dependencies @@ -61,7 +49,7 @@ BuildRequires: dcap-devel #gridftp plugin dependencies BuildRequires: globus-gass-copy-devel #http plugin dependencies -BuildRequires: davix-devel >= 0.6.8 +BuildRequires: davix-devel >= 0.8.0 #xrootd plugin dependencies BuildRequires: xrootd-client-devel >= 1:5.0.2 # sftp plugin dependencies @@ -92,9 +80,7 @@ development files for %{name} %package doc Summary: Documentation for %{name} -%if 0%{?fedora} > 10 || 0%{?rhel}>5 BuildArch: noarch -%endif %description doc Documentation, Doxygen and examples of %{name}. @@ -109,7 +95,7 @@ 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. -%if (0%{?fedora} && (0%{?fedora} <= 30)) || (0%{?rhel} && (0%{?rhel} <= 7)) +%if 0%{?rhel} == 7 %package plugin-lfc Summary: Provides the lfc support for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -167,7 +153,7 @@ the third party transfer support on the GSIFTP URLs. %package plugin-http Summary: Provides the HTTP/DAV support for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: davix-libs >= 0.6.8 +Requires: davix-libs >= 0.8.0 %description plugin-http Provides the HTTP (http[s]://) and WevDAV (dav[s]://) support for %{name}. @@ -207,9 +193,9 @@ Provides a dummy mock:// protocol for %{name}. Summary: Meta package for GFAL 2.0 install Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-plugin-file%{?_isa} = %{version}-%{release} -%if (0%{?fedora} && (0%{?fedora} <= 30)) || (0%{?rhel} && (0%{?rhel} <= 7)) -Requires: %{name}-plugin-rfio%{?_isa} = %{version}-%{release} +%if 0%{?rhel} == 7 Requires: %{name}-plugin-lfc%{?_isa} = %{version}-%{release} +Requires: %{name}-plugin-rfio%{?_isa} = %{version}-%{release} %endif Requires: %{name}-plugin-dcap%{?_isa} = %{version}-%{release} %if %{?_with_srm:1}%{?!_with_srm:0} @@ -224,7 +210,6 @@ Requires: %{name}-plugin-sftp%{?_isa} = %{version}-%{release} Meta-package for complete install of GFAL2 with all the protocol plugins. -%if %{?_with_tests:1}%{!?_with_tests:0} %package tests Summary: gfal2 tests Requires: gfal2-all%{?_isa} = %{version}-%{release} @@ -232,11 +217,9 @@ Requires: gfal2-plugin-mock%{?_isa} = %{version}-%{release} %description tests gfal2 tests -%endif -#%clean -#rm -rf %{buildroot}; -#make clean +%clean +%cmake3_build --target clean %prep %setup -q @@ -252,12 +235,7 @@ if [ "$gfal2_cmake_ver" != "$gfal2_spec_ver" ]; then exit 1 fi -%if 0%{?el5} -export CC=/usr/bin/gcc44 -export CXX=/usr/bin/g++44 -%endif - -%if (0%{?fedora} && (0%{?fedora} <= 30)) || (0%{?rhel} && (0%{?rhel} <= 7)) +%if 0%{?rhel} == 7 %cmake3 \ -DDOC_INSTALL_DIR=%{_pkgdocdir} \ -DUNIT_TESTS=TRUE \ @@ -273,23 +251,11 @@ export CXX=/usr/bin/g++44 -DPLUGIN_RFIO=FALSE \ -DFUNCTIONAL_TESTS=%{?with_tests:ON}%{?!with_tests:OFF} %endif -%cmake3_build - -#make %{?_smp_mflags} -#make doc -%check -export GFAL_PLUGIN_DIR=${PWD}/plugins/ -export GFAL_CONFIG_DIR=${PWD}/test/conf_test/ -export LD_LIBRARY_PATH=${PWD}/src/core:${LD_LIBRARY_PATH} -export LD_LIBRARY_PATH=${PWD}/plugins:${LD_LIBRARY_PATH} -export LD_LIBRARY_PATH=${PWD}/test/common:${LD_LIBRARY_PATH} -cd test/unit -ctest3 -V +%cmake3_build +%cmake3_build --target doc %install -#rm -rf %{buildroot} -#make DESTDIR=%{buildroot} install %cmake3_install %ldconfig_scriptlets @@ -326,7 +292,8 @@ ctest3 -V %files plugin-file %{_libdir}/%{name}-plugins/libgfal_plugin_file.so* %{_pkgdocdir}/README_PLUGIN_FILE -%if (0%{?fedora} && (0%{?fedora} <= 30)) || (0%{?rhel} && (0%{?rhel} <= 7)) + +%if 0%{?rhel} == 7 %files plugin-lfc %{_libdir}/%{name}-plugins/libgfal_plugin_lfc.so* %{_pkgdocdir}/README_PLUGIN_LFC @@ -375,16 +342,17 @@ ctest3 -V %{_pkgdocdir}/README_PLUGIN_MOCK %config(noreplace) %{_sysconfdir}/%{name}.d/mock_plugin.conf -%if %{?_with_tests:1}%{!?_with_tests:0} %files tests -%{_datadir}/gfal2/tests/* +%{_bindir}/gfal2-unit-tests %{_libdir}/libgfal2_test_shared.so -%endif %files all %changelog +* Tue Mar 01 2022 Mihai Patrascoiu - 2.20.4-1 +- Upgrade to upstream release 2.20.4 + * Tue Aug 31 2021 Michal Simon - 2.19.2-2 - Do not build SRM plug-in on Fedora platforms diff --git a/sources b/sources index 6e801c7..b3b1348 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gfal2-2.19.2.tar.gz) = b5f1a988880ef3d07f2223ab9547fd75861aa4af5c4f3d632ae5512a301677281fd4dad0fa6ccc81b3d4c4ef72a98cfadfece90d64c1746a49da58a9685cac06 +SHA512 (gfal2-2.20.4.tar.gz) = 63713af5cd10b2119b4d0447ea905873e680e6cb31bf428fec234af38c019c9e9480a7ff66e27331ada44e534f3e6d72b90d4602813f5d25fbcc337765a1ea39