From c0508977c769cc87fcdce5c1e42423553a18c1e6 Mon Sep 17 00:00:00 2001 From: Ben Grande Date: Mon, 24 Jun 2024 17:11:46 +0200 Subject: [PATCH] build: remove unpackaged hidden files Dotfiles build failed as it is a submodule and contains ".git" and "LICENSES". Hidden files in the base directory are normally used to specify configuration of tools for development, not usable in packages. For: https://github.com/ben-grande/qusal/issues/59 --- rpm_spec/qusal-ansible.spec | 5 ++++- rpm_spec/qusal-browser.spec | 5 ++++- rpm_spec/qusal-debian-minimal.spec | 5 ++++- rpm_spec/qusal-debian-xfce.spec | 5 ++++- rpm_spec/qusal-debian.spec | 5 ++++- rpm_spec/qusal-dev.spec | 5 ++++- rpm_spec/qusal-docker.spec | 5 ++++- rpm_spec/qusal-dom0.spec | 5 ++++- rpm_spec/qusal-dotfiles.spec | 5 ++++- rpm_spec/qusal-electrum.spec | 5 ++++- rpm_spec/qusal-element.spec | 5 ++++- rpm_spec/qusal-fedora-minimal.spec | 5 ++++- rpm_spec/qusal-fedora-xfce.spec | 5 ++++- rpm_spec/qusal-fedora.spec | 5 ++++- rpm_spec/qusal-fetcher.spec | 5 ++++- rpm_spec/qusal-kicksecure-minimal.spec | 5 ++++- rpm_spec/qusal-mail.spec | 5 ++++- rpm_spec/qusal-media.spec | 5 ++++- rpm_spec/qusal-mgmt.spec | 5 ++++- rpm_spec/qusal-mirage-builder.spec | 5 ++++- rpm_spec/qusal-opentofu.spec | 5 ++++- rpm_spec/qusal-qubes-builder.spec | 11 ++++++++++- rpm_spec/qusal-reader.spec | 5 ++++- rpm_spec/qusal-remmina.spec | 5 ++++- rpm_spec/qusal-signal.spec | 5 ++++- rpm_spec/qusal-ssh.spec | 5 ++++- rpm_spec/qusal-sys-audio.spec | 5 ++++- rpm_spec/qusal-sys-bitcoin.spec | 5 ++++- rpm_spec/qusal-sys-cacher.spec | 5 ++++- rpm_spec/qusal-sys-electrs.spec | 5 ++++- rpm_spec/qusal-sys-electrumx.spec | 5 ++++- rpm_spec/qusal-sys-firewall.spec | 5 ++++- rpm_spec/qusal-sys-git.spec | 5 ++++- rpm_spec/qusal-sys-mirage-firewall.spec | 5 ++++- rpm_spec/qusal-sys-net.spec | 5 ++++- rpm_spec/qusal-sys-pgp.spec | 8 +++++++- rpm_spec/qusal-sys-pihole.spec | 5 ++++- rpm_spec/qusal-sys-print.spec | 5 ++++- rpm_spec/qusal-sys-rsync.spec | 5 ++++- rpm_spec/qusal-sys-ssh-agent.spec | 5 ++++- rpm_spec/qusal-sys-ssh.spec | 5 ++++- rpm_spec/qusal-sys-syncthing.spec | 5 ++++- rpm_spec/qusal-sys-usb.spec | 5 ++++- rpm_spec/qusal-sys-wireguard.spec | 5 ++++- rpm_spec/qusal-terraform.spec | 5 ++++- rpm_spec/qusal-usb.spec | 5 ++++- rpm_spec/qusal-utils.spec | 5 ++++- rpm_spec/qusal-vault.spec | 5 ++++- rpm_spec/qusal-video-companion.spec | 5 ++++- rpm_spec/qusal-whonix-gateway.spec | 5 ++++- rpm_spec/qusal-whonix-workstation.spec | 5 ++++- rpm_spec/template/template.spec | 5 ++++- scripts/spec-gen.sh | 11 +++++------ 53 files changed, 222 insertions(+), 58 deletions(-) diff --git a/rpm_spec/qusal-ansible.spec b/rpm_spec/qusal-ansible.spec index 6211206..1accdb9 100644 --- a/rpm_spec/qusal-ansible.spec +++ b/rpm_spec/qusal-ansible.spec @@ -62,7 +62,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-browser.spec b/rpm_spec/qusal-browser.spec index 87e9098..9234f5a 100644 --- a/rpm_spec/qusal-browser.spec +++ b/rpm_spec/qusal-browser.spec @@ -70,7 +70,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-debian-minimal.spec b/rpm_spec/qusal-debian-minimal.spec index 91b388b..09be9af 100644 --- a/rpm_spec/qusal-debian-minimal.spec +++ b/rpm_spec/qusal-debian-minimal.spec @@ -64,7 +64,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-debian-xfce.spec b/rpm_spec/qusal-debian-xfce.spec index c68f4b8..14f9a15 100644 --- a/rpm_spec/qusal-debian-xfce.spec +++ b/rpm_spec/qusal-debian-xfce.spec @@ -61,7 +61,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-debian.spec b/rpm_spec/qusal-debian.spec index 9159c8c..156a07f 100644 --- a/rpm_spec/qusal-debian.spec +++ b/rpm_spec/qusal-debian.spec @@ -61,7 +61,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-dev.spec b/rpm_spec/qusal-dev.spec index be11749..db9879b 100644 --- a/rpm_spec/qusal-dev.spec +++ b/rpm_spec/qusal-dev.spec @@ -68,7 +68,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-docker.spec b/rpm_spec/qusal-docker.spec index 1102789..58e1a90 100644 --- a/rpm_spec/qusal-docker.spec +++ b/rpm_spec/qusal-docker.spec @@ -62,7 +62,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-dom0.spec b/rpm_spec/qusal-dom0.spec index 5b50451..69cc970 100644 --- a/rpm_spec/qusal-dom0.spec +++ b/rpm_spec/qusal-dom0.spec @@ -64,7 +64,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-dotfiles.spec b/rpm_spec/qusal-dotfiles.spec index b00a4ca..f2259d2 100644 --- a/rpm_spec/qusal-dotfiles.spec +++ b/rpm_spec/qusal-dotfiles.spec @@ -76,7 +76,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-electrum.spec b/rpm_spec/qusal-electrum.spec index 45baf6e..cab34ac 100644 --- a/rpm_spec/qusal-electrum.spec +++ b/rpm_spec/qusal-electrum.spec @@ -78,7 +78,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-element.spec b/rpm_spec/qusal-element.spec index 4e44d24..b4e61f8 100644 --- a/rpm_spec/qusal-element.spec +++ b/rpm_spec/qusal-element.spec @@ -63,7 +63,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-fedora-minimal.spec b/rpm_spec/qusal-fedora-minimal.spec index f9a5275..c200117 100644 --- a/rpm_spec/qusal-fedora-minimal.spec +++ b/rpm_spec/qusal-fedora-minimal.spec @@ -64,7 +64,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-fedora-xfce.spec b/rpm_spec/qusal-fedora-xfce.spec index d8aaceb..e6c5eb0 100644 --- a/rpm_spec/qusal-fedora-xfce.spec +++ b/rpm_spec/qusal-fedora-xfce.spec @@ -61,7 +61,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-fedora.spec b/rpm_spec/qusal-fedora.spec index a0f0b8d..c82a2d9 100644 --- a/rpm_spec/qusal-fedora.spec +++ b/rpm_spec/qusal-fedora.spec @@ -61,7 +61,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-fetcher.spec b/rpm_spec/qusal-fetcher.spec index 38b6b8a..cc02f89 100644 --- a/rpm_spec/qusal-fetcher.spec +++ b/rpm_spec/qusal-fetcher.spec @@ -71,7 +71,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-kicksecure-minimal.spec b/rpm_spec/qusal-kicksecure-minimal.spec index e8627c1..f335f57 100644 --- a/rpm_spec/qusal-kicksecure-minimal.spec +++ b/rpm_spec/qusal-kicksecure-minimal.spec @@ -63,7 +63,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-mail.spec b/rpm_spec/qusal-mail.spec index 758af3c..54f3c09 100644 --- a/rpm_spec/qusal-mail.spec +++ b/rpm_spec/qusal-mail.spec @@ -81,7 +81,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-media.spec b/rpm_spec/qusal-media.spec index c7b0eb3..55d4fd7 100644 --- a/rpm_spec/qusal-media.spec +++ b/rpm_spec/qusal-media.spec @@ -64,7 +64,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-mgmt.spec b/rpm_spec/qusal-mgmt.spec index a8e998a..4958652 100644 --- a/rpm_spec/qusal-mgmt.spec +++ b/rpm_spec/qusal-mgmt.spec @@ -65,7 +65,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-mirage-builder.spec b/rpm_spec/qusal-mirage-builder.spec index a96e8cb..d47f995 100644 --- a/rpm_spec/qusal-mirage-builder.spec +++ b/rpm_spec/qusal-mirage-builder.spec @@ -69,7 +69,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-opentofu.spec b/rpm_spec/qusal-opentofu.spec index c6b54c5..378e725 100644 --- a/rpm_spec/qusal-opentofu.spec +++ b/rpm_spec/qusal-opentofu.spec @@ -63,7 +63,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-qubes-builder.spec b/rpm_spec/qusal-qubes-builder.spec index d19deda..6a61104 100644 --- a/rpm_spec/qusal-qubes-builder.spec +++ b/rpm_spec/qusal-qubes-builder.spec @@ -74,7 +74,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post @@ -117,6 +120,12 @@ fi %dnl TODO: missing '%ghost', files generated during %post, such as Qrexec policies. %changelog +* Mon Jun 24 2024 Ben Grande - d0ed3a8 +- fix: repository dir uses debug directory + +* Mon Jun 24 2024 Ben Grande - c7fb371 +- fix: reference Salt dependency installation state + * Mon Jun 24 2024 Ben Grande - 620fa10 - fix: shutdown template before install state diff --git a/rpm_spec/qusal-reader.spec b/rpm_spec/qusal-reader.spec index ca51175..842dfa0 100644 --- a/rpm_spec/qusal-reader.spec +++ b/rpm_spec/qusal-reader.spec @@ -65,7 +65,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-remmina.spec b/rpm_spec/qusal-remmina.spec index 3953071..6798ac4 100644 --- a/rpm_spec/qusal-remmina.spec +++ b/rpm_spec/qusal-remmina.spec @@ -63,7 +63,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-signal.spec b/rpm_spec/qusal-signal.spec index 1a5a365..1a5010c 100644 --- a/rpm_spec/qusal-signal.spec +++ b/rpm_spec/qusal-signal.spec @@ -63,7 +63,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-ssh.spec b/rpm_spec/qusal-ssh.spec index 380cdc2..1d70943 100644 --- a/rpm_spec/qusal-ssh.spec +++ b/rpm_spec/qusal-ssh.spec @@ -68,7 +68,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-sys-audio.spec b/rpm_spec/qusal-sys-audio.spec index 3f5e968..284b407 100644 --- a/rpm_spec/qusal-sys-audio.spec +++ b/rpm_spec/qusal-sys-audio.spec @@ -66,7 +66,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-sys-bitcoin.spec b/rpm_spec/qusal-sys-bitcoin.spec index 680dca7..735cca5 100644 --- a/rpm_spec/qusal-sys-bitcoin.spec +++ b/rpm_spec/qusal-sys-bitcoin.spec @@ -89,7 +89,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-sys-cacher.spec b/rpm_spec/qusal-sys-cacher.spec index 46fae43..637ce09 100644 --- a/rpm_spec/qusal-sys-cacher.spec +++ b/rpm_spec/qusal-sys-cacher.spec @@ -81,7 +81,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-sys-electrs.spec b/rpm_spec/qusal-sys-electrs.spec index 57f7894..15b4423 100644 --- a/rpm_spec/qusal-sys-electrs.spec +++ b/rpm_spec/qusal-sys-electrs.spec @@ -76,7 +76,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-sys-electrumx.spec b/rpm_spec/qusal-sys-electrumx.spec index 3672c90..dbc39d4 100644 --- a/rpm_spec/qusal-sys-electrumx.spec +++ b/rpm_spec/qusal-sys-electrumx.spec @@ -76,7 +76,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-sys-firewall.spec b/rpm_spec/qusal-sys-firewall.spec index 0559614..312182f 100644 --- a/rpm_spec/qusal-sys-firewall.spec +++ b/rpm_spec/qusal-sys-firewall.spec @@ -67,7 +67,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-sys-git.spec b/rpm_spec/qusal-sys-git.spec index d225d82..84dd23a 100644 --- a/rpm_spec/qusal-sys-git.spec +++ b/rpm_spec/qusal-sys-git.spec @@ -67,7 +67,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-sys-mirage-firewall.spec b/rpm_spec/qusal-sys-mirage-firewall.spec index d6e7965..1e7a439 100644 --- a/rpm_spec/qusal-sys-mirage-firewall.spec +++ b/rpm_spec/qusal-sys-mirage-firewall.spec @@ -68,7 +68,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-sys-net.spec b/rpm_spec/qusal-sys-net.spec index 441f7f2..dc9baf2 100644 --- a/rpm_spec/qusal-sys-net.spec +++ b/rpm_spec/qusal-sys-net.spec @@ -70,7 +70,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-sys-pgp.spec b/rpm_spec/qusal-sys-pgp.spec index fca756d..19828c9 100644 --- a/rpm_spec/qusal-sys-pgp.spec +++ b/rpm_spec/qusal-sys-pgp.spec @@ -66,7 +66,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post @@ -108,6 +111,9 @@ fi %dnl TODO: missing '%ghost', files generated during %post, such as Qrexec policies. %changelog +* Mon Jun 24 2024 Ben Grande - beaf07d +- fix: include shell profile sourcer + * Fri Jun 21 2024 Ben Grande - c84dfea - fix: generate RPM Specs for Qubes Builder V2 diff --git a/rpm_spec/qusal-sys-pihole.spec b/rpm_spec/qusal-sys-pihole.spec index 3c80477..54cbbb1 100644 --- a/rpm_spec/qusal-sys-pihole.spec +++ b/rpm_spec/qusal-sys-pihole.spec @@ -73,7 +73,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-sys-print.spec b/rpm_spec/qusal-sys-print.spec index 9893fae..914aafb 100644 --- a/rpm_spec/qusal-sys-print.spec +++ b/rpm_spec/qusal-sys-print.spec @@ -67,7 +67,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-sys-rsync.spec b/rpm_spec/qusal-sys-rsync.spec index 03cccb7..505b8de 100644 --- a/rpm_spec/qusal-sys-rsync.spec +++ b/rpm_spec/qusal-sys-rsync.spec @@ -70,7 +70,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-sys-ssh-agent.spec b/rpm_spec/qusal-sys-ssh-agent.spec index a444773..74d7333 100644 --- a/rpm_spec/qusal-sys-ssh-agent.spec +++ b/rpm_spec/qusal-sys-ssh-agent.spec @@ -76,7 +76,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-sys-ssh.spec b/rpm_spec/qusal-sys-ssh.spec index 271fd98..ea6e884 100644 --- a/rpm_spec/qusal-sys-ssh.spec +++ b/rpm_spec/qusal-sys-ssh.spec @@ -72,7 +72,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-sys-syncthing.spec b/rpm_spec/qusal-sys-syncthing.spec index 9271d1a..f953915 100644 --- a/rpm_spec/qusal-sys-syncthing.spec +++ b/rpm_spec/qusal-sys-syncthing.spec @@ -69,7 +69,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-sys-usb.spec b/rpm_spec/qusal-sys-usb.spec index b453a8d..f032344 100644 --- a/rpm_spec/qusal-sys-usb.spec +++ b/rpm_spec/qusal-sys-usb.spec @@ -62,7 +62,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-sys-wireguard.spec b/rpm_spec/qusal-sys-wireguard.spec index 1ba679f..b431733 100644 --- a/rpm_spec/qusal-sys-wireguard.spec +++ b/rpm_spec/qusal-sys-wireguard.spec @@ -64,7 +64,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-terraform.spec b/rpm_spec/qusal-terraform.spec index fddb2b1..32f79d3 100644 --- a/rpm_spec/qusal-terraform.spec +++ b/rpm_spec/qusal-terraform.spec @@ -62,7 +62,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-usb.spec b/rpm_spec/qusal-usb.spec index eb642f5..ce8e5ba 100644 --- a/rpm_spec/qusal-usb.spec +++ b/rpm_spec/qusal-usb.spec @@ -64,7 +64,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-utils.spec b/rpm_spec/qusal-utils.spec index 733b8a4..a6c4cbf 100644 --- a/rpm_spec/qusal-utils.spec +++ b/rpm_spec/qusal-utils.spec @@ -61,7 +61,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-vault.spec b/rpm_spec/qusal-vault.spec index da96331..17c004a 100644 --- a/rpm_spec/qusal-vault.spec +++ b/rpm_spec/qusal-vault.spec @@ -64,7 +64,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-video-companion.spec b/rpm_spec/qusal-video-companion.spec index 0d3d5fa..890ae4f 100644 --- a/rpm_spec/qusal-video-companion.spec +++ b/rpm_spec/qusal-video-companion.spec @@ -63,7 +63,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-whonix-gateway.spec b/rpm_spec/qusal-whonix-gateway.spec index f13d04a..4727ebb 100644 --- a/rpm_spec/qusal-whonix-gateway.spec +++ b/rpm_spec/qusal-whonix-gateway.spec @@ -62,7 +62,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/qusal-whonix-workstation.spec b/rpm_spec/qusal-whonix-workstation.spec index 3bd9b26..a203695 100644 --- a/rpm_spec/qusal-whonix-workstation.spec +++ b/rpm_spec/qusal-whonix-workstation.spec @@ -63,7 +63,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}/srv/salt/qusal/%{name} %post diff --git a/rpm_spec/template/template.spec b/rpm_spec/template/template.spec index 6c52e72..2171cf9 100644 --- a/rpm_spec/template/template.spec +++ b/rpm_spec/template/template.spec @@ -60,7 +60,10 @@ for license in $(echo "%{license_csv}" | tr "," " "); do done install -m 644 salt/%{project}/README.md %{buildroot}%{_docdir}/%{name}/ -rm -rf salt/%{project}/LICENSES salt/%{project}/README.md +rm -rf \ + salt/%{project}/LICENSES \ + salt/%{project}/README.md + salt/%{project}/.* cp -rv salt/%{project} %{buildroot}@FILE_ROOTS@/%{name} %post diff --git a/scripts/spec-gen.sh b/scripts/spec-gen.sh index 31b1a42..7ab7682 100755 --- a/scripts/spec-gen.sh +++ b/scripts/spec-gen.sh @@ -13,7 +13,6 @@ usage(){ ## Escape multiline strings for sed. escape_key(){ key_type="${1}" - key_indent=" " if test "${key_type}" = "scriptlet"; then echo "${2}" | sed ':a;N;$!ba;s/\n/\\n /g' | sed 's/\$/\\$/' elif test "${key_type}" = "text"; then @@ -44,10 +43,6 @@ get_spec(){ gen_spec(){ project="${1}" - ignored="$(git ls-files --exclude-standard --others --ignored)" - untracked="$(git ls-files --exclude-standard --others)" - unwanted="$(printf %s"${ignored}\n${untracked}\n" \ - | grep "^salt/\S\+/README.md" | cut -d "/" -f2 | sort -u)" if echo "${unwanted}" | grep -q "^${project}$"; then echo "warn: skipping spec generation of untracked formula: ${project}" >&2 @@ -139,10 +134,14 @@ esac command -v git >/dev/null || { echo "Missing program: git" >&2; exit 1; } cd "$(git rev-parse --show-toplevel)" -./scripts/requires-program.sh vim spec_get="./scripts/spec-get.sh" +ignored="$(git ls-files --exclude-standard --others --ignored salt/)" +untracked="$(git ls-files --exclude-standard --others salt/)" +unwanted="$(printf %s"${ignored}\n${untracked}\n" \ + | grep "^salt/\S\+/README.md" | cut -d "/" -f2 | sort -u)" + if test "${2-}" = "test"; then gen_spec "${1}" test exit