diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2013-03-28 11:41:25 -0400 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-03-28 14:28:06 -0700 |
| commit | 2cd9b31a5f032af807dea7b3d1b40592444154b5 (patch) | |
| tree | cb15800d24b4811f15f2c728605600bd9186a9e7 | |
| parent | ca6a3d1e396a65d25e54d331bef966178cd55375 (diff) | |
glusterfs.spec.in: sync with fedora glusterfs.spec
add --without ufo
Change-Id: If1b77003ded537f9664fa6ad677d48d118516c64
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
BUG: 819130
Reviewed-on: http://review.gluster.org/4742
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: Luis Pabon <lpabon@redhat.com>
Reviewed-by: Luis Pabon <lpabon@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>
| -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 cf8f44a0550..cfbe429df01 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 f6be2f70fbc..208c2760342 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 |