Hello community,
here is the log from the commit of package cockpit for openSUSE:Factory checked
in at 2020-09-09 18:01:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cockpit (Old)
and /work/SRC/openSUSE:Factory/.cockpit.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cockpit"
Wed Sep 9 18:01:11 2020 rev:5 rq:832694 version:225
Changes:
--------
--- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2020-08-15
21:20:56.331642468 +0200
+++ /work/SRC/openSUSE:Factory/.cockpit.new.3399/cockpit.changes
2020-09-09 18:07:28.815500584 +0200
@@ -1,0 +2,11 @@
+Fri Sep 4 12:09:16 UTC 2020 - Thorsten Kukuk <ku...@suse.com>
+
+- 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 <lnus...@suse.de>
+
+- Add README.packaging for packagers
+
+-------------------------------------------------------------------
New:
----
README.packaging
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cockpit.spec ++++++
--- /var/tmp/diff_new_pack.ITxFlj/_old 2020-09-09 18:07:29.847501524 +0200
+++ /var/tmp/diff_new_pack.ITxFlj/_new 2020-09-09 18:07:29.851501528 +0200
@@ -86,6 +86,7 @@
%endif
Source1: cockpit.pam
Source2: cockpit-rpmlintrc
+Source99: README.packaging
BuildRequires: gcc
BuildRequires: pkgconfig(gio-unix-2.0)
@@ -472,12 +473,16 @@
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.
++++++ README.packaging ++++++
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
