From c270eed3bc9875e6a19c2b07d9a8e3ebf36309a7 Mon Sep 17 00:00:00 2001 From: Viktor Ashirov Date: Oct 26 2020 12:52:47 +0000 Subject: Release 1.1.46-4 Resolves: Bug 1886024 - file /usr/lib64/dirsrv from install of 389-ds-base-libs-1.3.10.2-6.el7.x86_64 conflicts with file from package 389-admin-1.1.46-1.el7.x86_64 --- diff --git a/389-admin.spec b/389-admin.spec index 663bdfa..31ba327 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -13,12 +13,14 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.46 -Release: %{?relprefix}1%{?prerel}%{?dist} -License: GPLv3 and ASL 2.0 -URL: http://www.port389.org/ +Release: %{?relprefix}4%{?prerel}%{?dist} +License: GPLv3 +URL: https://www.port389.org/ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: 389-ds-base >= 1.3.10.2-1 + BuildRequires: nspr-devel BuildRequires: nss-devel BuildRequires: openldap-devel @@ -45,7 +47,7 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -Source0: http://www.port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2 +Source0: https://releases.pagure.org/389-admin/%{name}-%{version}.tar.bz2 # 389-admin-git.sh should be used to generate the source tarball from git Source1: %{name}-git.sh @@ -127,10 +129,15 @@ end %{_unitdir}/%{pkgname}-admin.service %{_sbindir}/* %{_libdir}/*.so.* -%{_libdir}/%{pkgname} +%attr(775, -, -) %{_libdir}/%{pkgname} +%attr(755, -, -) %{_libdir}/%{pkgname}/* %{_mandir}/man8/* %changelog +* Mon Oct 26 2020 Viktor Ashirov - 1.1.46-4 +- Release 1.1.46-4 +- Bug 1886024 - file /usr/lib64/dirsrv from install of 389-ds-base-libs-1.3.10.2-6.el7.x86_64 conflicts with file from package 389-admin-1.1.46-1.el7.x86_64 + * Tue Nov 01 2016 Mark Reynolds - 1.1.46-1 - Bump verison to 1.1.46 - Ticket 49015 - regsiter-ds-amin.pl silent registration does not work with local instances