From 3d2a7abe9d16cb7946960f1564213f2b5366610e Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Mon, 15 Oct 2018 09:09:48 -0400 Subject: [PATCH 1/2] Update dependencies for jss >= 4.5.0 Signed-off-by: Alexander Scheel --- 389-console.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/389-console.spec b/389-console.spec index 76d8678..4f2fb63 100644 --- a/389-console.spec +++ b/389-console.spec @@ -6,7 +6,7 @@ Name: 389-console Version: %{major_version}.%{minor_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: 389 Management Console License: LGPLv2 @@ -34,7 +34,7 @@ Administration Server and 389 Directory Server. %prep %setup -q - + %build %{ant} \ -Dbuilt.dir=`pwd`/built \ @@ -61,7 +61,7 @@ ADDITIONAL_JARS=\${ADDITIONAL_JARS:-%{name}_\$mylang.jar} ADDITIONAL_OPTIONS=\${ADDITIONAL_OPTIONS:-"-Djava.util.prefs.systemRoot=\$HOME/.%{name} -Djava.util.prefs.userRoot=\$HOME/.%{name}"} EOF chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/java/%{name}.conf -%jpackage_script com.netscape.management.client.console.Console "" "" jss4.jar:ldapjdk.jar:idm-console-base.jar:idm-console-mcc.jar:idm-console-mcc_%{consolelang}.jar:idm-console-nmclf.jar:idm-console-nmclf_%{consolelang}.jar %{name} true +%jpackage_script com.netscape.management.client.console.Console "" "" apache-commons-codec.jar:apache-commons-lang.jar:slf4j-api.jar:jss4.jar:ldapjdk.jar:idm-console-base.jar:idm-console-mcc.jar:idm-console-mcc_%{consolelang}.jar:idm-console-nmclf.jar:idm-console-nmclf_%{consolelang}.jar %{name} true install -d $RPM_BUILD_ROOT%{_mandir}/man8 install -m644 built%{_mandir}/man8/* $RPM_BUILD_ROOT%{_mandir}/man8 @@ -73,6 +73,10 @@ install -m644 built%{_mandir}/man8/* $RPM_BUILD_ROOT%{_mandir}/man8 %{_mandir}/man8/* %changelog +* Mon Feb 25 2019 Alexander Scheel - 1.1.19-4 +- Update classpath for jss >= 4.5.0 +- rhbz: 1634525 + * Thu Jan 31 2019 Fedora Release Engineering - 1.1.19-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 13c26ea059b58c348b0f23c9f39a878a35e72c32 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Fri, 6 Sep 2019 09:41:41 -0400 Subject: [PATCH 2/2] Bump version to 1.1.19-5 Add slf4j requirement --- 389-console.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/389-console.spec b/389-console.spec index 4f2fb63..3206060 100644 --- a/389-console.spec +++ b/389-console.spec @@ -6,7 +6,7 @@ Name: 389-console Version: %{major_version}.%{minor_version} -Release: 4%{?dist} +Release: 5%{?dist} Summary: 389 Management Console License: LGPLv2 @@ -17,6 +17,7 @@ Source: https://releases.pagure.org/389-ds-base/%{name}-%{version}.tar.bz2 Requires: idm-console-framework Requires: java-headless >= 1.8.0 Requires: jpackage-utils +Requires: slf4j BuildRequires: ant BuildRequires: ldapjdk BuildRequires: jss @@ -73,6 +74,10 @@ install -m644 built%{_mandir}/man8/* $RPM_BUILD_ROOT%{_mandir}/man8 %{_mandir}/man8/* %changelog +* Fri Sep 6 2019 Mark Reynolds - 1.1.19-5 +- Bump version to 1.1.19-5 +- Add slf4j requirement + * Mon Feb 25 2019 Alexander Scheel - 1.1.19-4 - Update classpath for jss >= 4.5.0 - rhbz: 1634525