diff --git a/glusterfs.spec b/glusterfs.spec index 91723e6..93a4a06 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -27,8 +27,8 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without bd %{?_without_bd:%global _without_bd --disable-bd-xlator} -%if ( 0%{?rhel} && 0%{?rhel} > 7 ) -%global _without_bd --without-bd +%if ( 0%{?fedora} && 0%{?fedora} > 30 ) || ( 0%{?rhel} && 0%{?rhel} > 7 ) +%global _without_bd --disable-bd-xlator %endif # cmocka @@ -56,6 +56,15 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without georeplication %{?_without_georeplication:%global _without_georeplication --disable-georeplication} +# glupy +# if you wish to compile an rpm without glupy support... +# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without glupy +%{?_without_glupy:%global _without_glupy --disable-glupy} + +%if ( 0%{?fedora} && 0%{?fedora} > 31 ) +%global _without_glupy --disable-glupy +%endif + # gnfs # if you wish to compile an rpm with the legacy gNFS server xlator # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with gnfs @@ -92,6 +101,11 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma %{?_without_rdma:%global _without_rdma --disable-ibverbs} +# No RDMA Support on s390(x) +%ifarch s390 s390x armv7hl +%global _without_rdma --disable-ibverbs +%endif + # server # if you wish to build rpms without server components, compile like this # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without server @@ -218,7 +232,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 5.3 +Version: 5.10 Release: %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -295,6 +309,9 @@ Obsoletes: %{name}-regression-tests %endif Obsoletes: %{name}-ufo Obsoletes: %{name}-ganesha +%if ( 0%{!?_with_gnfs:1} ) +Obsoletes: %{name}-gnfs +%endif Provides: %{name}-common = %{version}-%{release} Provides: %{name}-core = %{version}-%{release} @@ -699,6 +716,7 @@ sed -i -e 's/--quiet//' configure.ac %{?_with_cmocka} \ %{?_with_debug} \ %{?_with_firewalld} \ + %{?_without_glupy} \ %{?_with_gnfs} \ %{?_with_tmpfilesdir} \ %{?_with_valgrind} \ @@ -1123,12 +1141,14 @@ exit 0 %exclude %{_includedir}/glusterfs/api %exclude %{_libdir}/libgfapi.so %{_libdir}/*.so +%if ( 0%{!?_without_glupy:1} ) # Glupy Translator examples %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/debug-trace.* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/helloworld.* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/negative.* +%endif %{_libdir}/pkgconfig/libgfchangelog.pc %if ( 0%{!?_without_tiering:1} ) %{_libdir}/pkgconfig/libgfdb.pc @@ -1137,11 +1157,13 @@ exit 0 %files extra-xlators %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/rot-13.so +%if ( 0%{!?_without_glupy:1} ) %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy.so %if ( %{_usepython3} ) %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/__pycache__ %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/__pycache__/* +%endif %endif %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quiesce.so %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/playground @@ -1149,6 +1171,7 @@ exit 0 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance/symlink-cache.so +%if ( 0%{!?_without_glupy:1} ) # Glupy Python files %if ( %{_usepython3} ) %dir %{python3_sitelib}/gluster @@ -1161,6 +1184,7 @@ exit 0 %dir %{python2_sitelib}/gluster/glupy %{python2_sitelib}/gluster/glupy/* %endif +%endif %files fuse # glusterfs is a symlink to glusterfsd, -server depends on -fuse. @@ -1240,11 +1264,15 @@ exit 0 # so that all other gluster submodules can reside in the same namespace. %if ( %{_usepython3} ) %dir %{python3_sitelib}/gluster +%if ( 0%{!?_without_glupy:1} ) %{python3_sitelib}/gluster/__init__.* +%endif %{python3_sitelib}/gluster/cliutils %else %dir %{python2_sitelib}/gluster +%if ( 0%{!?_without_glupy:1} ) %{python2_sitelib}/gluster/__init__.* +%endif %{python2_sitelib}/gluster/cliutils %endif @@ -1435,8 +1463,8 @@ exit 0 %dir %{_sharedstatedir}/glusterd %dir %{_sharedstatedir}/glusterd/events %dir %{_libexecdir}/glusterfs -%dir %{_libexecdir}/glusterfs/events - %{_libexecdir}/glusterfs/events/* +%dir %{_libexecdir}/glusterfs/gfevents + %{_libexecdir}/glusterfs/gfevents/* %{_libexecdir}/glusterfs/peer_eventsapi.py* %{_sbindir}/glustereventsd %{_sbindir}/gluster-eventsapi @@ -1449,6 +1477,37 @@ exit 0 %endif %changelog +* Wed Oct 9 2019 Kaleb S. KEITHLEY +- f32+ --without-glupy + +* Wed Oct 9 2019 Kaleb S. KEITHLEY - 5.10-1 +- 5.10 GA + +* Wed Aug 7 2019 Kaleb S. KEITHLEY - 5.9-1 +- 5.9 GA + +* Thu Jul 18 2019 Kaleb S. KEITHLEY - 5.8-1 +- 5.8 GA + +* Wed Jul 3 2019 Kaleb S. KEITHLEY - 5.7-1 +- 5.7 GA + +* Tue Apr 9 2019 Kaleb S. KEITHLEY - 5.6-1 +- 5.6 GA + +* Fri Mar 15 2019 Kaleb S. KEITHLEY - 5.5-1 +- 5.5 GA + +* Wed Mar 13 2019 Kaleb S. KEITHLEY - 5.4-3 +- core: make compute_cksum function op_version compatible +- dict: handle STR_OLD data type in xdr conversions + +* Fri Mar 1 2019 Kaleb S. KEITHLEY - 5.4-2 +- 5.4 s390x, armv7hl no rdma + +* Wed Feb 27 2019 Kaleb S. KEITHLEY - 5.4-1 +- 5.4 GA + * Thu Jan 17 2019 Kaleb S. KEITHLEY - 5.3-1 - 5.3 GA @@ -1461,17 +1520,8 @@ exit 0 * Thu Oct 18 2018 Kaleb S. KEITHLEY - 5.0-1 - 5.0 GA -* Fri Oct 5 2018 Kaleb S. KEITHLEY - 5.0-0.5.rc1 -- 5.0 RC1 - -* Mon Sep 24 2018 Kaleb S. KEITHLEY - 5.0-0.3.rc0 -- 5.0 RC0, unbork python shebangs - -* Thu Sep 20 2018 Kaleb S. KEITHLEY - 5.0-0.2.rc0 -- 5.0 RC0 - -* Tue Sep 18 2018 Kaleb S. KEITHLEY - 5.0-0.1.rc0 -- 5.0 RC0 +* Fri Sep 21 2018 Kaleb S. KEITHLEY - 4.1.5-1 +- 4.1.5 GA * Thu Sep 6 2018 Kaleb S. KEITHLEY - 4.1.4-1 - 4.1.4 GA diff --git a/sources b/sources index db028a9..bcd0952 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-5.3.tar.gz) = 8b5405dbbfcc57ece25ac5934c1d63e9a1f8936bcf6d53ebfdca5c144e963550d99bdee667b7ed7b06c608ddfbf40b5738e9c15b17a11362c8478b02a7e0e15f +SHA512 (glusterfs-5.10.tar.gz) = 9268327575eac3108993d70405c32ad16bf16c472399e8da168e1207abeb9b762a90e547371361c783bcd76fddb678347b1c8ef9892c048922ea1233637eb889