From 6291519a612d19870e858afe12a74ac456ad8697 Mon Sep 17 00:00:00 2001 From: William Brown Date: Thu, 9 Jun 2016 11:06:23 +1000 Subject: [PATCH] Ticket 48877 - Fixes for RPM spec with spectool Bug Description: spectool expects a valid rpm file during parsing, but instead it trims it after the %description ..... So instead, because we wrapped this with an %if for asan, this now creates an incomplete and broken spec. This in turn causes make rpms to fail in some cases. Fix Description: Move the if condition inside the %description, to prevent the parser error. https://fedorahosted.org/389/ticket/48877 Author: wibrown Review by: ??? --- rpm/389-ds-base.spec.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in index 6cf5fda..943c756 100644 --- a/rpm/389-ds-base.spec.in +++ b/rpm/389-ds-base.spec.in @@ -143,17 +143,13 @@ Source2: %{name}-devel.README Source3: https://git.fedorahosted.org/cgit/nunc-stans.git/snapshot/nunc-stans-%{nunc_stans_ver}.tar.xz %endif -%if %{use_asan} %description 389 Directory Server is an LDAPv3 compliant server. The base package includes the LDAP server and command line utilities for server administration. +%if %{use_asan} WARNING! This build is linked to Address Sanitisation libraries. This probably isn't what you want. Please contact support immediately. Please see http://seclists.org/oss-sec/2016/q1/363 for more information. -%else -%description -389 Directory Server is an LDAPv3 compliant server. The base package includes -the LDAP server and command line utilities for server administration. %endif # upgrade path from monolithic %{name} (including -libs & -devel) to %{name} + %{name}-snmp -- 2.5.5