From f59ddfbcba763c20fb11afb4d42bf6c3f1f6cedd Mon Sep 17 00:00:00 2001
From: Simon Pichugin <spichugi@redhat.com>
Date: Mar 13 2019 09:57:25 +0000
Subject: Issue 50276 - 389-ds-console is not built on RHEL8 if cockpit_dist is already present


Description: When we make srpm we want to make sure that 389-ds-console is built every time.
It is built only if it's not already there (clean up is required).
We should enforce the cockpit_dist building even if it's present.

https://pagure.io/389-ds-base/issue/50276

Reviewed by: mreynolds, vashirov (Thanks!)

---

diff --git a/rpm.mk b/rpm.mk
index 4945229..fbb6076 100644
--- a/rpm.mk
+++ b/rpm.mk
@@ -13,7 +13,6 @@ JEMALLOC_URL ?= $(shell rpmspec -P $(RPMBUILD)/SPECS/389-ds-base.spec | awk '/^S
 JEMALLOC_TARBALL ?= $(shell basename "$(JEMALLOC_URL)")
 BUNDLE_JEMALLOC = 1
 NODE_MODULES_TEST = src/cockpit/389-console/node_modules/webpack
-WEBPACK_TEST = src/cockpit/389-console/cockpit_dist/index.html
 GIT_TAG = ${TAG}
 
 # Some sanitizers are supported only by clang
@@ -37,7 +36,7 @@ clean:
 $(NODE_MODULES_TEST):
 	cd src/cockpit/389-console; make -f node_modules.mk install
 
-$(WEBPACK_TEST): $(NODE_MODULES_TEST)
+build-cockpit: $(NODE_MODULES_TEST)
 	cd src/cockpit/389-console; make -f node_modules.mk build-cockpit-plugin
 
 dist-bz2: $(NODE_MODULES_TEST)
@@ -53,7 +52,7 @@ dist-bz2: $(NODE_MODULES_TEST)
 	rm -rf node_modules; \
 	mv node_modules.release node_modules
 
-local-archive: $(WEBPACK_TEST)
+local-archive: build-cockpit
 	-mkdir -p dist/$(NAME_VERSION)
 	rsync -a --exclude=node_modules --exclude=dist --exclude=.git --exclude=rpmbuild . dist/$(NAME_VERSION)