Author: mrl
Date: Thu Feb 8 16:13:31 2007
New Revision: 117966
Removed:
packages/cooker/nss/current/SOURCES/nss-system-nspr.patch
Modified:
packages/cooker/nss/current/SPECS/nss.spec
Log:
- Removed patch nss-system-nspr: prefer doing it via env. variables.
- Tagged as license LGPL too
- Enabled the library.
- Do not use chrpath: it is not needed, and we are using this library now.
- Fixed epoch stuff on library packages.
- Added ldconfig call to library package.
Modified: packages/cooker/nss/current/SPECS/nss.spec
==============================================================================
--- packages/cooker/nss/current/SPECS/nss.spec (original)
+++ packages/cooker/nss/current/SPECS/nss.spec Thu Feb 8 16:13:31 2007
@@ -1,6 +1,6 @@
# FIXME: I would love to enable this but the mozilla-firefox
# FIXME: packagers would have a fit
-%define with_lib 0
+%define with_lib 1
%define major 3
%define libname %mklibname %{name} %{major}
@@ -12,44 +12,39 @@
Epoch: 1
Summary: Netscape Security Services
Group: System/Libraries
-License: MPL/GPL
+License: MPL/GPL/LGPL
URL: http://www.mozilla.org/projects/security/pki/nss/index.html
Source0:
ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{cvsver}_RTM/src/nss-%{version}.tar.gz
Source1: nss.pc
-Patch0: nss-system-nspr.patch
Patch1: nss-fixrandom.patch
Patch2: nss-bug180726.patch
-BuildRequires: chrpath
-BuildRequires: mozilla-firefox-devel
BuildRequires: nspr-devel
-BuildRequires: nspr-static-devel
BuildRequires: zip
BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
-Network Security Services (NSS) is a set of libraries designed to
-support cross-platform development of security-enabled client and server
-applications. Applications built with NSS can support SSL v2 and v3,
-TLS, PKCS #5, PKCS #7, PKCS
-#11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards.
For
-detailed information on standards supported, see
+Network Security Services (NSS) is a set of libraries designed to
+support cross-platform development of security-enabled client and server
+applications. Applications built with NSS can support SSL v2 and v3,
+TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and
+other security standards. For detailed information on standards supported, see
http://www.mozilla.org/projects/security/pki/nss/overview.html.
-Note: This package currently contains the NSS binaries only. The
-libraries have been not been included due to conflicts with the Mozilla
+Note: This package currently contains the NSS binaries only. The
+libraries have been not been included due to conflicts with the Mozilla
libraries.
%if %{with_lib}
%package -n %{libname}
Summary: Network Security Services (NSS)
Group: System/Libraries
-Provides: mozilla-nss = %{version}-%{release}
+Provides: mozilla-nss = %{epoch}:%{version}-%{release}
%description -n %{libname}
-Network Security Services (NSS) is a set of libraries designed to
-support cross-platform development of security-enabled server
-applications. Applications built with NSS can support SSL v2 and v3,
+Network Security Services (NSS) is a set of libraries designed to
+support cross-platform development of security-enabled server
+applications. Applications built with NSS can support SSL v2 and v3,
TLS, PKCS #5, PKCS #7, PKCS #11, PKCS
#12, S/MIME, X.509 v3 certificates, and other security standards. For
detailed information on standards supported, see
@@ -58,10 +53,10 @@
%package -n %{libname}-devel
Summary: Network Security Services (NSS) - development files
Group: Development/C++
-Requires: %{libname} = %{version}-%{release}
+Requires: %{libname} = %{epoch}:%{version}-%{release}
Requires: nspr-devel
-Provides: libnss-devel = %{version}-%{release}
-Provides: nss-devel = %{version}-%{release}
+Provides: libnss-devel = %{epoch}:%{version}-%{release}
+Provides: nss-devel = %{epoch}:%{version}-%{release}
%description -n %{libname}-devel
Header files to doing development with Network Security Services.
@@ -69,10 +64,10 @@
%package -n %{libname}-static-devel
Summary: Network Security Services (NSS) - static libraries
Group: Development/C++
-Requires: %{libname} = %{version}-%{release}
+Requires: %{libname} = %{epoch}:%{version}-%{release}
Requires: nspr-devel = %{version}-%{release}
-Provides: libnss-devel = %{version}-%{release}
-Provides: nss-devel = %{version}-%{release}
+Provides: libnss-devel = %{epoch}:%{version}-%{release}
+Provides: nss-devel = %{epoch}:%{version}-%{release}
%description -n %{libname}-static-devel
Static libraries for doing development with Network Security Services.
@@ -81,13 +76,8 @@
%prep
%setup -q
cd mozilla
-%patch0 -p0
%patch1 -p1
%patch2 -p1
-
-# netscape/mozilla
-find -type f | xargs perl -pi -e "s|\~\/\.netscape|\~\/\.mozilla|g"
-
cd ..
# clean up CVS stuff
@@ -96,29 +86,25 @@
done
%build
-
export BUILD_OPT=1
export OPTIMIZER="%{optflags} -fno-strict-aliasing"
export XCFLAGS="%{optflags} -fno-strict-aliasing"
export LIBDIR=%{_libdir}
export USE_SYSTEM_ZLIB=1
export ZLIB_LIBS="-lz"
+export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+export NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed
's/-I//'`
+export NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`
%ifarch x86_64 ppc64 ia64 s390x
export USE_64=1
%endif
-cd mozilla/security/nss
-%{__make} nss_build_all
-cd ../../..
-
-cd mozilla/security/coreconf/nsinstall
-%{__make}
-cd ../../../..
-
-cd mozilla/security/nss/lib/pki1
-%{__make}
-cd ../../../../..
+# Parallel is broken as by 3.11.4 :(
+%{__make} -C ./mozilla/security/coreconf
+%{__make} -C ./mozilla/security/dbm
+%{__make} -C ./mozilla/security/nss
%install
%{__rm} -rf %{buildroot}
@@ -180,13 +166,16 @@
mkdir -p docs/ssltap
cp mozilla/security/nss/cmd/ssltap/*.html docs/ssltap/
-%{_bindir}/find %{buildroot}/%{_bindir} -type f ! -name smime |
%{_bindir}/xargs -t %{_bindir}/chrpath -d
-
%{_bindir}/find docs -type f | %{_bindir}/xargs -t %{__perl} -pi -e 's/\r$//g'
%clean
%{__rm} -rf %{buildroot}
+%if %{with_lib}
+%post -n %{libname} -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
+%endif
+
%files
%defattr(0644,root,root,0755)
%doc docs/*
