Hello community, here is the log from the commit of package mozilla-jss for openSUSE:Factory checked in at 2018-04-26 13:38:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozilla-jss (Old) and /work/SRC/openSUSE:Factory/.mozilla-jss.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozilla-jss" Thu Apr 26 13:38:18 2018 rev:7 rq:600624 version:4.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/mozilla-jss/mozilla-jss.changes 2015-04-15 16:24:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mozilla-jss.new/mozilla-jss.changes 2018-04-26 13:38:23.603284044 +0200 @@ -1,0 +2,8 @@ +Thu Apr 19 11:30:12 UTC 2018 - [email protected] + +- Update to jss 4.4.3 +- Remove upstreamed patches: + * jss-4.3.2-support-TLS1_1-TLS1_2.patch + * jss-ipv6.patch + +------------------------------------------------------------------- Old: ---- jss-4.3.2-support-TLS1_1-TLS1_2.patch jss-4.3.2.tar.gz jss-ipv6.patch New: ---- jss-4.4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-jss.spec ++++++ --- /var/tmp/diff_new_pack.jbFavn/_old 2018-04-26 13:38:25.211225109 +0200 +++ /var/tmp/diff_new_pack.jbFavn/_new 2018-04-26 13:38:25.211225109 +0200 @@ -1,7 +1,7 @@ # # spec file for package mozilla-jss # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,37 +17,26 @@ Name: mozilla-jss -Version: 4.3.2 +Version: 4.4.3 Release: 0 Summary: Network Security Services for Java (JSS) -License: MPL-1.1 or GPL-2.0 or LGPL-2.1 +License: MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-only Group: Development/Libraries/Java Url: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/JSS - -# The source for this package was pulled from upstream's SCM. Use the -# following commands to generate the tarball: -# hg clone --rev JSS_4_3_2_RTM https://hg.mozilla.org/projects/jss jss-4.3.2 -# rm -r jss-4.3.2/.hg -# tar cjvf jss-4.3.2.tar.gz jss-4.3.2 -# Source0: jss-%{version}.tar.gz Source1: MPL-1.1.txt Source2: GPL-2.0.txt Source3: LGPL-2.1.txt Source100: mozilla-jss-rpmlintrc -# PATCH-FIX-UPSTREAM jss-ipv6.patch -- Add IPv6 support, see https://bugzilla.mozilla.org/show_bug.cgi?id=507536 -Patch0003: jss-ipv6.patch -# PATCH-FIX-UPSTREAM jss-4.3.2-support-TLS1_1-TLS1_2.patch -- Add support for TLS 1.1 and 1.2, add version ranges -Patch0026: jss-4.3.2-support-TLS1_1-TLS1_2.patch - -BuildRequires: java-devel -BuildRequires: mozilla-nspr-devel >= 4.6.99 -BuildRequires: mozilla-nss-devel >= 3.15.1 +BuildRequires: java-1_8_0-openjdk-devel +BuildRequires: libopenssl-1_1-devel +BuildRequires: mozilla-nspr-devel >= 4.13.1 +BuildRequires: mozilla-nss-devel >= 3.28 BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: java -Requires: mozilla-nss >= 3.15.1 +Requires: mozilla-nss >= 3.28 %description Java Security Services (JSS) is a java native interface which provides a bridge @@ -64,8 +53,9 @@ %prep %setup -q -n jss-%{version} -%patch0003 -p1 -%patch0026 -p1 +mkdir jss +mv build_java.pl config coreconf jss.html lib Makefile manifest.mn org pkg README rules.mk samples \ + jss %build [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java @@ -76,13 +66,14 @@ export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 - +export USE_INSTALLED_NSPR=1 +export USE_INSTALLED_NSS=1 export NSPR_INCLUDE_DIR=`%{_bindir}/pkg-config --cflags-only-I nspr | sed 's/-I//'` export NSPR_LIB_DIR=`%{_bindir}/pkg-config --libs-only-L nspr | sed 's/-L//'` export NSS_INCLUDE_DIR=`%{_bindir}/pkg-config --cflags-only-I nss | sed 's/-I//'` export NSS_LIB_DIR=`%{_bindir}/pkg-config --libs-only-L nss | sed 's/-L//'` -%ifarch x86_64 ppc64 ia64 s390x sparc64 +%ifarch x86_64 ppc64 ppc64le ia64 s390x sparc64 aarch64 export USE_64=1 %endif @@ -90,16 +81,16 @@ if [[ `uname -r | cut -f1 -d.` > 2 ]]; then %global majorrel `uname -r | cut -f1 -d.` %global minorrel `uname -r | cut -f2 -d.` -cp -p security/coreconf/Linux2.6.mk security/coreconf/Linux%{majorrel}.%{minorrel}.mk -sed -i -e 's;LINUX2_1;LINUX%{majorrel}_%{minorrel};' security/coreconf/Linux%{majorrel}.%{minorrel}.mk +cp -p jss/coreconf/Linux.mk jss/coreconf/Linux%{majorrel}.%{minorrel}.mk +sed -i -e 's;LINUX2_1;LINUX%{majorrel}_%{minorrel};' jss/coreconf/Linux%{majorrel}.%{minorrel}.mk fi # For some reason jss can't find nss on SUSE unless we do the following export C_INCLUDE_PATH="%{_includedir}/nss3" # The Makefile is not thread-safe -make -C security/coreconf -make -C security/jss -make -C security/jss javadoc +make -C jss/coreconf +make -C jss +make -C jss javadoc %install # Supress SUSE bytecode version error check @@ -142,7 +133,7 @@ # No ldconfig is required since this library is loaded by Java itself. %files %defattr(-,root,root,-) -%doc security/jss/jss.html MPL-1.1.txt GPL-2.0.txt LGPL-2.1.txt +%doc jss/jss.html MPL-1.1.txt GPL-2.0.txt LGPL-2.1.txt %dir %{_jnidir} %{_jnidir}/* %{_libdir}/lib*.so ++++++ jss-4.3.2.tar.gz -> jss-4.4.3.tar.gz ++++++ ++++ 96169 lines of diff (skipped)
