diff --git a/mozilla-nss.changes b/mozilla-nss.changes index f1bdfb4..126193e 100644 --- a/mozilla-nss.changes +++ b/mozilla-nss.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Dec 18 15:59:08 UTC 2011 - adrian@suse.de + +- fix spec file syntax for qemu-workaround + ------------------------------------------------------------------- Mon Nov 14 10:13:17 UTC 2011 - john@redux.org.uk diff --git a/mozilla-nss.spec b/mozilla-nss.spec index 5b4544c..8bc5b60 100644 --- a/mozilla-nss.spec +++ b/mozilla-nss.spec @@ -16,29 +16,31 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %global nss_softokn_fips_version 3.12.4 Name: mozilla-nss -BuildRequires: gcc-c++ mozilla-nspr-devel pkg-config zlib-devel +BuildRequires: gcc-c++ +BuildRequires: mozilla-nspr-devel +BuildRequires: pkg-config +BuildRequires: zlib-devel %if %suse_version == 1030 BuildRequires: sqlite-devel %endif %if %suse_version > 1030 BuildRequires: sqlite3-devel %endif -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Version: 3.13.1 -Release: 2 +Release: 0 # bug437293 %ifarch ppc64 Obsoletes: mozilla-nss-64bit %endif # Summary: Network Security Services -Url: http://www.mozilla.org/projects/security/pki/nss/ +License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Group: System/Libraries +Url: http://www.mozilla.org/projects/security/pki/nss/ # cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot co -r NSS Source: nss-%{version}.tar.bz2 Source1: nss.pc.in @@ -65,9 +67,11 @@ PreReq: libsoftokn3 >= %{nss_softokn_fips_version} Requires: mozilla-nss-certs BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nssdbdir %{_sysconfdir}/pki/nssdb -%ifnarch %sparc && ! 0%{?qemu_user_space_build} +%ifnarch %sparc +%if ! 0%{?qemu_user_space_build} %define run_testsuite 1 %endif +%endif %description Network Security Services (NSS) is a set of libraries designed to @@ -78,7 +82,6 @@ certificates, and other security standards. %package devel -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Summary: Network (Netscape) Security Services development files Group: Development/Libraries/Other Requires: mozilla-nspr-devel @@ -99,7 +102,6 @@ certificates, and other security standards. %package tools -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Summary: Tools for developing, debugging, and managing applications that use NSS Group: System/Management PreReq: mozilla-nss >= %{version} @@ -110,7 +112,6 @@ applications that use NSS. %package sysinit -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Summary: System NSS Initialization Group: System/Management Requires: mozilla-nss >= %{version} @@ -124,7 +125,6 @@ any system or user configured modules. %package -n libfreebl3 -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Summary: Freebl library for the Network Security Services Group: System/Libraries @@ -139,7 +139,6 @@ This package installs the freebl library from NSS. %package -n libsoftokn3 -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Summary: Network Security Services Softoken Module Group: System/Libraries Requires: libfreebl3 = %{version}-%{release} @@ -155,7 +154,6 @@ Network Security Services Softoken Cryptographic Module %package certs -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Summary: CA certificates for NSS Group: Productivity/Networking/Security