diff --git a/README.md b/README.md index 37c8d4b..7397443 100644 --- a/README.md +++ b/README.md @@ -14,20 +14,20 @@ Copyright (C) 2020-present iWay Vietnam and/or its affiliates. All rights reserv * JDK 11 or newer. * Apache Maven 3.5 or newer for Maven build. * Apache Ant 1.x for Ant build. -* rpmbuild for rpm package build. +* rpm-build for rpm package build. ### Setting up your build system * On Fedora or CentOS 8.x or Red Hat EL 7.x ```shell -dnf -y install java-11-openjdk java-11-openjdk-devel maven ant git rpmbuild +dnf -y install java-11-openjdk java-11-openjdk-devel maven ant git make rpmdevtools rpm-build ``` * On CentOS 7.x or Red Hat EL 7.x ```shell -yum -y install java-11-openjdk java-11-openjdk-devel maven ant git rpmbuild +yum -y install java-11-openjdk java-11-openjdk-devel maven ant git make rpmdevtools rpm-build ``` * On Debian or Ubuntu ```shell -apt install -y openjdk-11-jdk maven ant git +apt install -y openjdk-11-jdk maven ant git make ``` ### Clone code from git repository @@ -75,7 +75,7 @@ Wrote: ~/rpmbuild/RPMS/noarch/zm-sso-1.0.0-1.el7.noarch.rpm cd ~/projects/zimbra/zm-sso ssh root@zimbra.server "mkdir -p /opt/zimbra/lib/ext/zm-sso" scp target/*.jar root@zimbra.server:/opt/zimbra/lib/ext/zm-sso -scp target/dependencies/*.jar root@zimbra.server:/opt/zimbra/jetty_base/common/lib +scp target/dependencies/*.jar root@zimbra.server:/opt/zimbra/lib/ext-common scp conf/zm.sso.properties root@zimbra.server:/opt/zimbra/conf ``` * Restart mailbox to load the extension. diff --git a/rpms/zm-sso.spec b/rpms/zm-sso.spec index e850ac8..43052ef 100644 --- a/rpms/zm-sso.spec +++ b/rpms/zm-sso.spec @@ -23,10 +23,10 @@ mvn clean package %install mkdir -p $RPM_BUILD_ROOT/opt/zimbra/lib/ext/zm-sso -mkdir -p $RPM_BUILD_ROOT/opt/zimbra/jetty_base/common/lib +mkdir -p $RPM_BUILD_ROOT/opt/zimbra/lib/ext-common mkdir -p $RPM_BUILD_ROOT/opt/zimbra/conf cp -R target/*.jar $RPM_BUILD_ROOT/opt/zimbra/lib/ext/zm-sso -cp -R target/dependencies/*.jar $RPM_BUILD_ROOT/opt/zimbra/jetty_base/common/lib +cp -R target/dependencies/*.jar $RPM_BUILD_ROOT/opt/zimbra/lib/ext-common cp -R conf/zm.sso.properties $RPM_BUILD_ROOT/opt/zimbra/conf %posttrans @@ -39,9 +39,9 @@ su - zimbra -c "zmprov fc all" %files /opt/zimbra/lib/ext/zm-sso/*.jar -/opt/zimbra/jetty_base/common/lib/*.jar +/opt/zimbra/lib/ext-common/*.jar /opt/zimbra/conf/zm.sso.properties %changelog -* Thu Apr 20 2021 Nguyen Van Nguyen - 1.0.0-1 +* Fri Apr 21 2021 Nguyen Van Nguyen - 1.0.0-1 - Initial release 1.0.0.