diff options
| -rw-r--r-- | extras/LinuxRPM/Makefile.am | 7 | ||||
| -rw-r--r-- | glusterfs.spec.in | 6 | 
2 files changed, 13 insertions, 0 deletions
diff --git a/extras/LinuxRPM/Makefile.am b/extras/LinuxRPM/Makefile.am index cf8f44a05..cfbe429df 100644 --- a/extras/LinuxRPM/Makefile.am +++ b/extras/LinuxRPM/Makefile.am @@ -13,6 +13,9 @@ all:  glusterrpms: prep srcrpm rpms  	-rm -rf rpmbuild +glusterrpmswithoutufo: prep srcrpm rpmswithoutufo +	-rm -rf rpmbuild +  prep::  	if [ ! -e $(GFS_TAR) -a ! -e $(UFO_TAR) -a ! -e $(GFS_SPEC) ]; then \  		$(MAKE) -c ../.. dist; \ @@ -63,6 +66,10 @@ rpms:  	rpmbuild --define '_topdir $(shell pwd)/rpmbuild' -bb rpmbuild/SPECS/glusterfs.spec  	mv rpmbuild/RPMS/*/* . +rpmswithoutufo: +	rpmbuild --define '_topdir $(shell pwd)/rpmbuild' -bb rpmbuild/SPECS/glusterfs.spec --without ufo +	mv rpmbuild/RPMS/*/* . +  # EPEL-5 does not like new versions of rpmbuild and requires some  # _source_* defines diff --git a/glusterfs.spec.in b/glusterfs.spec.in index f6be2f70f..208c27603 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -26,6 +26,10 @@  # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without ocf  %{?_without_ocf:%global _without_ocf --without-ocf} +# if you wish to build rpms without UFO, compile like this +# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@tar.gz --without ufo +%{?_without_ufo:%global _without_ufo true} +  %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )  %global           SWIFTVER 1.7.4  %if 0%{_for_fedora_koji_builds} @@ -33,8 +37,10 @@  %else  %global           UFOVER @PACKAGE_VERSION@  %endif +%if ! 0%{?_without_ufo:1}  %global           _with_ufo true  %endif +%endif  %if ( 0%{?fedora} && 0%{?fedora} > 16 ) || ( 0%{?rhel} && 0%{?rhel} > 6 )  %global           _with_systemd true  | 
