From 1cbd77262987d821a675f51da1213c7bf171e05b Mon Sep 17 00:00:00 2001
From: Jessica Frazelle <acidburn@docker.com>
Date: Fri, 15 Jan 2016 15:46:56 -0800
Subject: [PATCH] fix opensuse rpm

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
---
 contrib/builder/rpm/amd64/generate.sh              |  4 ++++
 contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile |  2 +-
 contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile |  2 +-
 hack/make/.build-rpm/docker-engine.spec            | 11 +++++++++--
 hack/make/build-rpm                                |  1 +
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/contrib/builder/rpm/amd64/generate.sh b/contrib/builder/rpm/amd64/generate.sh
index 4a0cc79e29..847c8203c8 100755
--- a/contrib/builder/rpm/amd64/generate.sh
+++ b/contrib/builder/rpm/amd64/generate.sh
@@ -108,6 +108,10 @@ for version in "${versions[@]}"; do
 		opensuse:*)
 			packages=( "${packages[@]/btrfs-progs-devel/libbtrfs-devel}" )
 			packages=( "${packages[@]/pkgconfig/pkg-config}" )
+			if [[ "$from" == "opensuse:13."* ]]; then
+				packages+=( systemd-rpm-macros )
+			fi
+
 			# use zypper
 			echo "RUN zypper --non-interactive install ${packages[*]}" >> "$version/Dockerfile"
 			;;
diff --git a/contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile b/contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile
index c135ec2be2..84b4a2b608 100644
--- a/contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile
+++ b/contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile
@@ -5,7 +5,7 @@
 FROM opensuse:13.2
 
 RUN zypper --non-interactive install ca-certificates* curl gzip rpm-build
-RUN zypper --non-interactive install libbtrfs-devel device-mapper-devel glibc-static  libselinux-devel libtool-ltdl-devel pkg-config selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar
+RUN zypper --non-interactive install libbtrfs-devel device-mapper-devel glibc-static  libselinux-devel libtool-ltdl-devel pkg-config selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar systemd-rpm-macros
 
 ENV GO_VERSION 1.5.3
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
diff --git a/contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile b/contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile
index 5a6f16e8ff..13468e74fb 100644
--- a/contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile
+++ b/contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile
@@ -1,5 +1,5 @@
 #
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/generate.sh"!
+# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/amd64/generate.sh"!
 #
 
 FROM oraclelinux:6
diff --git a/hack/make/.build-rpm/docker-engine.spec b/hack/make/.build-rpm/docker-engine.spec
index e79cd057f8..92b2b1adcf 100644
--- a/hack/make/.build-rpm/docker-engine.spec
+++ b/hack/make/.build-rpm/docker-engine.spec
@@ -12,7 +12,7 @@ Vendor: Docker
 Packager: Docker <support@docker.com>
 
 # is_systemd conditional
-%if 0%{?fedora} >= 21 || 0%{?centos} >= 7 || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1300
+%if 0%{?fedora} >= 21 || 0%{?centos} >= 7 || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210
 %global is_systemd 1
 %endif
 
@@ -20,9 +20,12 @@ Packager: Docker <support@docker.com>
 # most are already in the container (see contrib/builder/rpm/ARCH/generate.sh)
 # only require systemd on those systems
 %if 0%{?is_systemd}
+%if 0%{?suse_version} >= 1210
+BuildRequires: systemd-rpm-macros
+%{?systemd_requires}
+%else
 BuildRequires: pkgconfig(systemd)
 Requires: systemd-units
-%if !0%{?suse_version}
 BuildRequires: pkgconfig(libsystemd-journal)
 %endif
 %else
@@ -35,7 +38,11 @@ Requires(preun): initscripts
 # required packages on install
 Requires: /bin/sh
 Requires: iptables
+%if !0%{?suse_version}
 Requires: libcgroup
+%else
+Requires: libcgroup1
+%endif
 Requires: tar
 Requires: xz
 %if 0%{?fedora} >= 21 || 0%{?centos} >= 7 || 0%{?rhel} >= 7 || 0%{?oraclelinux} >= 7
diff --git a/hack/make/build-rpm b/hack/make/build-rpm
index 69be492006..449071fdb4 100644
--- a/hack/make/build-rpm
+++ b/hack/make/build-rpm
@@ -100,6 +100,7 @@ set -e
 			RUN tar -cz -C /usr/src -f /root/rpmbuild/SOURCES/${rpmName}.tar.gz ${rpmName}
 			RUN { cat /usr/src/${rpmName}/contrib/builder/rpm/${PACKAGE_ARCH}/changelog; } >> ${rpmName}.spec && tail >&2 ${rpmName}.spec
 			RUN rpmbuild -ba \
+				--define '_gitcommit $DOCKER_GITCOMMIT' \
 				--define '_release $rpmRelease' \
 				--define '_version $rpmVersion' \
 				--define '_origversion $VERSION' \