summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extras/LinuxRPM/Makefile.am10
-rw-r--r--glusterfs.spec.in4
2 files changed, 6 insertions, 8 deletions
diff --git a/extras/LinuxRPM/Makefile.am b/extras/LinuxRPM/Makefile.am
index 38d14cda7..7a3107aab 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 9f2415dda..7595748b9 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