PR#50868: Issue 50867 - Fix minor buildsys issues - 389-ds-base

389-ds-base

#50868 Issue 50867 - Fix minor buildsys issues

Closed 3 years ago by spichugi. Opened 4 years ago by mhonek.

mhonek/389-ds-base fix-minor-buildsys-annoyances into master

Issue 50867 - Fix minor buildsys issues

Matus Honek • 4 years ago

d8a3529

.gitignore

file modified

+11 -10

		`@@ -50,21 +50,21 @@`
		`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/snmp/ldap-agent.conf`
		`src/pkgconfig/libsds.pc`
		`src/pkgconfig/nunc-stans.pc`
		`+ src/pkgconfig/svrcore.pc`
		`wrappers/cl-dump`
		`wrappers/dbscan`
		`wrappers/dirsrv`

rpm/389-ds-base.spec.in

file modified

+6 -5

		`@@ -59,8 +59,6 @@`
		`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 @@`
		`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 @@`

		`exit 0`

		`- %endif # use_legacy`
		`+ %endif`
		`+ #endif use_legacy`

		`%files`
		`%if %{bundle_jemalloc}`
		`@@ -785,7 +785,8 @@`
		`%{_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`

mhonek commented 4 years ago

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: ???

mreynolds commented 4 years ago

ack

firstyear commented 4 years ago

I think there is actually no reason to have svrcore.pc anymore as we are the only project using it, so we could consider just dropping it.

mhonek commented 4 years ago

I think there is actually no reason to have svrcore.pc anymore as we are the only project using it, so we could consider just dropping it.

Agreed, but we still have mozldap in Fedora who needs it (I've filed a ticket #50871 for that). So I am currently going to proceed as is and let's remove it once we can.

rebased onto d8a3529

4 years ago

Pull-Request has been merged by mhonek

4 years ago