From 9bad843f4ad7dd5129e73604e3261ca1d7576c2e Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Mon, 23 Jul 2018 16:53:08 -0400 Subject: [PATCH 1/3] Remove ldconfig is post scriptlets (cherry picked from commit e02340c9f3f26a73c9f00756d529a022410940c3) --- 389-admin.spec | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/389-admin.spec b/389-admin.spec index f5ab5cb..5082759 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -13,7 +13,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.46 -Release: %{?relprefix}1%{?prerel}%{?dist}.5 +Release: %{?relprefix}2%{?prerel}%{?dist} License: GPLv2 and ASL 2.0 URL: http://www.port389.org/ Group: System Environment/Daemons @@ -93,7 +93,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.la %post -p -- do the usual daemon post setup stuff os.execute('/bin/systemctl preset %{pkgname}-admin.service >/dev/null 2>&1 || :') -os.execute('/sbin/ldconfig') -- restore permissions if upgrading if %{pkgname}admin_adminserv then posix.chmod('%{_sysconfdir}/%{pkgname}/admin-serv', %{pkgname}admin_adminserv.mode) @@ -108,7 +107,6 @@ end %systemd_preun %{pkgname}-admin.service %postun -/sbin/ldconfig %files %defattr(-,root,root,-) @@ -124,6 +122,22 @@ end %{_mandir}/man8/* %changelog +* Mon Jul 23 2018 Mark Reynolds - 1.1.46-2 +- Remove ldconfig is post scriptlets + +* Thu Jul 12 2018 Fedora Release Engineering - 1.1.46-1.9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jul 10 2018 Pete Walter - 1.1.46-1.8 +- Rebuild for ICU 62 + +* Mon Apr 30 2018 Pete Walter - 1.1.46-1.7 +- Rebuild for ICU 61.1 + +* Tue Feb 20 2018 Mark Reynolds - 1.1.46-1.6 +- Exclude I86(32 bit) platforms + +>>>>>>> e02340c... Remove ldconfig is post scriptlets * Wed Feb 07 2018 Fedora Release Engineering - 1.1.46-1.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 39eab56140dfc81a5eea4da4b4451fea24d6bcf5 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Mon, 23 Jul 2018 17:02:26 -0400 Subject: [PATCH 2/3] Remove ldconfig is post scriptlets --- 389-admin.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/389-admin.spec b/389-admin.spec index 5082759..41faa37 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -137,7 +137,6 @@ end * Tue Feb 20 2018 Mark Reynolds - 1.1.46-1.6 - Exclude I86(32 bit) platforms ->>>>>>> e02340c... Remove ldconfig is post scriptlets * Wed Feb 07 2018 Fedora Release Engineering - 1.1.46-1.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From f7c0d64b143b57532e66d996ba60c6a8b38405be Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Mon, 23 Jul 2018 17:04:57 -0400 Subject: [PATCH 3/3] FIx cherry-pick error from last commit --- 389-admin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/389-admin.spec b/389-admin.spec index 41faa37..0cd0560 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -13,7 +13,7 @@ Summary: 389 Administration Server (admin) Name: 389-admin Version: 1.1.46 -Release: %{?relprefix}2%{?prerel}%{?dist} +Release: %{?relprefix}2%{?prerel}%{?dist}.1 License: GPLv2 and ASL 2.0 URL: http://www.port389.org/ Group: System Environment/Daemons @@ -122,6 +122,9 @@ end %{_mandir}/man8/* %changelog +* Mon Jul 23 2018 Mark Reynolds - 1.1.46-2.1 +- FIx cherry-pick error from last commit + * Mon Jul 23 2018 Mark Reynolds - 1.1.46-2 - Remove ldconfig is post scriptlets