Rebased to JSS 4.4.4

.gitignore

@@ -4,3 +4,4 @@ jss-4.2.6.tar.gz
 /jss-4.4.1.tar.gz
 /jss-4.4.2.tar.gz
 /jss-4.4.3.tar.gz
+/jss-4.4.4.tar.gz

jss.spec

@@ -1,49 +1,50 @@
+################################################################################
 Name:           jss
-Version:        4.4.3
-Release:        1%{?dist}
-Summary:        Java Security Services (JSS)
+################################################################################
 
-Group:          System Environment/Libraries
+Summary:        Java Security Services (JSS)
+URL:            http://www.dogtagpki.org/wiki/JSS
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
-URL:            http://www.mozilla.org/projects/security/pki/jss/
-# The source for this package was pulled from upstream repository.
+
+Version:        4.4.4
+Release:        1%{?_timestamp}%{?_commit_id}%{?dist}
+
+# To generate the source tarball:
 #
-# To generate the tarball with HG:
-#
-# hg clone https://hg.mozilla.org/projects/jss
+# git clone https://github.com/dogtagpki/jss.git
 # cd jss
-# hg archive --prefix jss-4.4.3/jss/ ../jss-4.4.3.tar.gz
+# git archive --format=tar.gz --prefix jss-VERSION/jss/ -o jss-VERSION.tar.gz -v HEAD
 #
-# To generate the tarball with Git:
-#
-# git clone hg::https://hg.mozilla.org/projects/jss
-# cd jss
-# git archive --format=tar.gz --prefix jss-4.4.3/jss/ -o ../jss-4.4.3.tar.gz -v HEAD
-#
-Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/%{name}-%{version}.tar.gz
-Source1:        http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/MPL-1.1.txt
-Source2:        http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/gpl.txt
-Source3:        http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/lgpl.txt
+Source:         https://github.com/dogtagpki/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
 
 Conflicts:      idm-console-framework < 1.1.17-4
 Conflicts:      pki-base < 10.4.0
 Conflicts:      tomcatjss < 7.2.1
 
+# autosetup
+BuildRequires:  git
+
 BuildRequires:  nss-devel >= 3.28.4-6
 BuildRequires:  nspr-devel >= 4.13.1
 BuildRequires:  java-devel
+BuildRequires:  jpackage-utils
 %if 0%{?fedora} >= 25 || 0%{?rhel} > 7
 BuildRequires:  perl-interpreter
 %endif
-Requires:       java-headless
+
 Requires:       nss >= 3.28.4-6
+Requires:       java-headless
+Requires:       jpackage-utils
 
 %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 javadoc
+################################################################################
+
 Summary:        Java Security Services (JSS) Javadocs
 Group:          Documentation
 Requires:       jss = %{version}-%{release}
@@ -51,9 +52,12 @@ Requires:       jss = %{version}-%{release}
 %description javadoc
 This package contains the API documentation for JSS.
 
+################################################################################
 %prep
-%autosetup -n %{name}-%{version}
 
+%autosetup -n %{name}-%{version} -p 1 -S git
+
+################################################################################
 %build
 
 %set_build_flags
@@ -99,15 +103,13 @@ make -C jss/coreconf
 make -C jss
 make -C jss javadoc
 
-%check
-
+################################################################################
 %install
-rm -rf $RPM_BUILD_ROOT docdir
 
 # Copy the license files here so we can include them in %%doc
-cp -p %{SOURCE1} .
-cp -p %{SOURCE2} .
-cp -p %{SOURCE3} .
+cp -p jss/MPL-1.1.txt .
+cp -p jss/gpl.txt .
+cp -p jss/lgpl.txt .
 
 # There is no install target so we'll do it by hand
 
@@ -128,22 +130,31 @@ popd
 install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -rp dist/jssdoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -p jss/jss.html $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -p jss/*.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 # No ldconfig is required since this library is loaded by Java itself.
+################################################################################
 %files
+
 %defattr(-,root,root,-)
-%doc jss/jss.html MPL-1.1.txt gpl.txt lgpl.txt
+%doc jss/jss.html jss/MPL-1.1.txt jss/gpl.txt jss/lgpl.txt
 %{_libdir}/jss/*
 %{_jnidir}/*
 %{_libdir}/jss/lib*.so
 
+################################################################################
 %files javadoc
+
 %defattr(-,root,root,-)
 %dir %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}-%{version}/*
 
+################################################################################
 %changelog
+
+* Tue May 29 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.4.4-1
+- Rebased to JSS 4.4.4
+
 * Thu Apr 05 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.4.3-1
 - Rebased to JSS 4.4.3
 - Red Hat Bugzilla #1548548 - Partial Fedora build flags injection

sources

@@ -1 +1 @@
-SHA512 (jss-4.4.3.tar.gz) = 4c471cc0195ece984f5cd232862e7de77ec371d8d994c72d1fb1d82ac4c3a523feda561c93c6668d3c50d6700128d56d05ab1bac918d0a618f5023afee3d36e5
+SHA512 (jss-4.4.4.tar.gz) = 206a2f26239a647b36f19277e2eebb73bfbd3bc436dabe708423498fb509956618a99c6f0532e47c7b7ddda71652612a450f7490b809866339a1d3827f7e2f51