fix paths

This commit is contained in:
Tigro 2013-08-13 21:49:58 +04:00
parent 219bc95622
commit 04247d563d

View file

@ -183,12 +183,12 @@ if [ -z "$ADDBUILTIN" ]; then
fi
ADDBUILTIN="$PWD/$ADDBUILTIN"
OLD="$LD_LIBRARY_PATH"
libpath=`%{_bindir}/find mozilla/dist/ -name "Linux*" -type d`
libpath=`%{_bindir}/find ./dist/ -name "Linux*" -type d`
# to use the built libraries instead of requiring nss
# again as buildrequires
export LD_LIBRARY_PATH="$PWD/$libpath/lib"
pushd mozilla/security/nss/lib/ckfw/builtins
pushd nss/lib/ckfw/builtins
# (oe) for reference:
# *ALL* of the root CA certs are hard coded into the libnssckbi.so library.
@ -210,7 +210,7 @@ popd
export LD_LIBRARY_PATH="$OLD"
%install
pushd mozilla/dist/$(uname -s)*
pushd dist/$(uname -s)*
%{__mkdir_p} %{buildroot}%{_bindir}
%{__cp} -aL bin/* %{buildroot}%{_bindir}
@ -260,9 +260,9 @@ cat %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
popd
%if %with lib
export NSS_VMAJOR=`cat mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'`
export NSS_VMINOR=`cat mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'`
export NSS_VPATCH=`cat mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'`
export NSS_VMAJOR=`%{__cat} nss/lib/nss/nss.h | %{__grep} "#define.*NSS_VMAJOR" | %{__awk} '{print $3}'`
export NSS_VMINOR=`%{__cat} nss/lib/nss/nss.h | %{__grep} "#define.*NSS_VMINOR" | %{__awk} '{print $3}'`
export NSS_VPATCH=`echo %{version} | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
%{__mkdir_p} %{buildroot}%{_bindir}
cat %{SOURCE2} | sed -e "s,@libdir@,%{_libdir},g" \
@ -275,7 +275,7 @@ cat %{SOURCE2} | sed -e "s,@libdir@,%{_libdir},g" \
> %{buildroot}/%{_bindir}/nss-config
%endif
pushd mozilla/security/nss/cmd/smimetools
pushd nss/cmd/smimetools
%{__install} -m 0755 smime %{buildroot}%{_bindir}
%{__perl} -pi -e 's|/usr/local/bin|%{_bindir}|g' %{buildroot}%{_bindir}/smime
popd
@ -284,25 +284,25 @@ popd
%{__mkdir_p} docs/SSLsample
%{__mkdir_p} docs/bltest
cp -a mozilla/security/nss/cmd/bltest/tests/* docs/bltest/
cp -a nss/cmd/bltest/tests/* docs/bltest/
chmod -R a+r docs
%{__mkdir_p} docs/certcgi
%{__cp} -a mozilla/security/nss/cmd/certcgi/*.html docs/certcgi/
%{__cp} -a mozilla/security/nss/cmd/certcgi/HOWTO.txt docs/certcgi/
%{__cp} -a nss/cmd/certcgi/*.html docs/certcgi/
%{__cp} -a nss/cmd/certcgi/HOWTO.txt docs/certcgi/
%{__mkdir_p} docs/modutil
%{__cp} -a mozilla/security/nss/cmd/modutil/*.html docs/modutil/
%{__cp} -a nss/cmd/modutil/*.html docs/modutil/
%{__mkdir_p} docs/signtool
%{__cp} -a mozilla/security/nss/cmd/signtool/README docs/signtool/
%{__cp} -a nss/cmd/signtool/README docs/signtool/
%{__mkdir_p} docs/signver
%{__cp} -a mozilla/security/nss/cmd/signver/examples/1/*.pl docs/signver/
%{__cp} -a mozilla/security/nss/cmd/signver/examples/1/*.html docs/signver/
%{__cp} -a nss/cmd/signver/examples/1/*.pl docs/signver/
%{__cp} -a nss/cmd/signver/examples/1/*.html docs/signver/
%{__mkdir_p} docs/ssltap
%{__cp} -a mozilla/security/nss/cmd/ssltap/*.html docs/ssltap/
%{__cp} -a nss/cmd/ssltap/*.html docs/ssltap/
# Install the empty NSS db files
%{__mkdir_p} %{buildroot}%{_sysconfdir}/pki/nssdb