diff --git a/glusterfs.spec b/glusterfs.spec index 4c7aa3c..947cc05 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -62,10 +62,6 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with gnfs %{?_with_gnfs:%global _with_gnfs --enable-gnfs} -%if ( 0%{_for_fedora_koji_builds} ) -%global _with_gnfs --enable-gnfs -%endif - # ipv6default # if you wish to compile an rpm with IPv6 default... # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with ipv6default @@ -235,7 +231,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 5.0 -Release: %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist} +Release: %{?prereltag:0.}2%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -418,13 +414,13 @@ This package provides the development libraries and include files. %package events Summary: GlusterFS Events Requires: %{name}-server%{?_isa} = %{version}-%{release} -Requires: python%{_python_ver} -Requires: python%{_python_ver}-prettytable -Requires: python%{_python_ver}-gluster = %{version}-%{release} +Requires: python%{_pythonver} +Requires: python%{_pythonver}-prettytable +Requires: python%{_pythonver}-gluster = %{version}-%{release} %if ( 0%{?rhel} ) Requires: python-requests %else -Requires: python%{_python_ver}-requests +Requires: python%{_pythonver}-requests %endif %if ( 0%{?rhel} && 0%{?rhel} < 7 ) Requires: python-argparse @@ -449,8 +445,8 @@ This package provides the GlusterFS Events Summary: Extra Gluster filesystem Translators # We need python2-gluster rpm for gluster module's __init__.py in Python # site-packages area -Requires: python%{_python_ver}-gluster = %{version}-%{release} -Requires: python%{_python_ver} +Requires: python%{_pythonver}-gluster = %{version}-%{release} +Requires: python%{_pythonver} %description extra-xlators GlusterFS is a distributed file-system capable of scaling to several @@ -756,10 +752,12 @@ make check rm -rf %{buildroot} make install DESTDIR=%{buildroot} %if ( 0%{_for_fedora_koji_builds} ) +%if ( 0%{!?_without_server:1} ) install -D -p -m 0644 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/sysconfig/glusterd install -D -p -m 0644 %{SOURCE2} \ %{buildroot}%{_sysconfdir}/sysconfig/glusterfsd +%endif %else %if ( 0%{!?_without_server:1} ) install -D -p -m 0644 extras/glusterd-sysconfig \ @@ -822,9 +820,11 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha %endif # Install glusterfsd .service or init.d file +%if ( 0%{!?_without_server:1} ) %if ( 0%{_for_fedora_koji_builds} ) %service_install glusterfsd %{glusterfsd_svcfile} %endif +%endif install -D -p -m 0644 extras/glusterfs-logrotate \ %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs @@ -1059,10 +1059,10 @@ exit 0 %{!?_licensedir:%global license %%doc} %license COPYING-GPLV2 COPYING-LGPLV3 %doc ChangeLog INSTALL README.md THANKS COMMITMENT -%if ( 0%{!?_without_server:1} ) %{_mandir}/man8/*gluster*.8* -%endif +%if ( 0%{!?_without_server:1} ) %exclude %{_mandir}/man8/gluster.8* +%endif %dir %{_localstatedir}/log/glusterfs %if ( 0%{!?_without_rdma:1} ) %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma* @@ -1485,6 +1485,9 @@ exit 0 %endif %changelog +* Thu Sep 20 2018 Kaleb S. KEITHLEY - 5.0rc0-0.2 +- 5.0 RC0 + * Tue Sep 18 2018 Kaleb S. KEITHLEY - 5.0rc0-0.1 - 5.0 RC0