From d8a35290a10cc8327fbcfff11d380b8ad9272c95 Mon Sep 17 00:00:00 2001
From: Matus Honek <mhonek@redhat.com>
Date: Jan 30 2020 12:14:19 +0000
Subject: Issue 50867 - Fix minor buildsys issues


Description:
Gitignore fixes:
- Add svrcore.pc along other .pc files.
- Since 5b1c8e7 bin utils are not created with -bin suffix.

RPM:
- Comments are not allowed on macro's line; move below.
- Remove some ancient Obsoletes and Conflicts.

Fixes: https://pagure.io/389-ds-base/issue/50867

Author: Matus Honek <mhonek@redhat.com>

Review by: Mark, William (thanks!)

---

diff --git a/.gitignore b/.gitignore
index b25c928..7a92af0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,21 +50,21 @@ config.h
 config.log
 config.status
 dberrstrs.h
-dbscan-bin
+dbscan
 dirsrv.pc
-dsktune-bin
-infadd-bin
-ldap-agent-bin
-ldclt-bin
-ldif-bin
+dsktune
+infadd
+ldap-agent
+ldclt
+ldif
 libtool
 makstrdb
-migratecred-bin
-mmldif-bin
+migratecred
+mmldif
 ns-slapd
 ns-slapd.properties
-pwdhash-bin
-rsearch-bin
+pwdhash
+rsearch
 stamp-h1
 benchmark_par_sds
 benchmark_sds
@@ -202,6 +202,7 @@ ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl
 ldap/servers/snmp/ldap-agent.conf
 src/pkgconfig/libsds.pc
 src/pkgconfig/nunc-stans.pc
+src/pkgconfig/svrcore.pc
 wrappers/cl-dump
 wrappers/dbscan
 wrappers/dirsrv
diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in
index 14dfce1..4f7a961 100644
--- a/rpm/389-ds-base.spec.in
+++ b/rpm/389-ds-base.spec.in
@@ -59,8 +59,6 @@ URL:              https://www.port389.org/
 Group:            System Environment/Daemons
 # Is this still needed?
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes:        %{name}-selinux
-Conflicts:        selinux-policy-base < 3.9.8
 Obsoletes:        %{name} <= 1.4.0.9
 Provides:         ldif2ldbm
 
@@ -254,7 +252,8 @@ Requires:         bind-utils
 Legacy (and deprecated) utilities for 389 Directory Server. This includes
 the old account management and task scripts. These are deprecated in favour of
 the dscreate, dsctl, dsconf and dsidm tools.
-%endif  # use_legacy
+%endif
+#endif use_legacy
 
 %package          devel
 Summary:          Development libraries for 389 Directory Server (%{variant})
@@ -584,7 +583,8 @@ done
 
 exit 0
 
-%endif  # use_legacy
+%endif
+#endif use_legacy
 
 %files
 %if %{bundle_jemalloc}
@@ -785,7 +785,8 @@ exit 0
 %{_sbindir}/verify-db.pl
 %{_mandir}/man8/verify-db.pl.8.gz
 %{_libdir}/%{pkgname}/perl
-%endif  # use_legacy
+%endif
+#endif use_legacy
 
 %files snmp
 %doc LICENSE LICENSE.GPLv3+ LICENSE.openssl README.devel