From 1a18c8c21d9886c8e5ab478441706f140e3a13b2 Mon Sep 17 00:00:00 2001 From: Kai Engert Date: Jan 08 2008 04:59:33 +0000 Subject: - move .so files to /lib --- diff --git a/nspr.spec b/nspr.spec index 0ca36dd..f0943e1 100644 --- a/nspr.spec +++ b/nspr.spec @@ -1,7 +1,7 @@ Summary: Netscape Portable Runtime Name: nspr Version: 4.6.99.2 -Release: 1%{?dist} +Release: 2%{?dist} License: MPLv1.1 or GPLv2+ or LGPLv2+ URL: http://www.mozilla.org/projects/nspr/ Group: System Environment/Libraries @@ -52,7 +52,7 @@ cp %{SOURCE2} ./mozilla/nsprpub/config/ ./mozilla/nsprpub/configure \ --prefix=%{_prefix} \ - --libdir=%{_libdir} \ + --libdir=/%{_lib} \ --includedir=%{_includedir}/nspr4 \ %ifarch x86_64 ppc64 ia64 s390x --enable-64bit \ @@ -77,7 +77,7 @@ NSPR_VERSION=`./config/nspr-config --version` cat ./config/nspr-config-vars > \ $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nspr.pc -cat %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \ +cat %{SOURCE1} | sed -e "s,%%libdir%%,/%{_lib},g" \ -e "s,%%prefix%%,%{_prefix},g" \ -e "s,%%exec_prefix%%,%{_prefix},g" \ -e "s,%%includedir%%,%{_includedir}/nspr4,g" \ @@ -93,9 +93,9 @@ cat %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \ %{__rm} -rf \ $RPM_BUILD_ROOT/%{_bindir}/compile-et.pl \ $RPM_BUILD_ROOT/%{_bindir}/prerr.properties \ - $RPM_BUILD_ROOT/%{_libdir}/libnspr4.a \ - $RPM_BUILD_ROOT/%{_libdir}/libplc4.a \ - $RPM_BUILD_ROOT/%{_libdir}/libplds4.a \ + $RPM_BUILD_ROOT/%{_lib}/libnspr4.a \ + $RPM_BUILD_ROOT/%{_lib}/libplc4.a \ + $RPM_BUILD_ROOT/%{_lib}/libplds4.a \ $RPM_BUILD_ROOT/%{_datadir}/aclocal/nspr.m4 \ $RPM_BUILD_ROOT/%{_includedir}/nspr4/md @@ -110,9 +110,9 @@ cat %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \ %files %defattr(-,root,root) -%{_libdir}/libnspr4.so -%{_libdir}/libplc4.so -%{_libdir}/libplds4.so +/%{_lib}/libnspr4.so +/%{_lib}/libplc4.so +/%{_lib}/libplds4.so %files devel %defattr(-, root, root) @@ -121,6 +121,9 @@ cat %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \ %{_bindir}/nspr-config %changelog +* Mon Jan 07 2008 Kai Engert - 4.6.99-2 +- move .so files to /lib + * Wed Nov 07 2007 Kai Engert - 4.6.99-1 - NSPR 4.7 alpha