Accepting request 96964 from openSUSE:Factory:ARM

fix qemu workaround

OBS-URL: https://build.opensuse.org/request/show/96964
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=93
This commit is contained in:
Wolfgang Rosenauer 2011-12-18 17:50:41 +00:00 committed by Git OBS Bridge
parent 747b30ac4b
commit f962eacea8
2 changed files with 15 additions and 12 deletions

View File

@ -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 Mon Nov 14 10:13:17 UTC 2011 - john@redux.org.uk

View File

@ -16,29 +16,31 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
%global nss_softokn_fips_version 3.12.4 %global nss_softokn_fips_version 3.12.4
Name: mozilla-nss 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 %if %suse_version == 1030
BuildRequires: sqlite-devel BuildRequires: sqlite-devel
%endif %endif
%if %suse_version > 1030 %if %suse_version > 1030
BuildRequires: sqlite3-devel BuildRequires: sqlite3-devel
%endif %endif
License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+
Version: 3.13.1 Version: 3.13.1
Release: 2 Release: 0
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
Obsoletes: mozilla-nss-64bit Obsoletes: mozilla-nss-64bit
%endif %endif
# #
Summary: Network Security Services 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 Group: System/Libraries
Url: http://www.mozilla.org/projects/security/pki/nss/
# cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot co -r <RTM_TAG> NSS # cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot co -r <RTM_TAG> NSS
Source: nss-%{version}.tar.bz2 Source: nss-%{version}.tar.bz2
Source1: nss.pc.in Source1: nss.pc.in
@ -65,9 +67,11 @@ PreReq: libsoftokn3 >= %{nss_softokn_fips_version}
Requires: mozilla-nss-certs Requires: mozilla-nss-certs
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define nssdbdir %{_sysconfdir}/pki/nssdb %define nssdbdir %{_sysconfdir}/pki/nssdb
%ifnarch %sparc && ! 0%{?qemu_user_space_build} %ifnarch %sparc
%if ! 0%{?qemu_user_space_build}
%define run_testsuite 1 %define run_testsuite 1
%endif %endif
%endif
%description %description
Network Security Services (NSS) is a set of libraries designed to Network Security Services (NSS) is a set of libraries designed to
@ -78,7 +82,6 @@ certificates, and other security standards.
%package devel %package devel
License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+
Summary: Network (Netscape) Security Services development files Summary: Network (Netscape) Security Services development files
Group: Development/Libraries/Other Group: Development/Libraries/Other
Requires: mozilla-nspr-devel Requires: mozilla-nspr-devel
@ -99,7 +102,6 @@ certificates, and other security standards.
%package tools %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 Summary: Tools for developing, debugging, and managing applications that use NSS
Group: System/Management Group: System/Management
PreReq: mozilla-nss >= %{version} PreReq: mozilla-nss >= %{version}
@ -110,7 +112,6 @@ applications that use NSS.
%package sysinit %package sysinit
License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+
Summary: System NSS Initialization Summary: System NSS Initialization
Group: System/Management Group: System/Management
Requires: mozilla-nss >= %{version} Requires: mozilla-nss >= %{version}
@ -124,7 +125,6 @@ any system or user configured modules.
%package -n libfreebl3 %package -n libfreebl3
License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+
Summary: Freebl library for the Network Security Services Summary: Freebl library for the Network Security Services
Group: System/Libraries Group: System/Libraries
@ -139,7 +139,6 @@ This package installs the freebl library from NSS.
%package -n libsoftokn3 %package -n libsoftokn3
License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+
Summary: Network Security Services Softoken Module Summary: Network Security Services Softoken Module
Group: System/Libraries Group: System/Libraries
Requires: libfreebl3 = %{version}-%{release} Requires: libfreebl3 = %{version}-%{release}
@ -155,7 +154,6 @@ Network Security Services Softoken Cryptographic Module
%package certs %package certs
License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+
Summary: CA certificates for NSS Summary: CA certificates for NSS
Group: Productivity/Networking/Security Group: Productivity/Networking/Security