From 694386f5193d70e24809462c167c36d1c6590d68affa77cd99e4949d532396ed Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 30 Nov 2020 10:24:31 +0000 Subject: [PATCH] Accepting request 849662 from home:lnussel:usrmove - install libraries in %{_libdir} (boo#1029961) OBS-URL: https://build.opensuse.org/request/show/849662 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=344 --- mozilla-nss.changes | 5 +++++ mozilla-nss.spec | 19 +++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/mozilla-nss.changes b/mozilla-nss.changes index 047b38c..2fdfc51 100644 --- a/mozilla-nss.changes +++ b/mozilla-nss.changes @@ -16,6 +16,11 @@ Sun Nov 15 08:17:37 UTC 2020 - Wolfgang Rosenauer * bmo#1665715 - Pass the embedded SCT list extension (if present) to TrustDomain::CheckRevocation instead of the notBefore value. +------------------------------------------------------------------- +Thu Nov 12 09:00:33 UTC 2020 - Ludwig Nussel + +- install libraries in %{_libdir} (boo#1029961) + ------------------------------------------------------------------- Mon Oct 12 15:31:33 UTC 2020 - Dominique Leuenberger diff --git a/mozilla-nss.spec b/mozilla-nss.spec index 3c5d181..e8e7c4d 100644 --- a/mozilla-nss.spec +++ b/mozilla-nss.spec @@ -287,7 +287,6 @@ mkdir -p %{buildroot}%{_libexecdir}/nss mkdir -p %{buildroot}%{_includedir}/nss3 mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_sbindir} -mkdir -p %{buildroot}/%{_lib} mkdir -p %{buildroot}%{nssdbdir} pushd ../dist/Linux* # copy headers @@ -313,7 +312,7 @@ cp -L lib/libfreebl3.so \ lib/libfreebl3.chk \ lib/libfreeblpriv3.so \ lib/libfreeblpriv3.chk \ - %{buildroot}/%{_lib} + %{buildroot}/%{_libdir} #cp -L lib/libnsssqlite3.so \ # %{buildroot}%{_libdir} # copy static libs @@ -387,10 +386,10 @@ install -m 644 %{SOURCE9} %{buildroot}%{nssdbdir} %{?__debug_package:%{__debug_install_post}} \ %{__arch_install_post} \ %__os_install_post \ - LD_LIBRARY_PATH=%{buildroot}/%{_lib}:%{buildroot}%{_libdir} %{buildroot}%{_libexecdir}/nss/shlibsign -i %{buildroot}%{_libdir}/libsoftokn3.so \ - LD_LIBRARY_PATH=%{buildroot}/%{_lib}:%{buildroot}%{_libdir} %{buildroot}%{_libexecdir}/nss/shlibsign -i %{buildroot}%{_libdir}/libnssdbm3.so \ - LD_LIBRARY_PATH=%{buildroot}/%{_lib}:%{buildroot}%{_libdir} %{buildroot}%{_libexecdir}/nss/shlibsign -i %{buildroot}/%{_lib}/libfreebl3.so \ - LD_LIBRARY_PATH=%{buildroot}/%{_lib}:%{buildroot}%{_libdir} %{buildroot}%{_libexecdir}/nss/shlibsign -i %{buildroot}/%{_lib}/libfreeblpriv3.so \ + LD_LIBRARY_PATH=:%{buildroot}%{_libdir} %{buildroot}%{_libexecdir}/nss/shlibsign -i %{buildroot}%{_libdir}/libsoftokn3.so \ + LD_LIBRARY_PATH=:%{buildroot}%{_libdir} %{buildroot}%{_libexecdir}/nss/shlibsign -i %{buildroot}%{_libdir}/libnssdbm3.so \ + LD_LIBRARY_PATH=:%{buildroot}%{_libdir} %{buildroot}%{_libexecdir}/nss/shlibsign -i %{buildroot}/%{_libdir}/libfreebl3.so \ + LD_LIBRARY_PATH=:%{buildroot}%{_libdir} %{buildroot}%{_libexecdir}/nss/shlibsign -i %{buildroot}/%{_libdir}/libfreeblpriv3.so \ %{nil} %post -p /sbin/ldconfig @@ -439,12 +438,12 @@ fi %{_sbindir}/setup-nsssysinit.sh %files -n libfreebl3 -/%{_lib}/libfreebl3.so -/%{_lib}/libfreeblpriv3.so +%{_libdir}/libfreebl3.so +%{_libdir}/libfreeblpriv3.so %files -n libfreebl3-hmac -/%{_lib}/libfreebl3.chk -/%{_lib}/libfreeblpriv3.chk +%{_libdir}/libfreebl3.chk +%{_libdir}/libfreeblpriv3.chk %files -n libsoftokn3 %{_libdir}/libsoftokn3.so