mirror of
https://abf.rosa.ru/djam/nss.git
synced 2025-02-23 16:32:48 +00:00
merge cooker specfile
This commit is contained in:
Dmitry Mikhirev
commit
84bbad091b
2 changed files with 103 additions and 58 deletions
1
.abf.yml
1
.abf.yml
|
|
@ -1,2 +1,3 @@
|
|||
sources:
|
||||
"nss-3.13.3.tar.gz": 6b8b92d3de893ae67dc04ce9a14ab5c9495dd4a6
|
||||
"nss-3.13.5.tar.gz": 22cfe2cbccc93189699e6eed283eca288b45f6cb
|
||||
|
|
|
|||
160
nss.spec
160
nss.spec
|
|
@ -1,14 +1,3 @@
|
|||
%bcond_without lib
|
||||
|
||||
%define major 3
|
||||
%define libname %mklibname %{name} %{major}
|
||||
%define develname %mklibname -d %{name}
|
||||
%define sdevelname %mklibname -d -s %{name}
|
||||
%define cvsver 3_13
|
||||
|
||||
%define nspr_libname %mklibname nspr 4
|
||||
%define nspr_version 4.9
|
||||
|
||||
%if %mandriva_branch == Cooker
|
||||
# Cooker
|
||||
%define release %mkrel 2
|
||||
|
|
@ -17,6 +6,18 @@
|
|||
%define release %mkrel 1
|
||||
%endif
|
||||
|
||||
%bcond_without lib
|
||||
|
||||
%define major 3
|
||||
%define libname %mklibname %{name} %{major}
|
||||
%define libfreebl %mklibname freebl %{major}
|
||||
%define develname %mklibname -d %{name}
|
||||
%define sdevelname %mklibname -d -s %{name}
|
||||
%define cvsver 3_13
|
||||
|
||||
%define nspr_libname %mklibname nspr 4
|
||||
%define nspr_version 4.9.0
|
||||
|
||||
# this seems fragile, so require the exact version or later (#58754)
|
||||
%define sqlite3_version %(pkg-config --modversion sqlite3 &>/dev/null && pkg-config --modversion sqlite3 2>/dev/null || echo 0)
|
||||
%define nspr_version %(pkg-config --modversion nspr &>/dev/null && pkg-config --modversion nspr 2>/dev/null || echo 0)
|
||||
|
|
@ -26,12 +27,12 @@
|
|||
%{?_without_empty: %{expand: %%global build_empty 0}}
|
||||
|
||||
Name: nss
|
||||
Version: 3.13.3
|
||||
Release: %{release}
|
||||
Epoch: 2
|
||||
Version: 3.13.5
|
||||
Release: %{release}
|
||||
Summary: Netscape Security Services
|
||||
Group: System/Libraries
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
License: MPL or GPLv2+ or LGPLv2+
|
||||
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.in
|
||||
|
|
@ -53,11 +54,10 @@ Patch1: nss-fixrandom.patch
|
|||
Patch3: nss-3.12.7-format_not_a_string_literal_and_no_format_arguments.patch
|
||||
Patch4: renegotiate-transitional.patch
|
||||
BuildRequires: rootcerts >= 1:20120218.00
|
||||
BuildRequires: libnspr-devel >= 2:4.9.0
|
||||
BuildRequires: libz-devel
|
||||
BuildRequires: libsqlite3-devel >= 3.7.7.1
|
||||
BuildRequires: nspr-devel >= 2:4.9.0
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: sqlite3-devel >= 3.7.7.1
|
||||
BuildRequires: zip
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
|
||||
%description
|
||||
Network Security Services (NSS) is a set of libraries designed to
|
||||
|
|
@ -73,34 +73,40 @@ libraries have been not been included due to conflicts with the Mozilla
|
|||
libraries.
|
||||
%endif
|
||||
|
||||
%package shlibsign
|
||||
Summary: Netscape Security Services - shlibsign
|
||||
Group: System/Libraries
|
||||
Conflicts: %{name} < 2:3.13.1-2
|
||||
|
||||
%description shlibsign
|
||||
This package contains the binary shlibsign needed by libfreebl3 and libsoftokn3.
|
||||
|
||||
%if %with lib
|
||||
%package -n %{libname}
|
||||
Summary: Network Security Services (NSS)
|
||||
Group: System/Libraries
|
||||
Provides: mozilla-nss = %{epoch}:%{version}-%{release}
|
||||
Requires(post): nss
|
||||
Requires(post): rpm-helper
|
||||
Requires: %{mklibname sqlite3_ 0} >= %{sqlite3_version}
|
||||
Requires: %{nspr_libname} >= 2:%{nspr_version}
|
||||
|
||||
%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,
|
||||
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.
|
||||
This package contains the shared libraries libnss3, libnssckbi, libnssdbm3,
|
||||
libnssutil3, libsmime3, and libssl3.
|
||||
|
||||
%package -n %{libfreebl}
|
||||
Summary: Network Security Services (NSS)
|
||||
Group: System/Libraries
|
||||
Requires(post): nss-shlibsign
|
||||
Requires(post): rpm-helper
|
||||
Conflicts: %{_lib}nss3 < 2:3.13.1-5
|
||||
|
||||
%description -n %{libfreebl}
|
||||
This package contains the shared libraries libfreebl3 and libsoftokn3.
|
||||
|
||||
%package -n %{develname}
|
||||
Summary: Network Security Services (NSS) - development files
|
||||
Group: Development/C++
|
||||
Requires: %{libname} >= %{epoch}:%{version}-%{release}
|
||||
Requires: libnspr-devel
|
||||
Provides: libnss-devel = %{epoch}:%{version}-%{release}
|
||||
Requires: %{libfreebl} >= %{epoch}:%{version}-%{release}
|
||||
Provides: nss-devel = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: %{libname}-devel
|
||||
Conflicts: %{libname} < 2:3.12-8
|
||||
%rename %{libname}-devel
|
||||
|
||||
%description -n %{develname}
|
||||
Header files to doing development with Network Security Services.
|
||||
|
|
@ -110,11 +116,9 @@ Summary: Network Security Services (NSS) - static libraries
|
|||
Group: Development/C++
|
||||
Requires: %{libname} >= %{epoch}:%{version}-%{release}
|
||||
Requires: %{develname} >= %{epoch}:%{version}-%{release}
|
||||
Requires: libnspr-devel
|
||||
Provides: libnss-static-devel = %{epoch}:%{version}-%{release}
|
||||
Provides: nss-static-devel = %{epoch}:%{version}-%{release}
|
||||
Conflicts: libopenssl-static-devel
|
||||
Obsoletes: %{libname}-static-devel
|
||||
%rename %{libname}-static-devel
|
||||
|
||||
%description -n %{sdevelname}
|
||||
Static libraries for doing development with Network Security Services.
|
||||
|
|
@ -131,6 +135,8 @@ Static libraries for doing development with Network Security Services.
|
|||
find . -type d -perm 0700 -exec chmod 755 {} \;
|
||||
find . -type f -perm 0555 -exec chmod 755 {} \;
|
||||
find . -type f -perm 0444 -exec chmod 644 {} \;
|
||||
find . -name '*.h' -executable -exec chmod -x {} \;
|
||||
find . -name '*.c' -executable -exec chmod -x {} \;
|
||||
|
||||
%build
|
||||
%setup_compile_flags
|
||||
|
|
@ -187,7 +193,7 @@ if [ -z "$ADDBUILTIN" ]; then
|
|||
fi
|
||||
ADDBUILTIN="$PWD/$ADDBUILTIN"
|
||||
OLD="$LD_LIBRARY_PATH"
|
||||
libpath=`%{_bindir}/find mozilla/dist/ -name "Linux2.*" -type d`
|
||||
libpath=`%{_bindir}/find mozilla/dist/ -name "Linux*" -type d`
|
||||
# to use the built libraries instead of requiring nss
|
||||
# again as buildrequires
|
||||
export LD_LIBRARY_PATH="$PWD/$libpath/lib"
|
||||
|
|
@ -291,7 +297,7 @@ popd
|
|||
#%{__cp} -a mozilla/security/nss/cmd/SSLsample/README docs/SSLsample/
|
||||
|
||||
%{__mkdir_p} docs/bltest
|
||||
%{__cp} -a mozilla/security/nss/cmd/bltest/tests/* docs/bltest/
|
||||
cp -a mozilla/security/nss/cmd/bltest/tests/* docs/bltest/
|
||||
|
||||
%{__mkdir_p} docs/certcgi
|
||||
%{__cp} -a mozilla/security/nss/cmd/certcgi/*.html docs/certcgi/
|
||||
|
|
@ -326,7 +332,7 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so
|
|||
%multiarch_binaries %{buildroot}%{_bindir}/nss-config
|
||||
|
||||
%if %with lib
|
||||
%post -n %{libname}
|
||||
%posttrans -n %{libfreebl}
|
||||
%create_ghostfile /%{_lib}/libsoftokn%{major}.chk root root 644
|
||||
%create_ghostfile /%{_lib}/libfreebl%{major}.chk root root 644
|
||||
%{_bindir}/shlibsign -i /%{_lib}/libsoftokn%{major}.so >/dev/null 2>/dev/null
|
||||
|
|
@ -337,7 +343,6 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so
|
|||
%{__rm} -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc docs/*
|
||||
%attr(0755,root,root) %{_bindir}/addbuiltin
|
||||
%attr(0755,root,root) %{_bindir}/atob
|
||||
|
|
@ -376,7 +381,6 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so
|
|||
%attr(0755,root,root) %{_bindir}/rsaperf
|
||||
%attr(0755,root,root) %{_bindir}/sdrtest
|
||||
%attr(0755,root,root) %{_bindir}/selfserv
|
||||
%attr(0755,root,root) %{_bindir}/shlibsign
|
||||
%attr(0755,root,root) %{_bindir}/signtool
|
||||
%attr(0755,root,root) %{_bindir}/signver
|
||||
%attr(0755,root,root) %{_bindir}/smime
|
||||
|
|
@ -391,26 +395,29 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so
|
|||
%config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db
|
||||
%config(noreplace) %{_sysconfdir}/pki/nssdb/secmod.db
|
||||
|
||||
%files shlibsign
|
||||
%attr(0755,root,root) %{_bindir}/shlibsign
|
||||
|
||||
%if %with lib
|
||||
%files -n %{libname}
|
||||
%defattr(0755,root,root,0755)
|
||||
%files -n %{libfreebl}
|
||||
/%{_lib}/libfreebl%{major}.so
|
||||
/%{_lib}/libsoftokn%{major}.so
|
||||
%defattr(0644,root,root,0755)
|
||||
%ghost /%{_lib}/libfreebl%{major}.chk
|
||||
%ghost /%{_lib}/libsoftokn%{major}.chk
|
||||
|
||||
%files -n %{libname}
|
||||
/%{_lib}/libnss%{major}.so
|
||||
/%{_lib}/libnssckbi.so
|
||||
%if %{build_empty}
|
||||
/%{_lib}/libnssckbi_empty.so
|
||||
%endif
|
||||
/%{_lib}/libsmime%{major}.so
|
||||
/%{_lib}/libsoftokn%{major}.so
|
||||
/%{_lib}/libssl%{major}.so
|
||||
/%{_lib}/libnssutil%{major}.so
|
||||
/%{_lib}/libnssdbm%{major}.so
|
||||
%defattr(0644,root,root,0755)
|
||||
%ghost /%{_lib}/libsoftokn%{major}.chk
|
||||
%ghost /%{_lib}/libfreebl%{major}.chk
|
||||
/%{_lib}/libsmime%{major}.so
|
||||
/%{_lib}/libssl%{major}.so
|
||||
|
||||
%files -n %{develname}
|
||||
%defattr(0644,root,root,0755)
|
||||
%attr(0755,root,root) %{_bindir}/nss-config
|
||||
%attr(0755,root,root) %{multiarch_bindir}/nss-config
|
||||
%_libdir/*.so
|
||||
|
|
@ -524,17 +531,54 @@ install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Mar 15 2012 Oden Eriksson <oeriksson@mandriva.com> 2:3.13.3-0.1
|
||||
- 3.13.3
|
||||
* Tue Jun 05 2012 Oden Eriksson <oeriksson@mandriva.com> 2:3.13.5-1mdv2012.0
|
||||
+ Revision: 802609
|
||||
- 3.13.5
|
||||
|
||||
* Mon Apr 09 2012 Oden Eriksson <oeriksson@mandriva.com> 2:3.13.4-1
|
||||
+ Revision: 789950
|
||||
- 3.13.4
|
||||
- fix deps
|
||||
- revert rpm5 only crap
|
||||
|
||||
* Thu Feb 23 2012 Oden Eriksson <oeriksson@mandriva.com> 2:3.13.1-0.2
|
||||
- rebuilt to pickup the fixes in rootcerts-20120218.00
|
||||
* Wed Mar 07 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 2:3.13.3-2
|
||||
+ Revision: 782704
|
||||
- rebuild with internal dependency generator
|
||||
|
||||
* Tue Nov 08 2011 Oden Eriksson <oeriksson@mandriva.com> 2:3.13.1-0.1
|
||||
- built for updates
|
||||
* Sat Mar 03 2012 Oden Eriksson <oeriksson@mandriva.com> 2:3.13.3-1
|
||||
+ Revision: 782020
|
||||
- 3.13.3
|
||||
|
||||
* Sat Nov 05 2011 Oden Eriksson <oeriksson@mandriva.com> 2:3.13.1-1mdv2012.0
|
||||
* Tue Feb 21 2012 Dmitry Mikhirev <dmikhirev@mandriva.org> 2:3.13.2-1
|
||||
+ Revision: 778646
|
||||
- new version 3.13.2
|
||||
|
||||
+ Matthew Dawkins <mattydaw@mandriva.org>
|
||||
- split out libfreebl lib pkg
|
||||
- this should address dep loop problems
|
||||
- if glibc and libc ever get properly split
|
||||
- used EVRD macro
|
||||
- moved signing of libfreebl libs to posttrans
|
||||
- updated descriptions
|
||||
|
||||
* Thu Jan 26 2012 Oden Eriksson <oeriksson@mandriva.com> 2:3.13.1-4
|
||||
+ Revision: 769168
|
||||
- bump release
|
||||
|
||||
* Thu Jan 26 2012 Oden Eriksson <oeriksson@mandriva.com> 2:3.13.1-3
|
||||
+ Revision: 769165
|
||||
- fix deps
|
||||
- rebuilt to pickup the changes in rootcerts as of 2012/01/17
|
||||
|
||||
* Tue Jan 10 2012 Matthew Dawkins <mattydaw@mandriva.org> 2:3.13.1-2
|
||||
+ Revision: 759561
|
||||
- fixed shlibsign description
|
||||
- split out shlibsign binary
|
||||
- this helps break a huge dep LOOP
|
||||
- glibc<>nss<>perl
|
||||
- cleaned up spec a bit
|
||||
|
||||
* Sat Nov 05 2011 Oden Eriksson <oeriksson@mandriva.com> 2:3.13.1-1
|
||||
+ Revision: 720519
|
||||
- 3.13.1
|
||||
- rediff the renegotiate-transitional patch
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue