Merge branch 'stable-3.6' into stable-3.7
* stable-3.6:
Set Gerrit to 3.6.8
Set Gerrit to 3.6.7
Set Gerrit to 3.6.6
Set Gerrit to 3.6.5
Change-Id: Ib21363ef3324107e41d166bb38f3cfb4493af6ff
Release-Notes: skip
diff --git a/fpm/Makefile b/fpm/Makefile
index 1f7432d..01ee34a 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -1,6 +1,6 @@
-VERSION=3.6.8
-WAR_VERSION=3.6.8
-BRANCH=stable-3.6
+VERSION=3.7.5
+WAR_VERSION=3.7.5
+BRANCH=stable-3.7
URL=https://gerrit-releases.storage.googleapis.com/gerrit-$(WAR_VERSION).war
CI_URL=https://gerrit-ci.gerritforge.com
RELEASE=1
@@ -37,7 +37,7 @@
BUILD_SCRIPTS=$(foreach script,$(SCRIPTS),$(SCRIPTS_ROOT)/$(script))
FPM_OPTS=-s dir \
- -f -n $(NAME) -v $(VERSION) --iteration $(RELEASE) --category $(CATEGORY) -a $(BUILD_ARCH) \
+ -f -n $(NAME) -v $(VERSION) --iteration $(RELEASE) --category $(CATEGORY) -a all --rpm-os linux \
--description "$(SUMMARY)" --url $(WEB_URL) --license "$(LICENSE)" --vendor "$(VENDOR)" \
--depends git --depends sudo \
--PKG-user $(USER) --PKG-group $(GROUP) \
diff --git a/macOS/Makefile b/macOS/Makefile
index f364601..399cd7b 100644
--- a/macOS/Makefile
+++ b/macOS/Makefile
@@ -1,4 +1,4 @@
-VERSION := 3.6.8
+VERSION := 3.7.5
all: server
diff --git a/yum-repo/Makefile b/yum-repo/Makefile
index 806d0c1..a598511 100644
--- a/yum-repo/Makefile
+++ b/yum-repo/Makefile
@@ -2,7 +2,7 @@
# to produce a yum.repo for a VENDOR distribution
# Default values are pointing to GerritForge (www.gerritforge.com)
VERSION=1
-RELEASE=3
+RELEASE=4
VENDOR=GerritForge
VENDOR_LC=$(shell echo $(VENDOR) | tr A-Z a-z)
VENDOR_USER=yum
@@ -46,7 +46,7 @@
$(RPM_OUT): $(SRCS) prepare
fpm -t rpm -p $@ -s dir \
- -f -n $(NAME) -v $(VERSION) --iteration $(RELEASE) --category $(CATEGORY) \
+ -f -n $(NAME) -v $(VERSION) --iteration $(RELEASE) --category $(CATEGORY) -a all --rpm-os linux \
--description "$(SUMMARY)" --url $(WEB_URL) --license "$(LICENSE)" --vendor "$(VENDOR)" \
--rpm-user root --rpm-group root \
--verbose etc
