commit mozilla-jss for openSUSE:Factory
Hello community,
here is the log from the commit of package mozilla-jss for openSUSE:Factory
checked in at 2020-06-05 20:22:13
Comparing /work/SRC/openSUSE:Factory/mozilla-jss (Old)
and /work/SRC/openSUSE:Factory/.mozilla-jss.new.3606 (New)
Package is "mozilla-jss"
Fri Jun 5 20:22:13 2020 rev:11 rq:811795 version:4.6.3
Changes:
--- /work/SRC/openSUSE:Factory/mozilla-jss/mozilla-jss.changes 2020-05-05
18:55:10.941385824 +0200
+++ /work/SRC/openSUSE:Factory/.mozilla-jss.new.3606/mozilla-jss.changes
2020-06-05 20:28:44.657265549 +0200
@@ -1,0 +2,5 @@
+Fri Jun 5 12:14:58 UTC 2020 - Stasiek Michalski
+
+- Fix debuginfo detection on i586
+
+---
Other differences:
--
++ mozilla-jss.spec ++
--- /var/tmp/diff_new_pack.YdUJBW/_old 2020-06-05 20:28:45.261267334 +0200
+++ /var/tmp/diff_new_pack.YdUJBW/_new 2020-06-05 20:28:45.265267346 +0200
@@ -118,7 +118,8 @@
%files
%doc jss.html MPL-1.1.txt gpl.txt lgpl.txt
-%{_libdir}/*
+%dir %{_libdir}/jss/
+%{_libdir}/jss/*
%{_jnidir}/*
%files javadoc
commit mozilla-jss for openSUSE:Factory
Hello community,
here is the log from the commit of package mozilla-jss for openSUSE:Factory
checked in at 2020-05-05 18:55:03
Comparing /work/SRC/openSUSE:Factory/mozilla-jss (Old)
and /work/SRC/openSUSE:Factory/.mozilla-jss.new.2738 (New)
Package is "mozilla-jss"
Tue May 5 18:55:03 2020 rev:10 rq:797591 version:4.6.3
Changes:
--- /work/SRC/openSUSE:Factory/mozilla-jss/mozilla-jss.changes 2018-11-12
09:45:09.772851615 +0100
+++ /work/SRC/openSUSE:Factory/.mozilla-jss.new.2738/mozilla-jss.changes
2020-05-05 18:55:10.941385824 +0200
@@ -1,0 +2,12 @@
+Tue Apr 14 11:47:27 UTC 2020 - Stasiek Michalski
+
+- Update to 4.6.3
+- Remove patches:
+ * jss-4.5.0-slf4j.patch
+ * jss-4.5.0-deprecation-warnings.patch
+ * jss-4.5.0-pkcs11-constants.patch
+ * jss-4.5.0-nojavah.patch
+ * jss-4.5.0-sourcetarget.patch
+- Ship with licenses included with the source instead of adding our own
+
+---
Old:
GPL-2.0.txt
LGPL-2.1.txt
MPL-1.1.txt
jss-4.5.0-deprecation-warnings.patch
jss-4.5.0-nojavah.patch
jss-4.5.0-pkcs11-constants.patch
jss-4.5.0-slf4j.patch
jss-4.5.0-sourcetarget.patch
jss-4.5.0.tar.gz
mozilla-jss-rpmlintrc
New:
jss-4.6.3.tar.gz
Other differences:
--
++ mozilla-jss.spec ++
--- /var/tmp/diff_new_pack.OKf3ZF/_old 2020-05-05 18:55:12.569389330 +0200
+++ /var/tmp/diff_new_pack.OKf3ZF/_new 2020-05-05 18:55:12.573389339 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mozilla-jss
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,34 +17,48 @@
Name: mozilla-jss
-Version:4.5.0
-Release:0
-Summary:Network Security Services for Java (JSS)
+Summary:Java Security Services (JSS)
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
-Source0:jss-%{version}.tar.gz
-Source1:MPL-1.1.txt
-Source2:GPL-2.0.txt
-Source3:LGPL-2.1.txt
-Source100: mozilla-jss-rpmlintrc
-Patch0: jss-4.5.0-slf4j.patch
-Patch1: jss-4.5.0-deprecation-warnings.patch
-Patch2: jss-4.5.0-pkcs11-constants.patch
-Patch3: jss-4.5.0-nojavah.patch
-Patch4: jss-4.5.0-sourcetarget.patch
-BuildRequires: apache-commons-codec
+URL:http://www.dogtagpki.org/wiki/JSS
+Version:4.6.3
+Release:0
+Source0:
https://github.com/dogtagpki/jss/archive/v%{version}/jss-%{version}.tar.gz
+
+BuildRequires: cmake
+BuildRequires: git
+BuildRequires: make
+BuildRequires: unzip
+BuildRequires: zip
+
BuildRequires: apache-commons-lang
-BuildRequires: fdupes
-BuildRequires: java-devel >= 1.8
-BuildRequires: libopenssl-1_1-devel
+BuildRequires: gcc-c++
+BuildRequires: glassfish-jaxb-api
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+BuildRequires: libfreebl3-hmac
+BuildRequires: libsoftokn3-hmac
BuildRequires: mozilla-nspr-devel >= 4.13.1
-BuildRequires: mozilla-nss-devel >= 3.28
-BuildRequires: pkgconfig
+BuildRequires: mozilla-nss-devel >= 3.44
+BuildRequires: mozilla-nss-sysinit >= 3.44
+BuildRequires: mozilla-nss-tools >= 3.44
BuildRequires: slf4j
-Requires: java
-Requires: mozilla-nss >= 3.28
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: slf4j-jdk14
+
+BuildRequires: junit
+
+Requires: apache-commons-lang
+Requires: glassfish-jaxb-api
+Requires: java-headless
+Requires: jpackage-utils
+Requires: mozilla-nss >= 3.44
+Requires: slf4j
+Requires: slf4j-jdk14
+
+Conflicts: ldapjdk < 4.20
+Conflicts: idm-console-framework < 1.2
+Conflicts: tomcatjss < 7.3.4
+Conflicts: pki-base < 10.6.5
%description
Java Security Services (JSS) is a java native interface which provides a bridge
@@ -52,110 +66,62 @@
This only works with gcj. Other JREs require that JCE providers be signed.
%package javadoc
+
Summary:Java Security Services (JSS) Javadocs
Group: Development/Libraries/Java
-Requires: mozilla-jss = %{version}-%{release}
+Requires: mozilla-jss = %{version}
%description javadoc
This package contains the API documentation for JSS.
%prep
-%setup -q -n jss-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-mkdir jss
-mv build_java.pl config coreconf jss.html lib Makefile manifest.mn org
pkg README.md rules.mk samples \
- jss
+%
commit mozilla-jss for openSUSE:Factory
Hello community,
here is the log from the commit of package mozilla-jss for openSUSE:Factory
checked in at 2018-11-12 09:44:38
Comparing /work/SRC/openSUSE:Factory/mozilla-jss (Old)
and /work/SRC/openSUSE:Factory/.mozilla-jss.new (New)
Package is "mozilla-jss"
Mon Nov 12 09:44:38 2018 rev:9 rq:648194 version:4.5.0
Changes:
--- /work/SRC/openSUSE:Factory/mozilla-jss/mozilla-jss.changes 2018-10-11
11:47:54.250599571 +0200
+++ /work/SRC/openSUSE:Factory/.mozilla-jss.new/mozilla-jss.changes
2018-11-12 09:45:09.772851615 +0100
@@ -1,0 +2,5 @@
+Sat Nov 10 20:40:37 UTC 2018 - sch...@suse.de
+
+- Define USE_64 for riscv64
+
+---
Other differences:
--
++ mozilla-jss.spec ++
--- /var/tmp/diff_new_pack.CdYJT0/_old 2018-11-12 09:45:10.812850033 +0100
+++ /var/tmp/diff_new_pack.CdYJT0/_new 2018-11-12 09:45:10.812850033 +0100
@@ -86,7 +86,7 @@
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 ppc64le ia64 s390x sparc64 aarch64
+%ifarch x86_64 ppc64 ppc64le ia64 s390x sparc64 aarch64 riscv64
export USE_64=1
%endif
commit mozilla-jss for openSUSE:Factory
Hello community,
here is the log from the commit of package mozilla-jss for openSUSE:Factory
checked in at 2018-10-11 11:47:40
Comparing /work/SRC/openSUSE:Factory/mozilla-jss (Old)
and /work/SRC/openSUSE:Factory/.mozilla-jss.new (New)
Package is "mozilla-jss"
Thu Oct 11 11:47:40 2018 rev:8 rq:639039 version:4.5.0
Changes:
--- /work/SRC/openSUSE:Factory/mozilla-jss/mozilla-jss.changes 2018-04-26
13:38:23.603284044 +0200
+++ /work/SRC/openSUSE:Factory/.mozilla-jss.new/mozilla-jss.changes
2018-10-11 11:47:54.250599571 +0200
@@ -1,0 +2,18 @@
+Thu Sep 20 11:03:48 UTC 2018 - Fridrich Strba
+
+- Update to jss 4.5.0
+- Added patches:
+ * jss-4.5.0-slf4j.patch
++ Use the right name of slf4j's api.jar
+ * jss-4.5.0-deprecation-warnings.patch
++ Address most deprecation warnings
+ * jss-4.5.0-pkcs11-constants.patch
++ Address problem with PKCS11 constants no longer being
+ visible in latest JDKs
+ * jss-4.5.0-nojavah.patch
++ Changes to generate JNI header files the new way.
++ Fixes build on jdk10 and further
+ * jss-4.5.0-sourcetarget.patch
++ Build with source and target 8 to avoid compatibility issues
+
+---
Old:
jss-4.4.3.tar.gz
New:
jss-4.5.0-deprecation-warnings.patch
jss-4.5.0-nojavah.patch
jss-4.5.0-pkcs11-constants.patch
jss-4.5.0-slf4j.patch
jss-4.5.0-sourcetarget.patch
jss-4.5.0.tar.gz
Other differences:
--
++ mozilla-jss.spec ++
--- /var/tmp/diff_new_pack.Yow6pF/_old 2018-10-11 11:47:56.814596308 +0200
+++ /var/tmp/diff_new_pack.Yow6pF/_new 2018-10-11 11:47:56.822596298 +0200
@@ -12,31 +12,39 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: mozilla-jss
-Version:4.4.3
+Version:4.5.0
Release:0
Summary:Network Security Services for Java (JSS)
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
+URL:
https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/JSS
Source0:jss-%{version}.tar.gz
Source1:MPL-1.1.txt
Source2:GPL-2.0.txt
Source3:LGPL-2.1.txt
Source100: mozilla-jss-rpmlintrc
-BuildRequires: java-1_8_0-openjdk-devel
+Patch0: jss-4.5.0-slf4j.patch
+Patch1: jss-4.5.0-deprecation-warnings.patch
+Patch2: jss-4.5.0-pkcs11-constants.patch
+Patch3: jss-4.5.0-nojavah.patch
+Patch4: jss-4.5.0-sourcetarget.patch
+BuildRequires: apache-commons-codec
+BuildRequires: apache-commons-lang
+BuildRequires: fdupes
+BuildRequires: java-devel >= 1.8
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
-
+BuildRequires: pkgconfig
+BuildRequires: slf4j
Requires: java
Requires: mozilla-nss >= 3.28
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Java Security Services (JSS) is a java native interface which provides a bridge
@@ -53,8 +61,13 @@
%prep
%setup -q -n jss-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
mkdir jss
-mv build_java.pl config coreconf jss.html lib Makefile manifest.mn org
pkg README rules.mk samples \
+mv build_java.pl config coreconf jss.html lib Makefile manifest.mn org
pkg README.md rules.mk samples \
jss
%build
@@ -129,6 +142,7 @@
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -rp dist/jssdoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
rm %{buildroot}%{_javadocdir}/%{name}-%{version}/index.html.bak
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}-%{version}
# No ldconfig is required since this library is loaded by Java itself.
%files
++ jss-4.5.0-deprecation-warnings.patch ++
--- jss-4.5.0/coreconf/Linux.mk
+++ jss-4.5.0/coreconf/Linux.mk
@@ -127,7 +127,7 @@ endif
# Place -ansi and *_SOURCE before $(DSO_CFLAGS) so DSO_CFLAGS can override
# -ansi on platforms like Android where the system headers are C99 and do
# not build with -ansi.
-STANDARDS_CFLAGS = -D_POSIX_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE
+STANDARDS_CFLAGS = -D_POSIX_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE
OS_CFLAGS = $(STANDARDS_CFLAGS) $(DSO_CFLAGS) $(OS_REL_CFLAGS)
$(ARCHFLAG) -Wall -Werror-implicit-function-declaration -Wno-switch
commit mozilla-jss for openSUSE:Factory
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.0 +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 - guillaume.gar...@opensuse.org
+
+- 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 Makefi
commit mozilla-jss for openSUSE:Factory
binvGKrWd9fbw.bin Description: Binary data
commit mozilla-jss for openSUSE:Factory
Hello community,
here is the log from the commit of package mozilla-jss for openSUSE:Factory
checked in at 2014-05-13 20:45:54
Comparing /work/SRC/openSUSE:Factory/mozilla-jss (Old)
and /work/SRC/openSUSE:Factory/.mozilla-jss.new (New)
Package is "mozilla-jss"
Changes:
--- /work/SRC/openSUSE:Factory/mozilla-jss/mozilla-jss.changes 2013-09-12
07:09:57.0 +0200
+++ /work/SRC/openSUSE:Factory/.mozilla-jss.new/mozilla-jss.changes
2014-05-13 20:45:55.0 +0200
@@ -1,0 +2,7 @@
+Sun May 11 19:33:59 UTC 2014 - a...@ajaissle.de
+
+- Fixed build on SLES with kernels > 2.x
+- Replaced '$RPM_BUILD_ROOT' with '%{buildroot}
+- Removed %cleanup section
+
+---
Other differences:
--
++ mozilla-jss.spec ++
--- /var/tmp/diff_new_pack.rB5Mp7/_old 2014-05-13 20:45:56.0 +0200
+++ /var/tmp/diff_new_pack.rB5Mp7/_new 2014-05-13 20:45:56.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mozilla-jss
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,11 +18,12 @@
Name: mozilla-jss
Version:4.3.2
-Release:2%{?dist}
+Release:0
Summary:Java Security Services (JSS)
License:MPL-1.1 or GPL-2.0+ or LGPL-2.0+
Group: Development/Libraries/Java
-Url:http://www.mozilla.org/projects/security/pki/jss/
+
+Url:
https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/JSS
# The source for this package was pulled from upstream's cvs. Use the
# following commands to generate the tarball:
# cvs -d :pserver:anonym...@cvs-mirror.mozilla.org:/cvsroot export -r
JSS_4_3_2_RTM -d jss-4.3.2 -N mozilla/security/coreconf mozilla/security/jss
@@ -31,14 +32,16 @@
Source1:MPL-1.1.txt
Source2:gpl.txt
Source3:lgpl.txt
+Patch1: jss-ipv6.patch
+
BuildRequires: java-devel
BuildRequires: mozilla-nspr-devel >= 4.6.99
BuildRequires: mozilla-nss-devel >= 3.12.3.99
BuildRequires: pkg-config
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
Requires: java
Requires: mozilla-nss >= 3.12.3.99
-Patch1: jss-ipv6.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Java Security Services (JSS) is a java native interface which provides a bridge
@@ -82,12 +85,12 @@
export USE_64
%endif
# Fix for Kernel >= 3 (autoget kernel version
-%if 0%{?suse_version} >= 1210
+if [[ `uname -r | cut -f1 -d.` > 2 ]]; then
%global majorrel `uname -r | cut -f1 -d.`
%global minorrel `uname -r | cut -f2 -d.`
cp -p mozilla/security/coreconf/Linux2.6.mk
mozilla/security/coreconf/Linux%{majorrel}.%{minorrel}.mk
sed -i -e 's;LINUX2_1;LINUX{%minorrel}_%{minorrel};'
mozilla/security/coreconf/Linux%{majorrel}.%{minorrel}.mk
-%endif
+fi
# For some reason jss can't find nss on SUSE unless we do the following
C_INCLUDE_PATH="/usr/include/nss3:/usr/include/nspr4"
export C_INCLUDE_PATH
@@ -106,16 +109,16 @@
# There is no install target so we'll do it by hand
# jars
-install -d -m 0755 $RPM_BUILD_ROOT%{_jnidir}
-install -m 644 mozilla/dist/xpclass.jar
${RPM_BUILD_ROOT}%{_jnidir}/jss4-%{version}.jar
-pushd $RPM_BUILD_ROOT%{_jnidir}
+install -d -m 0755 %{buildroot}%{_jnidir}
+install -m 644 mozilla/dist/xpclass.jar
%{buildroot}%{_jnidir}/jss4-%{version}.jar
+pushd %{buildroot}%{_jnidir}
ln -fs jss4-%{version}.jar jss4.jar
popd
# We have to use the name libjss4.so because this is dynamically
# loaded by the jar file.
-install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}
-install -m 0755 mozilla/dist/Linux*.OBJ/lib/libjss4.so
${RPM_BUILD_ROOT}%{_libdir}/
+install -d -m 0755 %{buildroot}T%{_libdir}
+install -m 0755 mozilla/dist/Linux*.OBJ/lib/libjss4.so %{buildroot}%{_libdir}/
# FIXME - sign jss4.jar. In order to use JSS as a JCE provider it needs to be
# signed with a Sun-issued certificate. Since we would need to make this
@@ -131,12 +134,9 @@
# as well.
# javadoc
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -rp mozilla/dist/jssdoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-rm $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/index.html.bak
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -rp mozilla/dist/jssdoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+rm %{buildroot}%{_javadocdir}/%{name}-%{version}/index.html.bak
# No ldconfig is required since this library is loaded by Java itself.
%files
--
commit mozilla-jss for openSUSE:Factory
Hello community,
here is the log from the commit of package mozilla-jss for openSUSE:Factory
checked in at 2013-09-12 07:09:56
Comparing /work/SRC/openSUSE:Factory/mozilla-jss (Old)
and /work/SRC/openSUSE:Factory/.mozilla-jss.new (New)
Package is "mozilla-jss"
Changes:
--- /work/SRC/openSUSE:Factory/mozilla-jss/mozilla-jss.changes 2013-07-12
20:49:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.mozilla-jss.new/mozilla-jss.changes
2013-09-12 07:09:57.0 +0200
@@ -1,0 +2,6 @@
+Sun Sep 8 20:03:41 UTC 2013 - w...@rosenauer.org
+
+- fixed build in Factory by making /usr/lib/java and
+ /usr/share/javadoc part of the package
+
+---
Other differences:
--
++ mozilla-jss.spec ++
--- /var/tmp/diff_new_pack.2uhKJF/_old 2013-09-12 07:09:58.0 +0200
+++ /var/tmp/diff_new_pack.2uhKJF/_new 2013-09-12 07:09:58.0 +0200
@@ -20,9 +20,9 @@
Version:4.3.2
Release:2%{?dist}
Summary:Java Security Services (JSS)
-Group: Development/Libraries/Java
License:MPL-1.1 or GPL-2.0+ or LGPL-2.0+
-URL:http://www.mozilla.org/projects/security/pki/jss/
+Group: Development/Libraries/Java
+Url:http://www.mozilla.org/projects/security/pki/jss/
# The source for this package was pulled from upstream's cvs. Use the
# following commands to generate the tarball:
# cvs -d :pserver:anonym...@cvs-mirror.mozilla.org:/cvsroot export -r
JSS_4_3_2_RTM -d jss-4.3.2 -N mozilla/security/coreconf mozilla/security/jss
@@ -31,14 +31,14 @@
Source1:MPL-1.1.txt
Source2:gpl.txt
Source3:lgpl.txt
-BuildRequires: pkg-config
-BuildRequires: mozilla-nss-devel >= 3.12.3.99
-BuildRequires: mozilla-nspr-devel >= 4.6.99
BuildRequires: java-devel
+BuildRequires: mozilla-nspr-devel >= 4.6.99
+BuildRequires: mozilla-nss-devel >= 3.12.3.99
+BuildRequires: pkg-config
Requires: java
Requires: mozilla-nss >= 3.12.3.99
Patch1: jss-ipv6.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Java Security Services (JSS) is a java native interface which provides a bridge
@@ -142,11 +142,13 @@
%files
%defattr(-,root,root,-)
%doc mozilla/security/jss/jss.html MPL-1.1.txt gpl.txt lgpl.txt
+%dir %{_jnidir}
%{_jnidir}/*
%{_libdir}/lib*.so
%files javadoc
%defattr(-,root,root,-)
+%dir %{_javadocdir}
%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}-%{version}/*
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
