From 4b3975aed2d0518c36c6b0bdbb3fc8a78270369c289287da45666fa04be218db Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Fri, 25 Oct 2024 09:53:21 +0000 Subject: [PATCH 1/2] - Remove Leap and SLE Micro hacks from spec file, this products have to provide correct branding packages. - Update to version 2.3+git20241025.00f69f5: * Add manual page OBS-URL: https://build.opensuse.org/package/show/devel:microos/toolbox?expand=0&rev=18 --- _service | 10 +++++----- _servicedata | 2 +- microos-toolbox-2.3+git20240704.84ec25e.tar.xz | 3 --- microos-toolbox-2.4+git20241025.00f69f5.tar.xz | 3 +++ toolbox.changes | 12 ++++++++++++ toolbox.spec | 17 ++++++----------- 6 files changed, 27 insertions(+), 20 deletions(-) delete mode 100644 microos-toolbox-2.3+git20240704.84ec25e.tar.xz create mode 100644 microos-toolbox-2.4+git20241025.00f69f5.tar.xz diff --git a/_service b/_service index 49e98aa..3d4faaf 100644 --- a/_service +++ b/_service @@ -1,14 +1,14 @@ - - 2.3 - 2.3+git%cd.%h + + 2.4 + 2.4+git%cd.%h https://github.com/openSUSE/microos-toolbox.git git enable - + xz *.tar - + diff --git a/_servicedata b/_servicedata index 0dd0107..d73f22e 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/openSUSE/microos-toolbox.git - 84ec25e7dd2f6c0677c5e91d8de7f9dbc4e9fa19 + 00f69f5b356738c8b3cc9e97a56875d7d2f4628d \ No newline at end of file diff --git a/microos-toolbox-2.3+git20240704.84ec25e.tar.xz b/microos-toolbox-2.3+git20240704.84ec25e.tar.xz deleted file mode 100644 index d441965..0000000 --- a/microos-toolbox-2.3+git20240704.84ec25e.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5922fd2e46b179e79128980062a5756901fc92e8bdd892f800999c4fa47bbe88 -size 13320 diff --git a/microos-toolbox-2.4+git20241025.00f69f5.tar.xz b/microos-toolbox-2.4+git20241025.00f69f5.tar.xz new file mode 100644 index 0000000..0369510 --- /dev/null +++ b/microos-toolbox-2.4+git20241025.00f69f5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c6add840692548efafff4f952b4147fe3ffadc225ba06f8188c881720492d66 +size 13928 diff --git a/toolbox.changes b/toolbox.changes index a3814ba..011266d 100644 --- a/toolbox.changes +++ b/toolbox.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Oct 25 09:49:28 UTC 2024 - Thorsten Kukuk + +- Remove Leap and SLE Micro hacks from spec file, this products + have to provide correct branding packages. + +------------------------------------------------------------------- +Fri Oct 25 08:42:47 UTC 2024 - kukuk@suse.com + +- Update to version 2.3+git20241025.00f69f5: + * Add manual page + ------------------------------------------------------------------- Fri Sep 27 09:30:16 UTC 2024 - Alexandre Vicenzi diff --git a/toolbox.spec b/toolbox.spec index 2c9e301..82af2ef 100644 --- a/toolbox.spec +++ b/toolbox.spec @@ -17,13 +17,14 @@ Name: toolbox -Version: 2.3+git20240704.84ec25e +Version: 2.4+git20241025.00f69f5 Release: 0 Summary: Script to start a toolbox container for system debugging License: Apache-2.0 Group: System/Management URL: https://github.com/openSUSE/microos-toolbox Source: microos-toolbox-%{version}.tar.xz +BuildRequires: pandoc Requires: (podman or docker) Suggests: podman BuildArch: noarch @@ -38,25 +39,19 @@ such a system. The root filesystem can be found at /media/root. %prep %setup -q -n microos-toolbox-%{version} -%if 0%{?sle_version} -%if !0%{?is_opensuse} -sed -i -e 's,registry.opensuse.org,registry.suse.com,' toolbox -sed -i -e 's,opensuse/toolbox,suse/sle-micro/5.5/toolbox,' toolbox -%else -sed -i -e 's,opensuse/toolbox,opensuse/leap-micro/5.5/toolbox,' toolbox -%endif -%endif %build +pandoc -s -f markdown -t man toolbox.1.md --output toolbox.1 %install -mkdir -p %{buildroot}%{_bindir} -install -m 755 toolbox %{buildroot}%{_bindir}/toolbox +install -D -m 755 toolbox %{buildroot}%{_bindir}/toolbox +install -D -m 644 toolbox.1 %{buildroot}%{_mandir}/man1/toolbox.1 %files %license LICENSE %doc README.md %{_bindir}/toolbox +%{_mandir}/man1/toolbox.1%{?ext_man} %ghost %config %{_sysconfdir}/toolboxrc %changelog From fb32856f8fc3e9561cdfa29dce90502e239e6ee2f7b9cdfb5999f0af33ecb60b Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Fri, 25 Oct 2024 17:03:29 +0000 Subject: [PATCH 2/2] - Use go-md2man instead of pandoc to convert a markdown file to nroff. The dep chain is just much, much smaller. OBS-URL: https://build.opensuse.org/package/show/devel:microos/toolbox?expand=0&rev=19 --- toolbox.changes | 6 ++++++ toolbox.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/toolbox.changes b/toolbox.changes index 011266d..e6869ab 100644 --- a/toolbox.changes +++ b/toolbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 25 14:26:17 UTC 2024 - Dominique Leuenberger + +- Use go-md2man instead of pandoc to convert a markdown file to + nroff. The dep chain is just much, much smaller. + ------------------------------------------------------------------- Fri Oct 25 09:49:28 UTC 2024 - Thorsten Kukuk diff --git a/toolbox.spec b/toolbox.spec index 82af2ef..8a3e625 100644 --- a/toolbox.spec +++ b/toolbox.spec @@ -24,7 +24,7 @@ License: Apache-2.0 Group: System/Management URL: https://github.com/openSUSE/microos-toolbox Source: microos-toolbox-%{version}.tar.xz -BuildRequires: pandoc +BuildRequires: go-md2man Requires: (podman or docker) Suggests: podman BuildArch: noarch @@ -41,7 +41,7 @@ such a system. The root filesystem can be found at /media/root. %setup -q -n microos-toolbox-%{version} %build -pandoc -s -f markdown -t man toolbox.1.md --output toolbox.1 +go-md2man -in toolbox.1.md -out toolbox.1 %install install -D -m 755 toolbox %{buildroot}%{_bindir}/toolbox