diff --git a/auto-krokodil.spec b/auto-krokodil.spec index 1aa569c..0b0ea38 100644 --- a/auto-krokodil.spec +++ b/auto-krokodil.spec @@ -3,7 +3,7 @@ Name: auto-krokodil Group: System/Kernel and hardware License: GPLv3 Url: https://abf.io/import/auto-krokodil -Version: 0.12 +Version: 0.13 Release: 1 BuildArch: noarch %ifarch %{ix86} %{x86_64} diff --git a/macros.krokodil b/macros.krokodil index 72cd527..35567aa 100644 --- a/macros.krokodil +++ b/macros.krokodil @@ -52,9 +52,8 @@ Requires: kernel-abi(%{-p*}) \ # modules dependencies must be installed when depmod is run \ Requires(post): kernel-abi(%{-p*}) \ Requires(post): update-alternatives \ -Requires(post): %{_sbindir}/depmod \ Requires(postun): update-alternatives \ -Requires(postun): %{_sbindir}/depmod \ +Requires(posttrans): %{_sbindir}/depmod \ %description -n %{pkg} \ Binary modules of Nvidia %{-j*}.%{-n*} for kernel-%{-k*}-%{-f*} \ Built from %{-s*} \ @@ -68,11 +67,13 @@ update-alternatives --install \\ /lib/modules/%{-p*}/kernel/drivers/video/nvidia%{-j*} \\ kmods-nvidia%{-j*} \\ %{kroko_kmods_dir}/nvidia%{-j*}.%{-r*}-%{-p*} \\ - %(echo %{-r*} | awk -F '.' '{print $1}') -%{_sbindir}/depmod -a %{-p*} \ + %(echo %{-r*} | awk -F '.' '{print $1}') \ %postun -n %{pkg} \ -[ $1 = 0 ] || exit 0 \ -update-alternatives --remove kmods-nvidia%{-j*} %{kroko_kmods_dir}/nvidia%{-j*}.%{-r*}-%{-p*} \ +# updated version of pkg always has another -r \ +update-alternatives --remove \\ + kmods-nvidia%{-j*} \\ + %{kroko_kmods_dir}/nvidia%{-j*}.%{-r*}-%{-p*} \ +%posttrans -n %{pkg} \ if [ -d /lib/modules/%{-p*} ]; then %{_sbindir}/depmod -a %{-p*} || : ; fi }