Resolves: rhbz #1434535

- Mozilla Bugzilla #1355268 - JSS 4.4 is incompatible with versions of
  idm-console-framework < 1.1.17-4
- Red Hat Bugzilla #1435076 - Remove unused legacy lines from JSS spec files
This commit is contained in:
Matthew Harmsen 2017-04-18 15:41:18 -06:00
parent fe5a333983
commit 26521e2fc8

View File

@ -1,9 +1,6 @@
%global majorrel `uname -r | cut -f1 -d.`
%global minorrel `uname -r | cut -f2 -d.`
Name: jss
Version: 4.4.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Java Security Services (JSS)
Group: System Environment/Libraries
@ -22,8 +19,9 @@ Source2: http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/gpl.
Source3: http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/lgpl.txt
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Conflicts: tomcatjss < 7.2.1
Conflicts: idm-console-framework < 1.1.17-4
Conflicts: pki-base < 10.4.0
Conflicts: tomcatjss < 7.2.1
BuildRequires: nss-devel >= 3.28.3
BuildRequires: nspr-devel >= 4.13.1
@ -87,9 +85,6 @@ USE_64=1
export USE_64
%endif
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
# The Makefile is not thread-safe
make -C jss/coreconf
make -C jss
@ -143,6 +138,11 @@ rm -rf $RPM_BUILD_ROOT
%{_javadocdir}/%{name}-%{version}/*
%changelog
* Mon Apr 17 2017 Matthew Harmsen <mharmsen@redhat.com> - 4.4.1-2
- Mozilla Bugzilla #1355268 - JSS 4.4 is incompatible with versions of
idm-console-framework < 1.1.17-4
- Red Hat Bugzilla #1435076 - Remove unused legacy lines from JSS spec files
* Mon Mar 27 2017 Matthew Harmsen <mharmsen@redhat.com> - 4.4.1-1
- Bugzilla Bug #1431937 - Rebase jss to 4.4.x in Fedora 25+
- Updated build requirements for NSPR