rpms/nss-softokn/devel nss-softokn.spec,1.22,1.23
Elio Maldonado
emaldonado at fedoraproject.org
Tue Sep 8 18:10:38 UTC 2009
Author: emaldonado
Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15376
Modified Files:
nss-softokn.spec
Log Message:
Installing shared libraries to %{_libdir}
Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- nss-softokn.spec 6 Sep 2009 17:38:59 -0000 1.22
+++ nss-softokn.spec 8 Sep 2009 18:10:38 -0000 1.23
@@ -9,15 +9,15 @@
%{?__debug_package:%{__debug_install_post}} \
%{__arch_install_post} \
%{__os_install_post} \
- $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
- $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
- $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libnssdbm3.so \
+ $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libsoftokn3.so \
+ $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.so \
+ $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libnssdbm3.so \
%{nil}
Summary: Network Security Services Soktoken Module
Name: nss-softokn
Version: 3.12.4
-Release: 4%{?dist}
+Release: 5%{?dist}
License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -183,14 +183,14 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-s
%{__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
%{__mkdir_p} $RPM_BUILD_ROOT/%{saved_files_dir}
for file in libsoftokn3.so libfreebl3.so libnssdbm3.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 our prelink configuration file
@@ -245,10 +245,10 @@ done
%files
%defattr(-,root,root)
-/%{_lib}/libnssdbm3.so
-/%{_lib}/libnssdbm3.chk
-/%{_lib}/libsoftokn3.so
-/%{_lib}/libsoftokn3.chk
+%{_libdir}/libnssdbm3.so
+%{_libdir}/libnssdbm3.chk
+%{_libdir}/libsoftokn3.so
+%{_libdir}/libsoftokn3.chk
# shared with nss-tools
%dir %{_libdir}/nss
%dir %{saved_files_dir}
@@ -262,8 +262,8 @@ done
%files freebl
%defattr(-,root,root)
-/%{_lib}/libfreebl3.so
-/%{_lib}/libfreebl3.chk
+%{_libdir}/libfreebl3.so
+%{_libdir}/libfreebl3.chk
%files devel
%defattr(-,root,root)
@@ -290,6 +290,9 @@ done
%{_includedir}/nss3/shsign.h
%changelog
+* Tue Sep 08 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-5
+- Installing shared libraries to %%{_libdir}
+
* Sun Sep 06 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-4
- Postuninstall scriptlet finishes quietly
More information about the fedora-extras-commits
mailing list