diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2013-06-07 09:46:12 -0400 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-06-21 10:32:39 -0700 |
| commit | 159938575b43ce9af503c74560e044ee69d1395c (patch) | |
| tree | 922c72dd749326a44698a141f247a375e10db2ad /extras/LinuxRPM | |
| parent | cc477c7da1b543d51939aba919155a651099d4ba (diff) | |
build: sync glusterfs.spec.in with Fedora glusterfs.spec
(This is the release-3.4 branch.)
* remove G4S/UFO from community packaging. The Fedora/EPEL packaging
will follow suit once the glusterfs-openstack-swift packaging
materializes from the G4S team. Note that for the time being 'make dist'
still creates a UFO tarball from the .../ufo directory for use by
fedora packaging.
* add glusterfs-api and glusterfs-api-devel sub-packages
* add extras/systemd/glusterd.service. Use it (or extras/init.d/glusterd)
instead of the Fedora versions.
* restores ability to build glusterfs RPMs from the dist tarball with
'rpmbuild {-ts,-tb,-ta} glusterfs-XXX.tar.gz'
* reverse {--with,--without}_fusermount in sync with fedora .spec and
master branch
* other minor cleanups mostly to sync with fedora .spec and to build
from the dist tarball. Any differences will be resolved in the fedora
.spec in the next release (i.e. beta4 or GA).
* this is nominally for "the impending merge of .../api from master" but
should be independent of that change.
(still deciding whether to add the fedora glusterfsd.{init,service) files
here or remove them from fedora.)
BUG: 819130
Change-Id: I90c7355ca02239995b1df7646e3cd10ec227bcc5
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/5179
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'extras/LinuxRPM')
| -rw-r--r-- | extras/LinuxRPM/Makefile.am | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/extras/LinuxRPM/Makefile.am b/extras/LinuxRPM/Makefile.am index 3c867fe275e..cc020be94f7 100644 --- a/extras/LinuxRPM/Makefile.am +++ b/extras/LinuxRPM/Makefile.am @@ -1,7 +1,5 @@ -GFS_TAR = ../../glusterfs-*git.tar.gz -UFO_TAR = ../../gluster-swift-ufo-*git.tar.gz -GFS_SPEC = ../../glusterfs.spec +GFS_TAR = ../../glusterfs-${VERSION}.tar.gz .PHONY: all @@ -13,12 +11,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; \ +prep: + if [ ! -e $(GFS_TAR) ]; then \ + $(MAKE) -C ../.. dist; \ fi -mkdir -p rpmbuild/SPECS -mkdir -p rpmbuild/RPMS @@ -38,21 +33,6 @@ prep:: cp ../../*.tar.gz ./rpmbuild/SOURCES cp ../../glusterfs.spec ./rpmbuild/SPECS -GRIZZLY_TAR = swift-1.8.0.tar.gz -GRIZZLY_URL = https://launchpad.net/swift/grizzly/1.8.0/+download/$(GRIZZLY_TAR) - -prep:: - @if [ -d /d/cache -a -f /d/cache/$(GRIZZLY_TAR) -a -d ./rpmbuild/SOURCES ]; then \ - echo "copying swift source tarball from local cache..." ; \ - cp /d/cache/$(GRIZZLY_TAR) ./rpmbuild/SOURCES/ ; \ - elif [ -x /usr/bin/curl -a -d ./rpmbuild/SOURCES ]; then \ - echo "fetching swift from launchpad.net..." ; \ - cd ./rpmbuild/SOURCES && /usr/bin/curl -sOL $(GRIZZLY_URL) ; \ - else \ - echo "swift source not fetched, you don't have curl installed!" ; \ - exit 1 ; \ - fi - srcrpm: rpmbuild --define '_topdir $(shell pwd)/rpmbuild' -bs rpmbuild/SPECS/glusterfs.spec mv rpmbuild/SRPMS/* . @@ -61,10 +41,6 @@ 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 |