nss-softokn: Make package work on x86_64.

diff --git a/nss-softokn/nss-softokn.nm b/nss-softokn/nss-softokn.nm
index fae15df8b0458f78a5474594b503f3ba9eba1fb8..8cd0d90a6e73b3a598c119824690b8c1246e994e 100644 (file)
--- a/nss-softokn/nss-softokn.nm
+++ b/nss-softokn/nss-softokn.nm
@@ -5,7 +5,7 @@
 
 name       = nss-softokn
 version    = 3.12.8
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = http://www.mozilla.org/projects/security/pki/nss/
@@ -42,13 +42,17 @@ build
        export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
 
        export NSPR_INCLUDE_DIR=/usr/include/nspr4
-       export NSPR_LIB_DIR=/usr/lib
+       export NSPR_LIB_DIR=%{libdir}
 
        export NSS_INCLUDE_DIR=/usr/include/nss3
-       export NSS_LIB_DIR=/usr/lib
+       export NSS_LIB_DIR=%{libdir}
 
        export NSS_USE_SYSTEM_SQLITE=1
 
+       if "%{DISTRO_ARCH}" == "x86_64"
+               export USE_64=1
+       end
+
        build
                make -C ./mozilla/security/coreconf
                make -C ./mozilla/security/dbm
@@ -56,37 +60,38 @@ build
        end
 
        install
-               mkdir -pv %{BUILDROOT}/lib
+               mkdir -pv %{BUILDROOT}/%{lib}
                mkdir -pv %{BUILDROOT}/usr/include/nss3
-               mkdir -pv %{BUILDROOT}/usr/{bin,lib}
-               mkdir -pv %{BUILDROOT}/usr/lib/pkgconfig
-               mkdir -pv %{BUILDROOT}/usr/lib/nss/unsupported-tools
-
-               install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libsoftokn3.so \
-                       %{BUILDROOT}/usr/lib
-               install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libnssdbm3.so \
-                       %{BUILDROOT}/usr/lib
-               install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/lib/libfreebl3.so \
-                       %{BUILDROOT}/lib
-               ln -svf ../../lib/libfreebl3.so %{BUILDROOT}/usr/lib/libfreebl3.so
+               mkdir -pv %{BUILDROOT}/usr/{bin,%{lib}}
+               mkdir -pv %{BUILDROOT}%{libdir}/pkgconfig
+               mkdir -pv %{BUILDROOT}%{libdir}/nss/unsupported-tools
+
+               install -p -v -m 755 mozilla/dist/*.OBJ/lib/libsoftokn3.so \
+                       %{BUILDROOT}%{libdir}
+               install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnssdbm3.so \
+                       %{BUILDROOT}%{libdir}
+               install -p -v -m 755 mozilla/dist/*.OBJ/lib/libfreebl3.so \
+                       %{BUILDROOT}/%{lib}
+               ln -svf ../../%{lib}/libfreebl3.so %{BUILDROOT}%{libdir}/libfreebl3.so
 
                # Copy the binaries we ship as unsupported
-               install -p -v -m 755 %{DIR_APP}/mozilla/dist/*.OBJ/bin/shlibsign %{BUILDROOT}/usr/lib/nss/unsupported-tools
+               install -p -v -m 755 mozilla/dist/*.OBJ/bin/shlibsign \
+                       %{BUILDROOT}%{libdir}/nss/unsupported-tools
 
-               sed -e "s,@libdir@,/usr/lib,g" \
+               sed -e "s,@libdir@,%{libdir},g" \
                        -e "s,@prefix@,/usr,g" \
                        -e "s,@exec_prefix@,/usr,g" \
                        -e "s,@includedir@,/usr/include/nss3,g" \
-                       -e "s,@MOD_MAJOR_VERSION@,$$(grep "#define.*SOFTOKEN_VMAJOR" %{DIR_APP}/mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \
-                       -e "s,@MOD_MINOR_VERSION@,$$(grep "#define.*SOFTOKEN_VMINOR" %{DIR_APP}/mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \
-                       -e "s,@MOD_PATCH_VERSION@,$$(grep "#define.*SOFTOKEN_VPATCH" %{DIR_APP}/mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \
+                       -e "s,@MOD_MAJOR_VERSION@,$$(grep "#define.*SOFTOKEN_VMAJOR" mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \
+                       -e "s,@MOD_MINOR_VERSION@,$$(grep "#define.*SOFTOKEN_VMINOR" mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \
+                       -e "s,@MOD_PATCH_VERSION@,$$(grep "#define.*SOFTOKEN_VPATCH" mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \
                        < %{DIR_SOURCE}/nss-softokn-config.in \
                        > %{BUILDROOT}/usr/bin/nss-softokn-config
                chmod -v 755 %{BUILDROOT}/usr/bin/nss-softokn-config
 
                # XXX need to fix this
                sed \
-                       -e "s,%libdir%,/usr/lib,g" \
+                       -e "s,%libdir%,%{libdir},g" \
                        -e "s,%prefix%,/usr,g" \
                        -e "s,%exec_prefix%,/usr,g" \
                        -e "s,%includedir%,/usr/include/nss3,g" \
@@ -95,11 +100,11 @@ build
                        -e "s,%NSSUTIL_VERSION%,$$(nss-util-config --version),g" \
                        -e "s,%SOFTOKEN_VERSION%,%{version},g" \
                        < %{DIR_SOURCE}/nss-softokn.pc.in \
-                       > %{BUILDROOT}/usr/lib/pkgconfig/nss-softokn.pc
+                       > %{BUILDROOT}%{libdir}/pkgconfig/nss-softokn.pc
 
                # Copy the include files we want
-               cp -vf %{DIR_APP}/mozilla/dist/public/nss/*.h %{BUILDROOT}/usr/include/nss3
-               cp -vf %{DIR_APP}/mozilla/dist/private/nss/blapi.h \
+               cp -vf mozilla/dist/public/nss/*.h %{BUILDROOT}/usr/include/nss3
+               cp -vf mozilla/dist/private/nss/blapi.h \
                        %{BUILDROOT}/usr/include/nss3
                chmod -v 644 %{BUILDROOT}/usr/include/nss3/*.h
        end
@@ -119,8 +124,8 @@ packages
                files
                        /usr/bin/*-config
                        /usr/include
-                       /usr/lib/libfreebl3.so
-                       /usr/lib/pkgconfig
+                       %{libdir}/libfreebl3.so
+                       %{libdir}/pkgconfig
                end
        end