object-storage: rebase Swift to 1.8.0 (grizzly)
Two minor tweaks found while packaging 3.4.0-0.1.alpha2 for Fedora 19 BUG: 948039 Change-Id: I97175636164702cf4042bc4a18ffead76ad386cb Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/4807 Reviewed-by: Jeff Darcy <jdarcy@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
This commit is contained in:
parent
efa154bb0a
commit
77a02c4dd8
@ -39,21 +39,17 @@ prep::
|
|||||||
cp ../../*.tar.gz ./rpmbuild/SOURCES
|
cp ../../*.tar.gz ./rpmbuild/SOURCES
|
||||||
cp ../../glusterfs.spec ./rpmbuild/SPECS
|
cp ../../glusterfs.spec ./rpmbuild/SPECS
|
||||||
|
|
||||||
FOLSOM_TAR = swift-1.7.4.tar.gz
|
|
||||||
FOLSOM_URL = https://launchpad.net/swift/folsom/1.7.4/+download/$(FOLSOM_TAR)
|
|
||||||
GRIZZLY_TAR = swift-1.8.0.tar.gz
|
GRIZZLY_TAR = swift-1.8.0.tar.gz
|
||||||
GRIZZLY_URL = https://launchpad.net/swift/grizzly/1.8.0/+download/$(GRIZZLY_TAR)
|
GRIZZLY_URL = https://launchpad.net/swift/grizzly/1.8.0/+download/$(GRIZZLY_TAR)
|
||||||
|
|
||||||
prep::
|
prep::
|
||||||
@if [ -d /d/cache -a -f /d/cache/$(FOLSOM_TAR) -a -f /d/cache/$(GRIZZLY_TAR) -a -d ./rpmbuild/SOURCES ]; then \
|
@if [ -d /d/cache -a -f /d/cache/$(GRIZZLY_TAR) -a -d ./rpmbuild/SOURCES ]; then \
|
||||||
echo "copying swift source tarball from local cache..." ; \
|
echo "copying swift source tarball from local cache..." ; \
|
||||||
cp /d/cache/swift-*.tar.gz ./rpmbuild/SOURCES/ ; \
|
cp /d/cache/$(GRIZZLY_TAR) ./rpmbuild/SOURCES/ ; \
|
||||||
touch /d/cache/.swift ; \
|
touch /d/cache/.swift ; \
|
||||||
elif [ -x /usr/bin/curl -a -d ./rpmbuild/SOURCES ]; then \
|
elif [ -x /usr/bin/curl -a -d ./rpmbuild/SOURCES ]; then \
|
||||||
echo "fetching swift from launchpad.net..." ; \
|
echo "fetching swift from launchpad.net..." ; \
|
||||||
cd ./rpmbuild/SOURCES && \
|
cd ./rpmbuild/SOURCES && /usr/bin/curl -sOL $(GRIZZLY_URL) ; \
|
||||||
/usr/bin/curl -sOL $(FOLSOM_URL) && \
|
|
||||||
/usr/bin/curl -sOL $(GRIZZLY_URL) ; \
|
|
||||||
else \
|
else \
|
||||||
echo "swift source not fetched, you don't have curl installed!" ; \
|
echo "swift source not fetched, you don't have curl installed!" ; \
|
||||||
exit 1 ; \
|
exit 1 ; \
|
||||||
|
@ -388,7 +388,9 @@ Requires: python-netifaces
|
|||||||
Requires: python-swiftclient
|
Requires: python-swiftclient
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 7 )
|
||||||
Conflicts: openstack-swift
|
Conflicts: openstack-swift
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%description swift
|
%description swift
|
||||||
@ -492,7 +494,7 @@ BuildArch: noarch
|
|||||||
%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 7 )
|
%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 7 )
|
||||||
Requires: %{name}-swift = %{version}-%{release}
|
Requires: %{name}-swift = %{version}-%{release}
|
||||||
%else
|
%else
|
||||||
Requires: openstack-swift = %{SWIFTVER}-1
|
Requires: openstack-swift = %{SWIFTVER}
|
||||||
%endif
|
%endif
|
||||||
Requires: memcached
|
Requires: memcached
|
||||||
Requires: openssl
|
Requires: openssl
|
||||||
|
Loading…
x
Reference in New Issue
Block a user