From 5c68eb9b5d1b5caccf420a2387bddd2d84cc2483 Mon Sep 17 00:00:00 2001 From: Owen-sz Date: Sat, 7 Sep 2024 16:32:25 -0500 Subject: [PATCH 01/11] initial package for stardust-comet --- anda/stardust/comet/anda.hcl | 8 +++++ anda/stardust/comet/stardust-comet.spec | 40 +++++++++++++++++++++++++ anda/stardust/comet/update.rhai | 7 +++++ 3 files changed, 55 insertions(+) create mode 100644 anda/stardust/comet/anda.hcl create mode 100644 anda/stardust/comet/stardust-comet.spec create mode 100644 anda/stardust/comet/update.rhai diff --git a/anda/stardust/comet/anda.hcl b/anda/stardust/comet/anda.hcl new file mode 100644 index 0000000000..95ba7c5843 --- /dev/null +++ b/anda/stardust/comet/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "stardust-comet.spec" + } + labels { + nightly = 1 + } +} diff --git a/anda/stardust/comet/stardust-comet.spec b/anda/stardust/comet/stardust-comet.spec new file mode 100644 index 0000000000..c8a3902fdf --- /dev/null +++ b/anda/stardust/comet/stardust-comet.spec @@ -0,0 +1,40 @@ +%global commit afbf6109398794791ffb30317712d742143fd08a +%global commit_date 20240831 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global debug_package %{nil} +%define __os_install_post %{nil} + +Name: stardust-comet +Version: %commit_date.%shortcommit +Release: 1%?dist +Summary: Annotate things in Stardust. +URL: https://github.com/StardustXR/comet +Source0: https://github.com/StardustXR/comet/archive/%commit/comet-%commit.tar.gz +License: MIT +BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold +Requires: libgcc glibc + +Provides: comet +Conflicts: comet + +%description +Annotate things in Stardust + +%prep +%autosetup -n comet-%commit +%cargo_prep_online + +%build +%cargo_build + +%install +%cargo_install + +%files +%_bindir/comet +%license LICENSE +%doc README.md + +%changelog +* Sat Sep 7 2024 Owen-sz +- Package StardustXR comet diff --git a/anda/stardust/comet/update.rhai b/anda/stardust/comet/update.rhai new file mode 100644 index 0000000000..c9bda82d60 --- /dev/null +++ b/anda/stardust/comet/update.rhai @@ -0,0 +1,7 @@ +if filters.contains("nightly") { + rpm.global("commit", gh_commit("StardustXR/comet")); + if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); + } +} From 6a5ca77601e8fcf57931f23dc8c6f65b8351b9c5 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 8 Sep 2024 02:43:17 -0500 Subject: [PATCH 02/11] RPM bug workaround in stardust-comet.spec Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/comet/stardust-comet.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/stardust/comet/stardust-comet.spec b/anda/stardust/comet/stardust-comet.spec index c8a3902fdf..2aae557446 100644 --- a/anda/stardust/comet/stardust-comet.spec +++ b/anda/stardust/comet/stardust-comet.spec @@ -1,8 +1,8 @@ %global commit afbf6109398794791ffb30317712d742143fd08a %global commit_date 20240831 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global debug_package %{nil} -%define __os_install_post %{nil} +# Exclude input files from mangling +%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ Name: stardust-comet Version: %commit_date.%shortcommit From a279c778d50d7e3beb0be83885e87b168dae8d69 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 8 Sep 2024 03:08:50 -0500 Subject: [PATCH 03/11] Remove conflicts Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/comet/stardust-comet.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/anda/stardust/comet/stardust-comet.spec b/anda/stardust/comet/stardust-comet.spec index 2aae557446..5fa7f6d199 100644 --- a/anda/stardust/comet/stardust-comet.spec +++ b/anda/stardust/comet/stardust-comet.spec @@ -15,7 +15,6 @@ BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold Requires: libgcc glibc Provides: comet -Conflicts: comet %description Annotate things in Stardust From 57f93c04bcc86019e8a2d29619febd388ac78e56 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:30:17 -0500 Subject: [PATCH 04/11] Update stardust-comet.spec Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/comet/stardust-comet.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/anda/stardust/comet/stardust-comet.spec b/anda/stardust/comet/stardust-comet.spec index 5fa7f6d199..8f09f7ba75 100644 --- a/anda/stardust/comet/stardust-comet.spec +++ b/anda/stardust/comet/stardust-comet.spec @@ -9,7 +9,7 @@ Version: %commit_date.%shortcommit Release: 1%?dist Summary: Annotate things in Stardust. URL: https://github.com/StardustXR/comet -Source0: https://github.com/StardustXR/comet/archive/%commit/comet-%commit.tar.gz +Source0: %url/archive/%commit/comet-%commit.tar.gz License: MIT BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold Requires: libgcc glibc @@ -24,7 +24,6 @@ Annotate things in Stardust %cargo_prep_online %build -%cargo_build %install %cargo_install From 4f602857fd5a0eaf72402fada43e55c434f0cf29 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:31:02 -0500 Subject: [PATCH 05/11] Update stardust-comet.spec Add packager Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/comet/stardust-comet.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/stardust/comet/stardust-comet.spec b/anda/stardust/comet/stardust-comet.spec index 8f09f7ba75..9278729096 100644 --- a/anda/stardust/comet/stardust-comet.spec +++ b/anda/stardust/comet/stardust-comet.spec @@ -15,6 +15,7 @@ BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold Requires: libgcc glibc Provides: comet +Packager: Owen Zimmerman %description Annotate things in Stardust From 2139be2aae7bc90a24b14ae15c138e2600cf85ca Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 10 Sep 2024 23:31:58 -0500 Subject: [PATCH 06/11] Update stardust-comet.spec Remove runtime requirements Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/comet/stardust-comet.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/anda/stardust/comet/stardust-comet.spec b/anda/stardust/comet/stardust-comet.spec index 9278729096..9b2f5668c0 100644 --- a/anda/stardust/comet/stardust-comet.spec +++ b/anda/stardust/comet/stardust-comet.spec @@ -12,7 +12,6 @@ URL: https://github.com/StardustXR/comet Source0: %url/archive/%commit/comet-%commit.tar.gz License: MIT BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold -Requires: libgcc glibc Provides: comet Packager: Owen Zimmerman From 3cf558b0226f980977ee5904265493736ab5ba76 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 10 Sep 2024 23:32:43 -0500 Subject: [PATCH 07/11] Update update.rhai Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/comet/update.rhai | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/anda/stardust/comet/update.rhai b/anda/stardust/comet/update.rhai index c9bda82d60..f73e076772 100644 --- a/anda/stardust/comet/update.rhai +++ b/anda/stardust/comet/update.rhai @@ -1,7 +1,5 @@ -if filters.contains("nightly") { - rpm.global("commit", gh_commit("StardustXR/comet")); - if rpm.changed() { - rpm.release(); - rpm.global("commit_date", date()); - } -} +rpm.global("commit", gh_commit("StardustXR/comet")); + if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); + } From f38db436866366be869b82684948cd91060bce08 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Tue, 10 Sep 2024 23:40:22 -0500 Subject: [PATCH 08/11] Update update.rhai Fix indentation Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/comet/update.rhai | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/stardust/comet/update.rhai b/anda/stardust/comet/update.rhai index f73e076772..e9531f24ba 100644 --- a/anda/stardust/comet/update.rhai +++ b/anda/stardust/comet/update.rhai @@ -1,5 +1,5 @@ rpm.global("commit", gh_commit("StardustXR/comet")); - if rpm.changed() { - rpm.release(); - rpm.global("commit_date", date()); - } +if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); +} From 313063d3d710d9e811997ff9ba402e2f1c4b8fdc Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Thu, 12 Sep 2024 12:46:18 -0500 Subject: [PATCH 09/11] Update stardust-comet.spec Lock cargo install Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/comet/stardust-comet.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/stardust/comet/stardust-comet.spec b/anda/stardust/comet/stardust-comet.spec index 9b2f5668c0..f94e3ac0cf 100644 --- a/anda/stardust/comet/stardust-comet.spec +++ b/anda/stardust/comet/stardust-comet.spec @@ -26,6 +26,7 @@ Annotate things in Stardust %build %install +%define __cargo_common_opts %{?_smp_mflags} -Z avoid-dev-deps --locked %cargo_install %files From ef4a3d5c2a6bd43e0c45d26dc1ca28b4e3703f07 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:03:44 -0500 Subject: [PATCH 10/11] Update stardust-comet.spec add %summary Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/comet/stardust-comet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/stardust/comet/stardust-comet.spec b/anda/stardust/comet/stardust-comet.spec index f94e3ac0cf..43d06d4885 100644 --- a/anda/stardust/comet/stardust-comet.spec +++ b/anda/stardust/comet/stardust-comet.spec @@ -17,7 +17,7 @@ Provides: comet Packager: Owen Zimmerman %description -Annotate things in Stardust +%summary %prep %autosetup -n comet-%commit From fea02bcbd37583537d139fd708f0801ff93fc0ce Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:23:10 -0500 Subject: [PATCH 11/11] Update stardust-comet.spec Unify summaries Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/comet/stardust-comet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/stardust/comet/stardust-comet.spec b/anda/stardust/comet/stardust-comet.spec index 43d06d4885..35c8c9159d 100644 --- a/anda/stardust/comet/stardust-comet.spec +++ b/anda/stardust/comet/stardust-comet.spec @@ -7,7 +7,7 @@ Name: stardust-comet Version: %commit_date.%shortcommit Release: 1%?dist -Summary: Annotate things in Stardust. +Summary: Annotate things in Stardust XR. URL: https://github.com/StardustXR/comet Source0: %url/archive/%commit/comet-%commit.tar.gz License: MIT