Fix specfile

- Fix legacy tool scriplet error
- Remove ldconfig calls
- Only provide libjemalloc.so.2
This commit is contained in:
Mark Reynolds 2018-08-13 13:32:05 -04:00
parent a108692f93
commit 868bfa17dd

View File

@ -444,11 +444,6 @@ else
fi fi
# reload to pick up any changes to systemd files # reload to pick up any changes to systemd files
/bin/systemctl daemon-reload >$output 2>&1 || : /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 # https://fedoraproject.org/wiki/Packaging:UsersAndGroups#Soft_static_allocation
# Soft static allocation for UID and GID # Soft static allocation for UID and GID
@ -503,6 +498,10 @@ else
output2=/dev/null output2=/dev/null
fi fi
# find all instances
instances="" # instances that require a restart after upgrade
ninst=0 # number of instances found in total
echo looking for instances in %{_sysconfdir}/%{pkgname} > $output 2>&1 || : echo looking for instances in %{_sysconfdir}/%{pkgname} > $output 2>&1 || :
instbase="%{_sysconfdir}/%{pkgname}" instbase="%{_sysconfdir}/%{pkgname}"
for dir in $instbase/slapd-* ; do for dir in $instbase/slapd-* ; do
@ -646,7 +645,7 @@ exit 0
%exclude %{_libdir}/%{pkgname}/lib/libjemalloc.a %exclude %{_libdir}/%{pkgname}/lib/libjemalloc.a
%exclude %{_libdir}/%{pkgname}/lib/libjemalloc.so %exclude %{_libdir}/%{pkgname}/lib/libjemalloc.so
%exclude %{_libdir}/%{pkgname}/lib/libjemalloc_pic.a %exclude %{_libdir}/%{pkgname}/lib/libjemalloc_pic.a
%exclude %{_libdir}/%{pkgname}/lib/pkgconfig/jemalloc.pc %exclude %{_libdir}/%{pkgname}/lib/pkgconfig
%endif %endif
%files devel %files devel
@ -660,9 +659,6 @@ exit 0
%{_libdir}/%{pkgname}/libnunc-stans.so %{_libdir}/%{pkgname}/libnunc-stans.so
%{_libdir}/%{pkgname}/libsds.so %{_libdir}/%{pkgname}/libsds.so
%{_libdir}/%{pkgname}/libldaputil.so %{_libdir}/%{pkgname}/libldaputil.so
%if %{bundle_jemalloc}
%{_libdir}/%{pkgname}/lib/libjemalloc.so
%endif
%{_libdir}/pkgconfig/svrcore.pc %{_libdir}/pkgconfig/svrcore.pc
%{_libdir}/pkgconfig/dirsrv.pc %{_libdir}/pkgconfig/dirsrv.pc
%{_libdir}/pkgconfig/libsds.pc %{_libdir}/pkgconfig/libsds.pc
@ -678,7 +674,7 @@ exit 0
%{_libdir}/%{pkgname}/libsds.so.* %{_libdir}/%{pkgname}/libsds.so.*
%{_libdir}/%{pkgname}/libldaputil.so.* %{_libdir}/%{pkgname}/libldaputil.so.*
%if %{bundle_jemalloc} %if %{bundle_jemalloc}
%{_libdir}/%{pkgname}/lib/libjemalloc.so.* %{_libdir}/%{pkgname}/lib/libjemalloc.so.2
%endif %endif
%if %{use_rust} %if %{use_rust}
%{_libdir}/%{pkgname}/librsds.so %{_libdir}/%{pkgname}/librsds.so