From 4d8609e66ea530708d2a738b22e3ef3cfa50591877b6fbd32818bebed9079bd0 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Mon, 31 Aug 2020 15:47:21 +0000 Subject: [PATCH 1/3] - Add README.packaging for packagers OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=42 --- README.packaging | 40 ++++++++++++++++++++++++++++++++++++++++ cockpit.changes | 5 +++++ 2 files changed, 45 insertions(+) create mode 100644 README.packaging diff --git a/README.packaging b/README.packaging new file mode 100644 index 0000000..d35e71e --- /dev/null +++ b/README.packaging @@ -0,0 +1,40 @@ +The upstream cockpit spec file is rather complex and ugly. It does +contain information we need though, such as the bundled node +modules. Therefore the package reuses the upstream spec file and +applies openSUSE specifics that upstream doesn't accept on top. For +that purpose a git repo tracks the spec file changes: +https://github.com/lnussel/cockpit + +There' an opensuse-$VERSION branch for each release + +For simple fixes it's fine to just submit the spec file by OBS +means, I'll retrofit in git. Don't worry about that. + +For version updates the git workflow really is needed to maintain +mental health though. + +The following workflow is used to update the package to a newer +version: + +- create a branch for the new version based on the old one: + git checkout -b opensuse-$NEW_VERSION opensuse-$OLD_VERSION +- use interactive rebase to amend the commits marked as EDIT THIS: + git rebase -i $NEW_VERSION + * for the very fist commit download the new tarball and extract + the spec file from it. Copy the spec file over + tools/cockpit.spec. That is basically what changed between the + versions wrt spec file. + * the second one adjust the spec file to have $NEW_VERSION. For + whatever reason the upstream spec file alwas has version 0. + * the rest of the changes should just apply. +- copy the spec file back into the OBS checkout and continue with + regular tasks related to updating packages. +- If any further spec file changes were needed, copy the spec back + into the git tree and commit there. Amend and reorder as needed. +- When done, push the git repo. + +Sending fixes upstream: + +if you have any changes that should go upstream, create a new, clean +branch and cherry pick *one* commit into it. Upstream wants pull +requests with only one commit diff --git a/cockpit.changes b/cockpit.changes index 2d2e050..ef7278e 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 31 15:46:35 UTC 2020 - Ludwig Nussel + +- Add README.packaging for packagers + ------------------------------------------------------------------- Fri Aug 14 12:09:24 UTC 2020 - Ludwig Nussel From bb997c14a63a99b36e569b5d58365e61953557d0496ccd91011085de18554af5 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Mon, 7 Sep 2020 07:51:41 +0000 Subject: [PATCH 2/3] Accepting request 832534 from home:kukuk:container - cockpit-ws: don't require systemd (allows to build a very small cockpit-ws container) OBS-URL: https://build.opensuse.org/request/show/832534 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=43 --- cockpit.changes | 6 ++++++ cockpit.spec | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/cockpit.changes b/cockpit.changes index ef7278e..46e4df7 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 4 12:09:16 UTC 2020 - Thorsten Kukuk + +- cockpit-ws: don't require systemd (allows to build a very small + cockpit-ws container) + ------------------------------------------------------------------- Mon Aug 31 15:46:35 UTC 2020 - Ludwig Nussel diff --git a/cockpit.spec b/cockpit.spec index 59294c0..3c189da 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -472,12 +472,16 @@ Requires: group(wheel) Conflicts: firewalld < 0.6.0-1 Recommends: sscg >= 2.3 Recommends: system-logos +%if !0%{?suse_version} Requires: systemd >= 235 +%endif Suggests: sssd-dbus Requires(pre): permissions +%if !0%{?suse_version} Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +%endif %description ws The Cockpit Web Service listens on the network, and authenticates users. From a1b02fd2c96133cb517862ca5b0680604dd5683b3700726293febc7062b0aeaa Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Mon, 7 Sep 2020 08:09:51 +0000 Subject: [PATCH 3/3] add readme as source OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=44 --- cockpit.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/cockpit.spec b/cockpit.spec index 3c189da..b5bc804 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -86,6 +86,7 @@ Source0: https://github.com/cockpit-project/cockpit/releases/download/%{v %endif Source1: cockpit.pam Source2: cockpit-rpmlintrc +Source99: README.packaging BuildRequires: gcc BuildRequires: pkgconfig(gio-unix-2.0)