From 074393afa9670642f05d8d9508ed33784681f9f6 Mon Sep 17 00:00:00 2001
From: Mark Reynolds <mreynolds@redhat.com>
Date: Aug 16 2018 19:35:14 +0000
Subject: Bump version to 1.4.0.15

Ticket 49029 - Internal logging thread data needs to allocate int pointers
Ticket 48061 - CI test - config
Ticket 48377 - Only ship libjemalloc.so.2
Ticket 49885 - On some platform fips does not exist

---

diff --git a/389-ds-base.spec b/389-ds-base.spec
index 0e363cf..68a5d3e 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -444,11 +444,6 @@ else
 fi
 # reload to pick up any changes to systemd files
 /bin/systemctl daemon-reload >$output 2>&1 || :
-# reload to pick up any shared lib changes
-/sbin/ldconfig
-# find all instances
-instances="" # instances that require a restart after upgrade
-ninst=0 # number of instances found in total
 
 # https://fedoraproject.org/wiki/Packaging:UsersAndGroups#Soft_static_allocation
 # Soft static allocation for UID and GID
@@ -504,6 +499,9 @@ else
 fi
 
 echo looking for instances in %{_sysconfdir}/%{pkgname} > $output 2>&1 || :
+# find all instances
+instances="" # instances that require a restart after upgrade
+ninst=0 # number of instances found in total
 instbase="%{_sysconfdir}/%{pkgname}"
 for dir in $instbase/slapd-* ; do
     echo dir = $dir >> $output 2>&1 || :
@@ -553,7 +551,6 @@ exit 0
 
 
 %files
-%defattr(-,root,root,-)
 %if %{bundle_jemalloc}
 %doc LICENSE LICENSE.GPLv3+ LICENSE.openssl README.jemalloc
 %license COPYING.jemalloc
@@ -647,11 +644,10 @@ exit 0
 %exclude %{_libdir}/%{pkgname}/lib/libjemalloc.a
 %exclude %{_libdir}/%{pkgname}/lib/libjemalloc.so
 %exclude %{_libdir}/%{pkgname}/lib/libjemalloc_pic.a
-%exclude %{_libdir}/%{pkgname}/lib/pkgconfig/jemalloc.pc
+%exclude %{_libdir}/%{pkgname}/lib/pkgconfig
 %endif
 
 %files devel
-%defattr(-,root,root,-)
 %doc LICENSE LICENSE.GPLv3+ LICENSE.openssl README.devel
 %{_mandir}/man3/*
 %{_includedir}/svrcore.h
@@ -662,16 +658,12 @@ exit 0
 %{_libdir}/%{pkgname}/libnunc-stans.so
 %{_libdir}/%{pkgname}/libsds.so
 %{_libdir}/%{pkgname}/libldaputil.so
-%if %{bundle_jemalloc}
-%{_libdir}/%{pkgname}/lib/libjemalloc.so
-%endif
 %{_libdir}/pkgconfig/svrcore.pc
 %{_libdir}/pkgconfig/dirsrv.pc
 %{_libdir}/pkgconfig/libsds.pc
 %{_libdir}/pkgconfig/nunc-stans.pc
 
 %files libs
-%defattr(-,root,root,-)
 %doc LICENSE LICENSE.GPLv3+ LICENSE.openssl README.devel
 %dir %{_libdir}/%{pkgname}
 %{_libdir}/libsvrcore.so.*
@@ -681,14 +673,13 @@ exit 0
 %{_libdir}/%{pkgname}/libsds.so.*
 %{_libdir}/%{pkgname}/libldaputil.so.*
 %if %{bundle_jemalloc}
-%{_libdir}/%{pkgname}/lib/libjemalloc.so.*
+%{_libdir}/%{pkgname}/lib/libjemalloc.so.2
 %endif
 %if %{use_rust}
 %{_libdir}/%{pkgname}/librsds.so
 %endif
 
 %files legacy-tools
-%defattr(-,root,root,-)
 %doc LICENSE LICENSE.GPLv3+ LICENSE.openssl README.devel
 %{_bindir}/infadd
 %{_mandir}/man1/infadd.1.gz
@@ -770,7 +761,6 @@ exit 0
 %endif
 
 %files snmp
-%defattr(-,root,root,-)
 %doc LICENSE LICENSE.GPLv3+ LICENSE.openssl README.devel
 %config(noreplace)%{_sysconfdir}/%{pkgname}/config/ldap-agent.conf
 %{_sbindir}/ldap-agent*
@@ -778,7 +768,6 @@ exit 0
 %{_unitdir}/%{pkgname}-snmp.service
 
 %files -n python%{python3_pkgversion}-lib389
-%defattr(-,root,root,-)
 %doc LICENSE LICENSE.GPLv3+
 %{python3_sitelib}/lib389*
 %{_sbindir}/dsconf
@@ -791,19 +780,17 @@ exit 0
 %{_mandir}/man8/dsidm.8.gz
 
 %files -n python%{python3_pkgversion}-%{srcname}-tests
-%defattr(-,root,root,-)
 %doc LICENSE LICENSE.GPLv3+
 %{python3_sitelib}/dirsrvtests*
 
 %files -n cockpit-389-ds -f cockpit.list
-%defattr(-,root,root,-)
 %doc README.md
 
 %changelog
 * Thu Aug 16 2018 Mark Reynolds <mreynolds@redhat.com> - 1.4.0.15-1
 - Bump version to 1.4.0.15
 - Ticket 49029 - Internal logging thread data needs to allocate int pointers
-- Ticket 48061 : CI test - config
+- Ticket 48061 - CI test - config
 - Ticket 48377 - Only ship libjemalloc.so.2
 - Ticket 49885 - On some platform fips does not exist