Aarch64 build fix

[platform/upstream/nss.git] / packaging / nss.spec

diff --git a/packaging/nss.spec b/packaging/nss.spec
index 24ca9fe..1f0ec9d 100644 (file)
--- a/packaging/nss.spec
+++ b/packaging/nss.spec
@@ -6,7 +6,7 @@ BuildRequires:  nspr-devel
 BuildRequires:  pkg-config
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(sqlite3)
-Version:        3.13.6
+Version:        3.15.4
 Release:        0
 Summary:        Network Security Services
 License:        MPL-1.1 or GPL-2.0+ or LGPL-2.1+
@@ -22,6 +22,7 @@ Source6:        setup-nsssysinit.sh
 Source7:        cert9.db
 Source8:        key4.db
 Source9:        pkcs11.txt
+Source1001:    nss.manifest
 %define nspr_ver %(rpm -q --queryformat '%{VERSION}' nspr)
 Requires(pre):  nspr >= %nspr_ver
 Requires(pre):  libfreebl3 >= %{nss_softokn_fips_version}
@@ -79,7 +80,7 @@ any system or user configured modules.
 
 %package -n libfreebl3
 Summary:        Freebl library for the Network Security Services
-Group:          System/Libraries
+Group:          Security/Crypto Libraries
 
 %description -n libfreebl3
 Network Security Services (NSS) is a set of libraries designed to
@@ -93,7 +94,7 @@ This package installs the freebl library from NSS.
 
 %package -n libsoftokn3
 Summary:        Network Security Services Softoken Module
-Group:          System/Libraries
+Group:          Security/Network
 Requires:       libfreebl3 = %{version}-%{release}
 
 %description -n libsoftokn3
@@ -108,7 +109,7 @@ Network Security Services Softoken Cryptographic Module
 
 %package certs
 Summary:        CA certificates for NSS
-Group:          Security/Crypto Libraries
+Group:          Security/Certificate Management
 
 %description certs
 This package contains the integrated CA root certificates from the
@@ -117,7 +118,7 @@ Mozilla project.
 
 %prep
 %setup -n nss-%{version} -q
-cd mozilla
+cp %{SOURCE1001} .
 
 %build
 #modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
@@ -125,13 +126,13 @@ cd mozilla
 #TIME="\"$(date -d "${modified}" "+%%R")\""
 #find . -name '*.[ch]' -print -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} +
 
-cd mozilla/security/nss
+cd nss
 export FREEBL_NO_DEPEND=1
 export NSPR_INCLUDE_DIR=`nspr-config --includedir`
 export NSPR_LIB_DIR=`nspr-config --libdir`
 export OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 export LIBDIR=%{_libdir}
-%ifarch x86_64
+%ifarch x86_64 aarch64
 export USE_64=1
 %endif
 export NSS_USE_SYSTEM_SQLITE=1
@@ -159,7 +160,7 @@ mkdir -p $RPM_BUILD_ROOT%{_includedir}/nss3
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{nssdbdir}
-pushd mozilla/dist/Linux*
+pushd dist/Linux*
 # copy headers
 cp -rL ../public/nss/*.h $RPM_BUILD_ROOT%{_includedir}/nss3
 # copy dynamic libs
@@ -214,9 +215,9 @@ s:%%NSPR_VERSION%%:%{nspr_ver}:g" \
   %{SOURCE1} > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/nss.pc
 # prepare nss-config file
 popd
-NSS_VMAJOR=`cat mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'`
-NSS_VMINOR=`cat mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'`
-NSS_VPATCH=`cat mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'`
+NSS_VMAJOR=`cat nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'`
+NSS_VMINOR=`cat nss/lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'`
+NSS_VPATCH=`cat nss/lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'`
 cat %{SOURCE3} | sed -e "s,@libdir@,%{_libdir},g" \
                      -e "s,@prefix@,%{_prefix},g" \
                      -e "s,@exec_prefix@,%{_prefix},g" \
@@ -279,6 +280,7 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %files
+%manifest %{name}.manifest
 %defattr(-, root, root)
 %{_libdir}/libnss3.so
 %{_libdir}/libnssutil3.so
@@ -286,6 +288,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libssl3.so
 
 %files devel
+%manifest %{name}.manifest
 %defattr(644, root, root, 755)
 %{_includedir}/nss3/
 %{_libdir}/*.a
@@ -293,6 +296,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/nss-config
 
 %files tools
+%manifest %{name}.manifest
 %defattr(-, root, root)
 %{_bindir}/*
 %exclude %{_sbindir}/setup-nsssysinit.sh
@@ -300,6 +304,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_bindir}/nss-config
 
 %files sysinit
+%manifest %{name}.manifest
 %defattr(-, root, root)
 %dir %{_sysconfdir}/pki
 %dir %{_sysconfdir}/pki/nssdb
@@ -308,11 +313,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/setup-nsssysinit.sh
 
 %files -n libfreebl3
+%manifest %{name}.manifest
 %defattr(-, root, root)
 %{_libdir}/libfreebl3.so
 %{_libdir}/libfreebl3.chk
 
 %files -n libsoftokn3
+%manifest %{name}.manifest
 %defattr(-, root, root)
 %{_libdir}/libsoftokn3.so
 %{_libdir}/libsoftokn3.chk
@@ -320,6 +327,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libnssdbm3.chk
 
 %files certs
+%manifest %{name}.manifest
 %defattr(-, root, root)
 %{_libdir}/libnssckbi.so