Compare commits

...

No commits in common. "imports/c8-beta-stream-10.6/jss-4.11.0-1.module+el8.10.0+15532+95bac9ee" and "c8-stream-10.6" have entirely different histories.

3 changed files with 18 additions and 57 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/jss-4.11.0.tar.gz
SOURCES/jss-4.9.4.tar.gz

View File

@ -1 +1 @@
a068537cd958000dcd3b34847533101f95fc792b SOURCES/jss-4.11.0.tar.gz
b99d8fd7a9296f7cf480ca92a097dcf18c41eb53 SOURCES/jss-4.9.4.tar.gz

View File

@ -2,22 +2,18 @@
Name: jss
################################################################################
%global product_id idm-jss
# Upstream version number:
%global major_version 4
%global minor_version 11
%global update_version 0
%global minor_version 9
%global update_version 4
Summary: Java Security Services (JSS)
URL: https://github.com/dogtagpki/jss
URL: http://www.dogtagpki.org/wiki/JSS
License: MPLv1.1 or GPLv2+ or LGPLv2+
# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
# For official (i.e. supported) releases, use x.y.z-r where r >=1.
%global release_number 1
Version: %{major_version}.%{minor_version}.%{update_version}
Release: %{release_number}%{?_timestamp}%{?_commit_id}%{?dist}
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
#global _phase -alpha1
# To generate the source tarball:
@ -27,11 +23,7 @@ Release: %{release_number}%{?_timestamp}%{?_commit_id}%{?dist}
# $ git push origin v4.5.<z>
# Then go to https://github.com/dogtagpki/jss/releases and download the source
# tarball.
Source: https://github.com/dogtagpki/jss/archive/v%{version}%{?_phase}/jss-%{version}%{?_phase}.tar.gz
# md2man not available on i686
ExcludeArch: i686
Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phase}/%{name}-%{version}%{?_phase}.tar.gz
# To create a patch for all changes since a version tag:
# $ git format-patch \
@ -58,10 +50,10 @@ ExcludeArch: i686
# Build Options
################################################################################
# By default the build will execute unit tests unless --without tests
# By default the build will execute unit tests unless --without test
# option is specified.
%bcond_without tests
%bcond_without test
################################################################################
# Build Dependencies
@ -84,17 +76,6 @@ BuildRequires: apache-commons-lang3
BuildRequires: junit
%description
Java Security Services (JSS) is a java native interface which provides a bridge
for java-based applications to use native Network Security Services (NSS).
This only works with gcj. Other JREs require that JCE providers be signed.
################################################################################
%package -n %{product_id}
################################################################################
Summary: Java Security Services (JSS)
Requires: nss >= 3.44
Requires: %{java_headless}
Requires: jpackage-utils
@ -103,44 +84,36 @@ Requires: glassfish-jaxb-api
Requires: slf4j-jdk14
Requires: apache-commons-lang3
Obsoletes: jss < %{version}-%{release}
Provides: jss = %{version}-%{release}
Provides: jss = %{major_version}.%{minor_version}
Provides: %{product_id} = %{major_version}.%{minor_version}
Conflicts: ldapjdk < 4.20
Conflicts: idm-console-framework < 1.2
Conflicts: tomcatjss < 7.6.0
Conflicts: pki-base < 10.10.0
%description -n %{product_id}
%description
Java Security Services (JSS) is a java native interface which provides a bridge
for java-based applications to use native Network Security Services (NSS).
This only works with gcj. Other JREs require that JCE providers be signed.
################################################################################
%package -n %{product_id}-javadoc
%package javadoc
################################################################################
Summary: Java Security Services (JSS) Javadocs
Obsoletes: jss-javadoc < %{version}-%{release}
Provides: jss-javadoc = %{version}-%{release}
Provides: jss-javadoc = %{major_version}.%{minor_version}
Provides: %{product_id}-javadoc = %{major_version}.%{minor_version}
Provides: javadoc = %{major_version}.%{minor_version}
%description -n %{product_id}-javadoc
%description javadoc
This package contains the API documentation for JSS.
################################################################################
%prep
################################################################################
%autosetup -n jss-%{version}%{?_phase} -p 1
%autosetup -n %{name}-%{version}%{?_phase} -p 1
################################################################################
%build
################################################################################
%set_build_flags
@ -176,13 +149,12 @@ cd %{_vpath_builddir}
--no-print-directory \
javadoc
%if %{with tests}
%if %{with test}
ctest --output-on-failure
%endif
################################################################################
%install
################################################################################
cd %{_vpath_builddir}
@ -195,8 +167,7 @@ cd %{_vpath_builddir}
install
################################################################################
%files -n %{product_id}
################################################################################
%files
%defattr(-,root,root,-)
%doc jss.html
@ -205,23 +176,13 @@ cd %{_vpath_builddir}
%{_jnidir}/*
################################################################################
%files -n %{product_id}-javadoc
################################################################################
%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/jss-%{version}/
%{_javadocdir}/%{name}-%{version}/
################################################################################
%changelog
* Thu Feb 08 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 4.11.0-1
- Rebase to JSS 4.11.0
* Tue Jan 16 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 4.10.0-0.1
- Rebase to JSS 4.10.0-alpha1
* Fri Jan 12 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 4.9.8-1
- Rebase to JSS 4.9.8
* Wed Jun 01 2022 Red Hat PKI Team <rhcs-maint@redhat.com> 4.9.4-1
- Rebase to JSS 4.9.4
- Bug 2013674 - JSS cannot be properly initialized after using another NSS-backed security provider