diff --git a/gfal2-python.spec b/gfal2-python.spec index c61f802..28a8925 100644 --- a/gfal2-python.spec +++ b/gfal2-python.spec @@ -35,7 +35,7 @@ Name: gfal2-python Version: 1.9.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Python bindings for gfal 2 License: ASL 2.0 URL: http://dmc.web.cern.ch/ @@ -46,20 +46,14 @@ URL: http://dmc.web.cern.ch/ # tar czf gfal2-python-1.9.5.tar.gz --exclude-vcs gfal2-python-1.9.5 Source0: %{name}-%{version}.tar.gz -BuildRequires: gcc-c++ -%if 0%{?el5} -BuildRequires: cmake28 -%else -BuildRequires: cmake -%endif +BuildRequires: gcc-c++ +BuildRequires: cmake BuildRequires: gfal2-devel >= 2.13.0 -%if 0%{?el5} -BuildRequires: boost141-devel -%else BuildRequires: boost-devel +%if (0%{?fedora} && (0%{?fedora} <= 31)) || (0%{?rhel} && (0%{?rhel} <= 8)) BuildRequires: boost-python2-devel -%endif BuildRequires: python2-devel +%endif BuildRequires: epydoc # Python 3 @@ -75,6 +69,7 @@ for the file operations in grids and cloud environments. %description %_description +%if (0%{?fedora} && (0%{?fedora} <= 31)) || (0%{?rhel} && (0%{?rhel} <= 8)) %package -n python2-gfal2 Summary: %summary Requires: gfal2-core >= 2.13.0 @@ -85,6 +80,7 @@ Provides: gfal2-python%{?_isa} = %{version}-%{release} Obsoletes: gfal2-python < %{version}-%{release} %description -n python2-gfal2 %_description +%endif %package doc Summary: Documentation for %{name} @@ -96,10 +92,10 @@ BuildArch: noarch Documentation files for %{name}. %if 0%{?with_python3} -%package -n gfal2-python3 +%package -n python3-gfal2 Summary: gfal2 python bindings for Python 3 -%description -n gfal2-python3 +%description -n python3-gfal2 Python 3 bindings for gfal2. GFAL2 offers an a single, simple and portable API for the file operations in grids and cloud environments. @@ -123,43 +119,31 @@ if [ "$gfal2_python_cmake_ver=" != "$gfal2_python_spec_ver=" ]; then exit 1 fi -%if 0%{?el5} - %cmake28 \ - -DDOC_INSTALL_DIR=%{_pkgdocdir} \ - %{boost_cmake_flags} \ -%if 0%{?with_static_boost_python} - -DBoost_USE_STATIC_LIBS=ON \ -%endif - -DUNIT_TESTS=TRUE . -%else - %cmake \ +%cmake \ -DDOC_INSTALL_DIR=%{_pkgdocdir} \ %{boost_cmake_flags} \ %if 0%{?with_static_boost_python} -DBoost_USE_STATIC_LIBS=ON \ %endif -DUNIT_TESTS=TRUE . -%endif make %{?_smp_mflags} make doc %check -%if 0%{?el5} - ctest28 -V -T Test . -%else - ctest -V -T Test . -%endif +ctest -V -T Test . %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install +%if (0%{?fedora} && (0%{?fedora} <= 31)) || (0%{?rhel} && (0%{?rhel} <= 8)) %files -n python2-gfal2 %{python2_sitearch}/gfal2.so %{_pkgdocdir}/LICENSE %{_pkgdocdir}/RELEASE-NOTES %{_pkgdocdir}/README +%endif %files doc %{_pkgdocdir}/readme.html @@ -174,6 +158,11 @@ make DESTDIR=%{buildroot} install %endif %changelog +* Thu Oct 25 2018 Andrea Manzi - 1.9.5-5 +- rename python3 package +- remove python2 package from f32 on +- remove el5 compilation + * Mon Aug 19 2019 Miro HronĨok - 1.9.5-4 - Rebuilt for Python 3.8