From 79f025b91d461a948ca6449eb25a11a6c89144b5 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 16:12:36 -0400 Subject: [PATCH 7/7] WRS: 0001-Update-package-versioning-for-TIS-format.patch Conflicts: SPECS/haproxy.spec --- SPECS/haproxy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/haproxy.spec b/SPECS/haproxy.spec index c1547ef..097aa79 100644 --- a/SPECS/haproxy.spec +++ b/SPECS/haproxy.spec @@ -8,7 +8,7 @@ Name: haproxy Version: 1.5.18 -Release: 6%{?dist} +Release: 6.el7%{?_tis_dist}.%{tis_patch_ver} Summary: TCP/HTTP proxy and load balancer for high availability environments Group: System Environment/Daemons -- 1.9.1