[389-commits] rpm/389-ds-base.spec.in

rpm/389-ds-base.spec.in | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit c2bc6707ba784c7cd673517519cbc8ac8611f922
Author: William Brown <firstyear@redhat.com>
Date: Thu Jun 9 11:06:23 2016 +1000

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: nhosoi (Thanks!)

diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in
index 4169388..c0ceb98 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

_______________________________________________
389-commits mailing list -- 389-commits@lists.fedoraproject.org
To unsubscribe send an email to 389-commits-leave@lists.fedoraproject.org