diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2013-04-11 09:36:35 -0400 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-04-12 00:22:47 -0700 |
| commit | 77a02c4dd8467e2a78b3ab3cdef95178ef4b1898 (patch) | |
| tree | 29ca9df785539be4e8485a22472530c849174b54 | |
| parent | efa154bb0a4cac34d5a9610ec25d38eebe495f22 (diff) | |
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>
| -rw-r--r-- | extras/LinuxRPM/Makefile.am | 10 | ||||
| -rw-r--r-- | glusterfs.spec.in | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/extras/LinuxRPM/Makefile.am b/extras/LinuxRPM/Makefile.am index 38d14cda76c..7a3107aabb7 100644 --- a/extras/LinuxRPM/Makefile.am +++ b/extras/LinuxRPM/Makefile.am @@ -39,21 +39,17 @@ prep:: cp ../../*.tar.gz ./rpmbuild/SOURCES 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_URL = https://launchpad.net/swift/grizzly/1.8.0/+download/$(GRIZZLY_TAR) 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..." ; \ - cp /d/cache/swift-*.tar.gz ./rpmbuild/SOURCES/ ; \ + cp /d/cache/$(GRIZZLY_TAR) ./rpmbuild/SOURCES/ ; \ touch /d/cache/.swift ; \ elif [ -x /usr/bin/curl -a -d ./rpmbuild/SOURCES ]; then \ echo "fetching swift from launchpad.net..." ; \ - cd ./rpmbuild/SOURCES && \ - /usr/bin/curl -sOL $(FOLSOM_URL) && \ - /usr/bin/curl -sOL $(GRIZZLY_URL) ; \ + cd ./rpmbuild/SOURCES && /usr/bin/curl -sOL $(GRIZZLY_URL) ; \ else \ echo "swift source not fetched, you don't have curl installed!" ; \ exit 1 ; \ diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 9f2415dda90..7595748b9fd 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -388,7 +388,9 @@ Requires: python-netifaces Requires: python-swiftclient %endif +%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 7 ) Conflicts: openstack-swift +%endif %description swift @@ -492,7 +494,7 @@ BuildArch: noarch %if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 7 ) Requires: %{name}-swift = %{version}-%{release} %else -Requires: openstack-swift = %{SWIFTVER}-1 +Requires: openstack-swift = %{SWIFTVER} %endif Requires: memcached Requires: openssl |