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.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mozilla-jss.new/mozilla-jss.changes
2014-05-13 20:45:55.000000000 +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.000000000 +0200
+++ /var/tmp/diff_new_pack.rB5Mp7/_new 2014-05-13 20:45:56.000000000 +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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
