diff --git a/mozilla-nss.changes b/mozilla-nss.changes index 48c5305..1d43c35 100644 --- a/mozilla-nss.changes +++ b/mozilla-nss.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 28 16:29:26 UTC 2023 - Dirk Stoecker + +- Fix file conflict for pp manual page [bsc#1213281] + ------------------------------------------------------------------- Tue Jul 4 08:20:31 UTC 2023 - Wolfgang Rosenauer @@ -3724,4 +3729,3 @@ Sat Mar 19 13:36:51 CET 2005 - stark@suse.de Tue Mar 8 09:16:59 CET 2005 - stark@suse.de - initial standalone package - diff --git a/mozilla-nss.spec b/mozilla-nss.spec index af9b806..f52d433 100644 --- a/mozilla-nss.spec +++ b/mozilla-nss.spec @@ -359,6 +359,9 @@ cp -L bin/certutil \ # copy man-pages mkdir -p %{buildroot}%{_mandir}/man1/ cp -L %{_builddir}/nss-%{version}/nss/doc/nroff/* %{buildroot}%{_mandir}/man1/ +# Fix conflict with perl-PAR-Packer which has a pp-exe in _bindir +mkdir -p %{buildroot}%{_mandir}/man7/ +mv %{buildroot}%{_mandir}/man1/pp.1 %{buildroot}%{_mandir}/man7/pp.7 # copy unsupported tools cp -L bin/atob \ bin/btoa \ @@ -459,7 +462,6 @@ fi %{_libdir}/libnssutil3.so %{_libdir}/libsmime3.so %{_libdir}/libssl3.so -#%%{_libdir}/libnsssqlite3.so %files devel %defattr(644, root, root, 755)