From 5e481b03c4fbedfa51fd0b9ae978130668a5500b647ebc108527a315d2925422 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Fri, 18 Dec 2009 12:46:02 +0000 Subject: [PATCH 1/3] new mozilla-nss-certs subpackage OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=38 --- mozilla-nss-rpmlintrc | 4 ++++ mozilla-nss.changes | 7 +++++++ mozilla-nss.spec | 21 +++++++++++++++++---- 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 mozilla-nss-rpmlintrc diff --git a/mozilla-nss-rpmlintrc b/mozilla-nss-rpmlintrc new file mode 100644 index 0000000..dc8b7dc --- /dev/null +++ b/mozilla-nss-rpmlintrc @@ -0,0 +1,4 @@ +addFilter("shlib-policy-name-error") +addFilter("shlib-policy-missing-lib") +addFilter("shlib-policy-missing-suffix") +addFilter("shlib-unversioned-lib") diff --git a/mozilla-nss.changes b/mozilla-nss.changes index 58ae69b..524a55d 100644 --- a/mozilla-nss.changes +++ b/mozilla-nss.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 18 13:24:16 CET 2009 - wr@rosenauer.org + +- split mozilla-nss-certs from main package +- added rpmlintrc to ignore expected warnings +- added baselibs.conf as source + ------------------------------------------------------------------- Mon Dec 14 07:56:26 CET 2009 - wr@rosenauer.org diff --git a/mozilla-nss.spec b/mozilla-nss.spec index 5711750..6260175 100644 --- a/mozilla-nss.spec +++ b/mozilla-nss.spec @@ -43,6 +43,8 @@ Source: nss-%{version}.tar.bz2 Source1: nss.pc.in Source2: addon-certs.txt Source3: nss-config.in +Source4: %{name}-rpmlintrc +Source5: baselibs.conf Patch1: nss-opt.patch Patch2: nss-sqlitename.patch Patch3: system-nspr.patch @@ -50,12 +52,10 @@ Patch4: char.patch Patch5: nss-no-rpath.patch Patch6: nss-ckbi-1_77.patch.bz2 Patch9: malloc.patch -# Remove remnant traces from the package split. -Provides: libnss3 = %{version}-%{release} -Obsoletes: libnss3 <= %{version}-%{release} %define nspr_ver %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) PreReq: mozilla-nspr >= %nspr_ver PreReq: libfreebl3 >= %{version} +Requires: mozilla-nss-certs Requires(post): coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nssdbdir %{_sysconfdir}/pki/nssdb @@ -115,6 +115,16 @@ certificates, and other security standards. This package installs the freebl library from NSS. +%package certs +License: GPLv2+ ; LGPLv2.1+ ; MPL +Summary: CA certificates for NSS +Group: Productivity/Networking/Security + +%description certs +This package contains the integrated CA root certificates from the +Mozilla project. + + %prep %setup -n nss-%{version} -q cd mozilla @@ -271,7 +281,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) %{_libdir}/libnss3.so -%{_libdir}/libnssckbi.so %{_libdir}/libnssdbm3.so %{_libdir}/libnssutil3.so %{_libdir}/libsmime3.so @@ -301,4 +310,8 @@ rm -rf $RPM_BUILD_ROOT /%{_lib}/libfreebl3.so /%{_lib}/libfreebl3.chk +%files certs +%defattr(-, root, root) +%{_libdir}/libnssckbi.so + %changelog From 0092a59c5ebe7630e2e5169dfad9205f82623adfde2617d28c2c3865c0da2c4c Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 21 Dec 2009 13:21:28 +0000 Subject: [PATCH 2/3] checked in OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=39 --- mozilla-nss-rpmlintrc | 4 ---- mozilla-nss.changes | 7 ------- mozilla-nss.spec | 21 ++++----------------- 3 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 mozilla-nss-rpmlintrc diff --git a/mozilla-nss-rpmlintrc b/mozilla-nss-rpmlintrc deleted file mode 100644 index dc8b7dc..0000000 --- a/mozilla-nss-rpmlintrc +++ /dev/null @@ -1,4 +0,0 @@ -addFilter("shlib-policy-name-error") -addFilter("shlib-policy-missing-lib") -addFilter("shlib-policy-missing-suffix") -addFilter("shlib-unversioned-lib") diff --git a/mozilla-nss.changes b/mozilla-nss.changes index 524a55d..58ae69b 100644 --- a/mozilla-nss.changes +++ b/mozilla-nss.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Fri Dec 18 13:24:16 CET 2009 - wr@rosenauer.org - -- split mozilla-nss-certs from main package -- added rpmlintrc to ignore expected warnings -- added baselibs.conf as source - ------------------------------------------------------------------- Mon Dec 14 07:56:26 CET 2009 - wr@rosenauer.org diff --git a/mozilla-nss.spec b/mozilla-nss.spec index 6260175..5711750 100644 --- a/mozilla-nss.spec +++ b/mozilla-nss.spec @@ -43,8 +43,6 @@ Source: nss-%{version}.tar.bz2 Source1: nss.pc.in Source2: addon-certs.txt Source3: nss-config.in -Source4: %{name}-rpmlintrc -Source5: baselibs.conf Patch1: nss-opt.patch Patch2: nss-sqlitename.patch Patch3: system-nspr.patch @@ -52,10 +50,12 @@ Patch4: char.patch Patch5: nss-no-rpath.patch Patch6: nss-ckbi-1_77.patch.bz2 Patch9: malloc.patch +# Remove remnant traces from the package split. +Provides: libnss3 = %{version}-%{release} +Obsoletes: libnss3 <= %{version}-%{release} %define nspr_ver %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) PreReq: mozilla-nspr >= %nspr_ver PreReq: libfreebl3 >= %{version} -Requires: mozilla-nss-certs Requires(post): coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nssdbdir %{_sysconfdir}/pki/nssdb @@ -115,16 +115,6 @@ certificates, and other security standards. This package installs the freebl library from NSS. -%package certs -License: GPLv2+ ; LGPLv2.1+ ; MPL -Summary: CA certificates for NSS -Group: Productivity/Networking/Security - -%description certs -This package contains the integrated CA root certificates from the -Mozilla project. - - %prep %setup -n nss-%{version} -q cd mozilla @@ -281,6 +271,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) %{_libdir}/libnss3.so +%{_libdir}/libnssckbi.so %{_libdir}/libnssdbm3.so %{_libdir}/libnssutil3.so %{_libdir}/libsmime3.so @@ -310,8 +301,4 @@ rm -rf $RPM_BUILD_ROOT /%{_lib}/libfreebl3.so /%{_lib}/libfreebl3.chk -%files certs -%defattr(-, root, root) -%{_libdir}/libnssckbi.so - %changelog From 6a6023ab57ab0b9e27575df48e21bbdac05f5c405b5790e095ea54aa01b5bd8c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 21 Dec 2009 13:21:30 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/mozilla-nss revision 29.0 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=012f77fb1152b888f0b9f8e5e9da47e4 --- mozilla-nss-rpmlintrc | 4 ++++ mozilla-nss.changes | 7 +++++++ mozilla-nss.spec | 23 ++++++++++++++++++----- 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 mozilla-nss-rpmlintrc diff --git a/mozilla-nss-rpmlintrc b/mozilla-nss-rpmlintrc new file mode 100644 index 0000000..dc8b7dc --- /dev/null +++ b/mozilla-nss-rpmlintrc @@ -0,0 +1,4 @@ +addFilter("shlib-policy-name-error") +addFilter("shlib-policy-missing-lib") +addFilter("shlib-policy-missing-suffix") +addFilter("shlib-unversioned-lib") diff --git a/mozilla-nss.changes b/mozilla-nss.changes index 58ae69b..524a55d 100644 --- a/mozilla-nss.changes +++ b/mozilla-nss.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 18 13:24:16 CET 2009 - wr@rosenauer.org + +- split mozilla-nss-certs from main package +- added rpmlintrc to ignore expected warnings +- added baselibs.conf as source + ------------------------------------------------------------------- Mon Dec 14 07:56:26 CET 2009 - wr@rosenauer.org diff --git a/mozilla-nss.spec b/mozilla-nss.spec index 5711750..8267ad1 100644 --- a/mozilla-nss.spec +++ b/mozilla-nss.spec @@ -29,7 +29,7 @@ BuildRequires: sqlite3-devel %endif License: GPLv2+ ; LGPLv2.1+ ; MPL Version: 3.12.4 -Release: 3 +Release: 4 # bug437293 %ifarch ppc64 Obsoletes: mozilla-nss-64bit @@ -43,6 +43,8 @@ Source: nss-%{version}.tar.bz2 Source1: nss.pc.in Source2: addon-certs.txt Source3: nss-config.in +Source4: %{name}-rpmlintrc +Source5: baselibs.conf Patch1: nss-opt.patch Patch2: nss-sqlitename.patch Patch3: system-nspr.patch @@ -50,12 +52,10 @@ Patch4: char.patch Patch5: nss-no-rpath.patch Patch6: nss-ckbi-1_77.patch.bz2 Patch9: malloc.patch -# Remove remnant traces from the package split. -Provides: libnss3 = %{version}-%{release} -Obsoletes: libnss3 <= %{version}-%{release} %define nspr_ver %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) PreReq: mozilla-nspr >= %nspr_ver PreReq: libfreebl3 >= %{version} +Requires: mozilla-nss-certs Requires(post): coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nssdbdir %{_sysconfdir}/pki/nssdb @@ -115,6 +115,16 @@ certificates, and other security standards. This package installs the freebl library from NSS. +%package certs +License: GPLv2+ ; LGPLv2.1+ ; MPL +Summary: CA certificates for NSS +Group: Productivity/Networking/Security + +%description certs +This package contains the integrated CA root certificates from the +Mozilla project. + + %prep %setup -n nss-%{version} -q cd mozilla @@ -271,7 +281,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) %{_libdir}/libnss3.so -%{_libdir}/libnssckbi.so %{_libdir}/libnssdbm3.so %{_libdir}/libnssutil3.so %{_libdir}/libsmime3.so @@ -301,4 +310,8 @@ rm -rf $RPM_BUILD_ROOT /%{_lib}/libfreebl3.so /%{_lib}/libfreebl3.chk +%files certs +%defattr(-, root, root) +%{_libdir}/libnssckbi.so + %changelog