diff --git a/slurm.changes b/slurm.changes
index 76c469b..61c71e7 100644
--- a/slurm.changes
+++ b/slurm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jan  8 12:20:27 UTC 2021 - Egbert Eich <eich@suse.com>
+
+- Fix Provides:/Conflicts: for libnss_slurm.
+
 -------------------------------------------------------------------
 Tue Jan  5 08:02:02 UTC 2021 - Ana Guerrero Lopez <aguerrero@suse.com>
 
@@ -106,6 +111,13 @@ Wed Nov 18 08:40:59 UTC 2020 - Ana Guerrero Lopez <aguerrero@suse.com>
 - And many other bugfixes, full log and details available at:
   * https://lists.schedmd.com/pipermail/slurm-announce/2020/000045.html
 
+-------------------------------------------------------------------
+Tue Nov  3 14:31:02 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Replace  '%service_del_postun -n' with '%service_del_postun_without_restart'
+
+  '-n' is deprecated and will be removed in the future.
+
 -------------------------------------------------------------------
 Thu Oct 29 12:35:18 UTC 2020 - Ana Guerrero Lopez <aguerrero@suse.com>
 
diff --git a/slurm.spec b/slurm.spec
index 14cb779..5ea3ae8 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -276,8 +276,8 @@ with SLURM.
 %package -n libnss_%{pname}%{nss_so}%{?upgrade:%{_ver}}
 Summary:        NSS Plugin for SLURM
 Group:          System/Libraries
-%{?upgrade:Provides: libnss%{nss_so} = %{version}}
-%{?upgrade:Conflicts: libnss%{nss_so}}
+%{?upgrade:Provides: libnss_%{pname}%{nss_so} = %{version}}
+%{?upgrade:Conflicts: libnss_%{pname}%{nss_so}}
 
 %description -n libnss_%{pname}%{nss_so}%{?upgrade:%{_ver}}
 libnss_slurm is an optional NSS plugin that permits password and group
@@ -760,7 +760,7 @@ rm -f %{buildroot}/%{_mandir}/man8/slurmrestd.*
 
 %postun
 %if 0%{?with_systemd}
-%service_del_postun -n slurmctld.service
+%service_del_postun_without_restart slurmctld.service
 %else
 %insserv_cleanup
 %endif
@@ -790,7 +790,7 @@ rm -f %{buildroot}/%{_mandir}/man8/slurmrestd.*
 %{fixperm 0600 %{_sysconfdir}/%{pname}/slurmdbd.conf}
 %{fixperm 0600 %{_sysconfdir}/%{pname}/slurmdbd.conf.example}
 %if 0%{?with_systemd}
-%service_del_postun -n slurmdbd.service
+%service_del_postun_without_restart slurmdbd.service
 %else
 %restart_on_update slurmdbd
 %insserv_cleanup
@@ -815,7 +815,7 @@ rm -f %{buildroot}/%{_mandir}/man8/slurmrestd.*
 
 %postun node
 %if 0%{?with_systemd}
-%service_del_postun -n slurmd.service
+%service_del_postun_without_restart slurmd.service
 %else
 %restart_on_update slurmd
 %insserv_cleanup