From 8edccca09da591fe5864507a7b6fa558671bd2a7 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 30 Sep 2024 17:01:07 +0000 Subject: [PATCH] import CS yggdrasil-worker-package-manager-0.2.2-2.el9 --- .fmf/version | 1 - .gitignore | 6 +--- .yggdrasil-worker-package-manager.metadata | 1 + README.md | 3 -- ...d5ac3d5731750c935e1e23e9f4add49bff48.patch | 0 .../yggdrasil-worker-package-manager.spec | 30 ++++++++----------- gating.yaml | 6 ---- plans/main.fmf | 5 ---- sources | 1 - tests/smoke/main.fmf | 3 -- 10 files changed, 14 insertions(+), 42 deletions(-) delete mode 100644 .fmf/version create mode 100644 .yggdrasil-worker-package-manager.metadata delete mode 100644 README.md rename 8c19d5ac3d5731750c935e1e23e9f4add49bff48.patch => SOURCES/8c19d5ac3d5731750c935e1e23e9f4add49bff48.patch (100%) rename yggdrasil-worker-package-manager.spec => SPECS/yggdrasil-worker-package-manager.spec (77%) delete mode 100644 gating.yaml delete mode 100644 plans/main.fmf delete mode 100644 sources delete mode 100644 tests/smoke/main.fmf diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index ab82d11..11a320c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -/yggdrasil-worker-package-manager-0.2.0.tar.gz -/yggdrasil-worker-package-manager-0.2.0.tar.xz -/yggdrasil-worker-package-manager-0.2.1.tar.xz -/yggdrasil-worker-package-manager-0.2.2.tar.xz -/yggdrasil-worker-package-manager-0.2.3.tar.xz +SOURCES/yggdrasil-worker-package-manager-0.2.2.tar.xz diff --git a/.yggdrasil-worker-package-manager.metadata b/.yggdrasil-worker-package-manager.metadata new file mode 100644 index 0000000..d84fa57 --- /dev/null +++ b/.yggdrasil-worker-package-manager.metadata @@ -0,0 +1 @@ +8a3caef5716c6571d51ff6a478c76717862af943 SOURCES/yggdrasil-worker-package-manager-0.2.2.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 4d4072c..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# yggdrasil-worker-package-manager - -The yggdrasil-worker-package-manager package diff --git a/8c19d5ac3d5731750c935e1e23e9f4add49bff48.patch b/SOURCES/8c19d5ac3d5731750c935e1e23e9f4add49bff48.patch similarity index 100% rename from 8c19d5ac3d5731750c935e1e23e9f4add49bff48.patch rename to SOURCES/8c19d5ac3d5731750c935e1e23e9f4add49bff48.patch diff --git a/yggdrasil-worker-package-manager.spec b/SPECS/yggdrasil-worker-package-manager.spec similarity index 77% rename from yggdrasil-worker-package-manager.spec rename to SPECS/yggdrasil-worker-package-manager.spec index 4855108..a0f732a 100644 --- a/yggdrasil-worker-package-manager.spec +++ b/SPECS/yggdrasil-worker-package-manager.spec @@ -2,8 +2,8 @@ # https://github.com/redhatinsights/yggdrasil-worker-package-manager %global goipath github.com/redhatinsights/yggdrasil-worker-package-manager -Version: 0.2.3 -%global tag v%{version} +Version: 0.2.2 +%global tag %{version} %gometa -f @@ -18,23 +18,24 @@ the provided allow-pattern regular expressions.} %global godocs README.md Name: yggdrasil-worker-package-manager -Release: %autorelease +Release: 2%{?dist} Summary: Package manager worker for yggdrasil License: GPL-3.0-only URL: %{gourl} -Source: %{url}/releases/download/%{tag}/%{name}-%{version}.tar.xz +Source: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz + +Patch100: 8c19d5ac3d5731750c935e1e23e9f4add49bff48.patch BuildRequires: systemd-rpm-macros BuildRequires: meson BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(systemd) -BuildRequires: golang >= 1.21 %description %{common_description} %prep %goprep %{?rhel:-k} +%autopatch -p1 %{?rhel:-M 99} %if %{undefined rhel} %generate_buildrequires @@ -56,15 +57,6 @@ export %gomodulesmode %gocheck %endif -%post -%systemd_post com.redhat.Yggdrasil1.Worker1.package_manager.service - -%preun -%systemd_preun com.redhat.Yggdrasil1.Worker1.package_manager.service - -%postun -%systemd_postun_with_restart com.redhat.Yggdrasil1.Worker1.package_manager.service - %files %license LICENSE %if %{defined rhel} @@ -74,8 +66,10 @@ export %gomodulesmode %{_libexecdir}/* %config(noreplace) %{_sysconfdir}/%{name} %{_datadir}/dbus-1/system-services/* -%{_datadir}/dbus-1/system.d/* -%{_unitdir} %changelog -%autochangelog +* Tue Jul 9 2024 Link Dupont - 0.2.2-2 +- Drop generation of automatic Go source package + +* Mon Jul 8 2024 Link Dupont - 0.2.2-1 +- Initial package (RHEL-29802) diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 4ca9235..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-10 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/plans/main.fmf b/plans/main.fmf deleted file mode 100644 index c1627f9..0000000 --- a/plans/main.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Basic smoke test -discover: - how: fmf -execute: - how: tmt diff --git a/sources b/sources deleted file mode 100644 index 6bc9811..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (yggdrasil-worker-package-manager-0.2.3.tar.xz) = 15dad8bb905fb5a4062d6d51b4975de75fccdcaab6202758a8e5fc613b450d305c5ad1ea6554b7aa39cdef0743a69e82594c883a5500c9bc51453cadc1799abe diff --git a/tests/smoke/main.fmf b/tests/smoke/main.fmf deleted file mode 100644 index e08a3f3..0000000 --- a/tests/smoke/main.fmf +++ /dev/null @@ -1,3 +0,0 @@ -summary: Run yggdrasil-worker-package-manager --help -test: /usr/libexec/yggdrasil-worker-package-manager --help -duration: 5m