From d419eb78bd3a2a3b186ecf9cce9725fa1d9ea6ca Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 24 Apr 2015 14:48:58 +0200 Subject: [PATCH] Fix libwbclient alternatives link. resolves: #1214973 --- samba.spec | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/samba.spec b/samba.spec index c544440..d2a4fda 100644 --- a/samba.spec +++ b/samba.spec @@ -6,7 +6,7 @@ # ctdb is enabled by default, you can disable it with: --without clustering %bcond_without clustering -%define main_release 2 +%define main_release 3 %define samba_version 4.2.1 %define talloc_version 2.1.2 @@ -46,6 +46,7 @@ %endif %endif +%global libwbc_alternatives_version 0.12 %global libwbc_alternatives_suffix %nil %if 0%{?__isa_bits} == 64 %global libwbc_alternatives_suffix -64 @@ -750,6 +751,11 @@ install -d -m 0755 %{buildroot}/%{_libdir}/pkgconfig # because samba uses rpath with this directory. install -d -m 0755 %{buildroot}/%{_libdir}/samba/wbclient mv %{buildroot}/%{_libdir}/libwbclient.so* %{buildroot}/%{_libdir}/samba/wbclient +if [ ! -f %{buildroot}/%{_libdir}/samba/wbclient/libwbclient.so.%{libwbc_alternatives_version} ] +then + echo "Expected libwbclient version not found, please check if version has changed." + exit -1 +fi # Install other stuff install -d -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d @@ -863,12 +869,12 @@ fi %posttrans -n libwbclient # It has to be posttrans here to make sure all files of a previous version # without alternatives support are removed -%{_sbindir}/update-alternatives --install %{_libdir}/libwbclient.so.0.11 \ - libwbclient.so.0.11%{libwbc_alternatives_suffix} %{_libdir}/samba/wbclient/libwbclient.so.0.11 10 +%{_sbindir}/update-alternatives --install %{_libdir}/libwbclient.so.%{libwbc_alternatives_version} \ + libwbclient.so.%{libwbc_alternatives_version}%{libwbc_alternatives_suffix} %{_libdir}/samba/wbclient/libwbclient.so.%{libwbc_alternatives_version} 10 /sbin/ldconfig %preun -n libwbclient -%{_sbindir}/update-alternatives --remove libwbclient.so.0.11%{libwbc_alternatives_suffix} %{_libdir}/samba/wbclient/libwbclient.so.0.11 +%{_sbindir}/update-alternatives --remove libwbclient.so.%{libwbc_alternatives_version}%{libwbc_alternatives_suffix} %{_libdir}/samba/wbclient/libwbclient.so.%{libwbc_alternatives_version} /sbin/ldconfig %posttrans -n libwbclient-devel @@ -881,7 +887,7 @@ fi # When downgrading to a version where alternatives is not used and # libwbclient.so is a link and not a file it will be removed. The following # check removes the alternatives files manually if that is the case. -if [ "`readlink %{_libdir}/libwbclient.so`" == "libwbclient.so.0.11" ]; then +if [ "`readlink %{_libdir}/libwbclient.so`" == "libwbclient.so.%{libwbc_alternatives_version}" ]; then /bin/rm -f /etc/alternatives/libwbclient.so%{libwbc_alternatives_suffix} /var/lib/alternatives/libwbclient.so%{libwbc_alternatives_suffix} 2> /dev/null else %{_sbindir}/update-alternatives --remove libwbclient.so%{libwbc_alternatives_suffix} %{_libdir}/samba/wbclient/libwbclient.so @@ -1924,6 +1930,9 @@ rm -rf %{buildroot} %endif # with_clustering_support %changelog +* Fri Apr 24 2015 Andreas Schneider - 4.2.1-3 +- resolves: #1214973 - Fix libwbclient alternatives link. + * Wed Apr 22 2015 Guenther Deschner - 4.2.1-2 - Add vfs snapper module.