From 57ee417dc2b342b36cf6bc86abd12a05e74d6edf Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Thu, 21 May 2020 09:50:52 -0400 Subject: [PATCH] Change LICENSE file location --- dirty-rpmbuild | 2 +- prep-tarball | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dirty-rpmbuild b/dirty-rpmbuild index 618aba3..20e5c60 100755 --- a/dirty-rpmbuild +++ b/dirty-rpmbuild @@ -118,7 +118,7 @@ fi /etc/goconserver %config(noreplace) /etc/goconserver/server.conf /usr/share/goconserver/dist/ -/usr/share/goconserver/doc/LICENSE.html +/usr/share/doc/goconserver/LICENSE.html /usr/lib/systemd/system/goconserver.service /usr/bin/goconserver /usr/bin/congo diff --git a/prep-tarball b/prep-tarball index d097285..650758e 100755 --- a/prep-tarball +++ b/prep-tarball @@ -87,7 +87,7 @@ mkdir -p "${TMP_DIR}/repack/usr/lib/systemd/system" mkdir -p "${TMP_DIR}/repack/var/log/goconserver/nodes" mkdir -p "${TMP_DIR}/repack/var/lib/goconserver" mkdir -p "${TMP_DIR}/repack/usr/share/goconserver/dist" -mkdir -p "${TMP_DIR}/repack/usr/share/goconserver/doc" +mkdir -p "${TMP_DIR}/repack/usr/share/doc/goconserver" chmod 0700 "${TMP_DIR}/repack/etc/goconserver" \ "${TMP_DIR}/repack/var/log/goconserver" \ "${TMP_DIR}/repack/var/log/goconserver/nodes" \ @@ -112,8 +112,8 @@ install -o root -g root -m 0644 -D \ "${TMP_DIR}/extract/goconserver_linux_${ARCH}/dist/"* \ "${TMP_DIR}/repack/usr/share/goconserver/dist" install -o root -g root -m 0644 -D \ - "${TMP_DIR}/extract/goconserver_linux_${ARCH}/LICENSE.html"* \ - "${TMP_DIR}/repack/usr/share/goconserver/doc" + "${TMP_DIR}/extract/goconserver_linux_${ARCH}/LICENSE.html" \ + "${TMP_DIR}/repack/usr/share/doc/goconserver" ( cd "${TMP_DIR}/repack" && tar cfz - *) >"${GOCONSERVER_REPACK_TARBALL}"