diff --git a/.gitignore b/.gitignore index 94a9f70..b6c61f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /pki-10.6.3.tar.gz /pki-10.6.4.tar.gz +/pki-10.6.5.tar.gz diff --git a/copr-build.sh b/copr-build.sh new file mode 100755 index 0000000..156c705 --- /dev/null +++ b/copr-build.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +REPO=$1 + +if [ "$REPO" == "" ]; then + REPO="pki-10.6" +fi + +fedpkg copr-build --nowait $REPO diff --git a/dogtag-pki.spec b/dogtag-pki.spec index 7f12346..d7ce9a7 100644 --- a/dogtag-pki.spec +++ b/dogtag-pki.spec @@ -15,7 +15,7 @@ License: GPLv2 and LGPLv2 ExcludeArch: aarch64 s390x %endif -Version: 10.6.4 +Version: 10.6.5 Release: 1%{?_timestamp}%{?_commit_id}%{?dist} # global _phase -a1 @@ -81,20 +81,6 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver %define java_home %{_usr}/lib/jvm/jre-1.8.0-openjdk -################################################################################ -# Tomcat -################################################################################ - -%if 0%{?rhel} && 0%{?rhel} <= 7 -%global app_server tomcat-7.0 -%else -%if 0%{?fedora} && 0%{?fedora} <= 27 -%global app_server tomcat-8.0 -%else -%global app_server tomcat-8.5 -%endif -%endif - ################################################################################ # RESTEasy ################################################################################ @@ -336,8 +322,8 @@ BuildRequires: jpackage-utils >= 0:1.7.5-10 BuildRequires: jss >= 4.4.0-11 BuildRequires: tomcatjss >= 7.2.1-4 %else -BuildRequires: jss >= 4.5.0-0.4 -BuildRequires: tomcatjss >= 7.3.3 +BuildRequires: jss >= 4.5.0-0.6 +BuildRequires: tomcatjss >= 7.3.4 %endif BuildRequires: systemd-units @@ -427,7 +413,7 @@ Requires: jpackage-utils >= 0:1.7.5-10 %if 0%{?rhel} && 0%{?rhel} <= 7 Requires: jss >= 4.4.0-11 %else -Requires: jss >= 4.5.0-0.4 +Requires: jss >= 4.5.0-0.6 %endif Requires: nss >= 3.36.1 @@ -566,7 +552,7 @@ Requires: jpackage-utils >= 0:1.7.5-10 %if 0%{?rhel} && 0%{?rhel} <= 7 Requires: jss >= 4.4.0-11 %else -Requires: jss >= 4.5.0-0.4 +Requires: jss >= 4.5.0-0.6 %endif Requires: ldapjdk >= 4.19-5 Requires: pki-base >= %{version}-%{release} @@ -698,7 +684,6 @@ Requires: tomcat >= 7.0.69 %else %if 0%{?fedora} && 0%{?fedora} <= 27 Requires: tomcat >= 8.0.49 -Conflicts: tomcat >= 1:8.5 %else %if 0%{?fedora} && 0%{?fedora} <= 28 Requires: tomcat >= 1:8.5.23 @@ -716,7 +701,7 @@ Requires(pre): shadow-utils %if 0%{?rhel} && 0%{?rhel} <= 7 Requires: tomcatjss >= 7.2.1-4 %else -Requires: tomcatjss >= 7.3.3 +Requires: tomcatjss >= 7.3.4 %endif %if 0%{?rhel} && 0%{?rhel} <= 7 @@ -1054,6 +1039,15 @@ Dogtag textual and graphical user interface for PKI Console. %build ################################################################################ +# get Tomcat . version number +tomcat_version=`/usr/sbin/tomcat version | sed -n 's/Server number: *\([0-9]\+\.[0-9]\+\).*/\1/p'` + +if [ $tomcat_version == "9.0" ]; then + app_server=tomcat-8.5 +else + app_server=tomcat-$tomcat_version +fi + %{__mkdir_p} build cd build %cmake \ @@ -1063,7 +1057,7 @@ cd build -DJAVA_HOME=%{java_home} \ -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \ -DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \ - -DAPP_SERVER=%{app_server} \ + -DAPP_SERVER=$app_server \ -DJAXRS_API_JAR=%{jaxrs_api_jar} \ -DRESTEASY_LIB=%{resteasy_lib} \ -DNSS_DEFAULT_DB_TYPE=%{nss_default_db_type} \ @@ -1712,13 +1706,16 @@ fi ################################################################################ %changelog +* Wed Aug 08 2018 Dogtag PKI Team - 10.6.5-1 +- Rebased to PKI 10.6.5 + * Fri Jul 20 2018 Dogtag PKI Team - 10.6.4-1 - Rebased to PKI 10.6.4 * Thu Jul 12 2018 Fedora Release Engineering - 10.6.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -* Thu Jul 5 2018 Dogtag PKI Team - 10.6.3-1 +* Thu Jul 05 2018 Dogtag PKI Team - 10.6.3-1 - Rebased to PKI 10.6.3 * Fri Jun 15 2018 Dogtag PKI Team - 10.6.2-1 @@ -1729,20 +1726,20 @@ fi - Updated Tomcat dependency - Fixed rpmlint warnings -* Fri May 4 2018 Dogtag PKI Team - 10.6.1-2 +* Fri May 04 2018 Dogtag PKI Team - 10.6.1-2 - Bugzilla #1574711: pki-tools cannot be installed on current Rawhide - Fixed rpmlint warnings -* Thu May 3 2018 Dogtag PKI Team - 10.6.1-1 +* Thu May 03 2018 Dogtag PKI Team - 10.6.1-1 - Rebased to PKI 10.6.1 - Bugzilla #1559047: pki-core misses a dependency to pki-symkey - Bugzilla #1573094: FreeIPA external CA installation fails -* Thu May 3 2018 Dogtag PKI Team - 10.6.1-1 +* Thu May 03 2018 Dogtag PKI Team - 10.6.1-1 - Rebased to PKI 10.6.1 - Bugzilla #1559047: pki-core misses a dependency to pki-symkey -* Mon Apr 9 2018 Dogtag PKI Team - 10.6.0-1 +* Mon Apr 09 2018 Dogtag PKI Team - 10.6.0-1 - Updated project URL - Cleaned up spec file - Fixed README location diff --git a/sources b/sources index a93f40f..fe8cf3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pki-10.6.4.tar.gz) = ec521f9f50a36c3fc5032d3029d1fc264efaac0f9684f7800fa009a12c3f8649e7f53a99d1b44100e27eb22aaac2f3217d6a951113dd72b97c34d20b5aef2a1b +SHA512 (pki-10.6.5.tar.gz) = e86e540e3211bd560f330d33cd61c4ad2d81a6451e251879df0062a3ae2272041d1d52866d04b2ac4bab56c6ad9cc63c37b67babd6e69a80e13674dac3488b35 diff --git a/sources-update.sh b/sources-update.sh new file mode 100755 index 0000000..96129ca --- /dev/null +++ b/sources-update.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +SOURCE=$1 +TARGET=`basename $1` + +cp $SOURCE $TARGET +sha512sum --tag $TARGET > sources