Accepting request 1101251 from home:dstoecker:branches:mozilla:Factory

- Fix file conflict for pp manual page [bsc#1213281]

OBS-URL: https://build.opensuse.org/request/show/1101251
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=420
This commit is contained in:
Wolfgang Rosenauer 2023-07-29 07:24:59 +00:00 committed by Git OBS Bridge
parent 846be6085c
commit 34e601a718
2 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jul 28 16:29:26 UTC 2023 - Dirk Stoecker <opensuse@dstoecker.de>
- Fix file conflict for pp manual page [bsc#1213281]
-------------------------------------------------------------------
Tue Jul 4 08:20:31 UTC 2023 - Wolfgang Rosenauer <wr@rosenauer.org>
@ -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

View File

@ -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)