From c7deab353c451b89ec1b4015fd5aa63c8e76f33d Mon Sep 17 00:00:00 2001 From: Elio Maldonado Date: Tue, 8 Sep 2009 18:32:10 +0000 Subject: [PATCH] Installing shared libraries to %{_libdir} --- nss.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/nss.spec b/nss.spec index 14b8c0d..35b5397 100644 --- a/nss.spec +++ b/nss.spec @@ -6,7 +6,7 @@ Summary: Network Security Services Name: nss Version: 3.12.4 -Release: 5%{?dist} +Release: 6%{?dist} License: MPLv1.1 or GPLv2+ or LGPLv2+ URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -223,14 +223,14 @@ echo "test suite completed" %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3 %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir} -%{__mkdir_p} $RPM_BUILD_ROOT/%{_lib} +%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir} %{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory} %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig # Copy the binary libraries we want for file in libnss3.so libssl3.so libsmime3.so libnssckbi.so libnsspem.so do - %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib} + %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir} done # Install the empty NSS db files @@ -319,11 +319,11 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h %files %defattr(-,root,root) -/%{_lib}/libnss3.so -/%{_lib}/libssl3.so -/%{_lib}/libsmime3.so -/%{_lib}/libnssckbi.so -/%{_lib}/libnsspem.so +%{_libdir}/libnss3.so +%{_libdir}/libssl3.so +%{_libdir}/libsmime3.so +%{_libdir}/libnssckbi.so +%{_libdir}/libnsspem.so %dir %{_sysconfdir}/pki/nssdb %config(noreplace) %{_sysconfdir}/pki/nssdb/cert8.db %config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db @@ -422,6 +422,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h %changelog +* Tue Sep 08 2009 Elio Maldonado - 3.12.4-6 +- Installing shared libraries to %%{_libdir} + * Mon Sep 07 2009 Elio Maldonado - 3.12.4-5 - Retagging to pick up new sources