Browse Source

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!)
William Brown 9 years ago
parent
commit
c2bc6707ba
1 changed files with 1 additions and 5 deletions
  1. 1 5
      rpm/389-ds-base.spec.in

+ 1 - 5
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