1
0
forked from cockpit/cockpit
Go to file
Dominique Leuenberger 65dce311ed Accepting request 1192625 from systemsmanagement:cockpit
fix changes file to not delete a changes entry for Factory (forwarded request 1192616 from jzerebecki)

OBS-URL: https://build.opensuse.org/request/show/1192625
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cockpit?expand=0&rev=49
2024-08-10 17:06:02 +00:00
_service - new version 321: 2024-07-31 08:50:16 +00:00
_servicedata - Merge SUSE branding into cockpit package 2022-09-13 16:16:08 +00:00
.gitattributes - new version 321: 2024-07-31 08:50:16 +00:00
.gitignore - Initial release 0.38 2015-02-07 13:28:40 +00:00
0001-selinux-allow-login-to-read-motd-file.patch Accepting request 1090518 from home:adamm:branches:systemsmanagement:cockpit 2023-06-02 14:08:12 +00:00
0002-selinux-temporary-remove-setroubleshoot-section.patch Accepting request 1043313 from home:djz88:branches:systemsmanagement:cockpit 2023-01-09 18:40:38 +00:00
0004-leap-gnu18-removal.patch - 0004-leap-gnu18-removal.patch: added support for Leap thanks to Lubos 2023-07-21 13:35:50 +00:00
cockpit-321.tar - new version 321: 2024-07-31 08:50:16 +00:00
cockpit-rpmlintrc Accepting request 1175756 from home:ldragon:branches:systemsmanagement:cockpit 2024-05-23 09:19:23 +00:00
cockpit-suse-theme.obsinfo Don't use set_version service for cockpit-suse-theme 2022-09-14 12:13:34 +00:00
cockpit-suse-theme.tar - new version 321: 2024-07-31 08:50:16 +00:00
cockpit.changes Accepting request 1192616 from home:jzerebecki:branches:systemsmanagement:cockpit 2024-08-08 12:53:02 +00:00
cockpit.obsinfo Accepting request 1185135 from home:ldragon:branches:systemsmanagement:cockpit 2024-07-03 15:00:29 +00:00
cockpit.pam temporary remove pam_oath, so we can update factory/15.6 2024-08-08 11:04:59 +00:00
cockpit.spec OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=195 2024-08-08 11:05:27 +00:00
css-overrides.patch - new version 307: 2023-12-29 10:04:26 +00:00
fix-libexecdir.patch - Fix libexecdir for leap and sle (bsc#1223533) 2024-08-08 10:48:31 +00:00
hide-pcp.patch Accepting request 1090518 from home:adamm:branches:systemsmanagement:cockpit 2023-06-02 14:08:12 +00:00
node_modules.obscpio - new version 321: 2024-07-31 08:50:16 +00:00
node_modules.spec.inc - new version 321: 2024-07-31 08:50:16 +00:00
package-lock.json - new version 321: 2024-07-31 08:50:16 +00:00
README.packaging - new version 321: 2024-07-31 08:50:16 +00:00
selinux_libdir.patch Accepting request 1153493 from home:cahu:branches:systemsmanagement:cockpit 2024-03-04 13:32:21 +00:00
storage-btrfs.patch Accepting request 1185135 from home:ldragon:branches:systemsmanagement:cockpit 2024-07-03 15:00:29 +00:00
suse_docs.patch Accepting request 1185097 from home:abrooks:branches:systemsmanagement:cockpit 2024-07-03 10:51:49 +00:00
suse-microos-branding.patch - suse-microos-branding.patch: fix branding for SLE Micro 2024-02-15 14:32:01 +00:00
update_version.sh OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=187 2024-07-31 09:24:27 +00:00

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/openSUSE/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.

Updates are now mostly automated with the update_version.sh script.
You still need to follow last 3 steps manually.

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

NOTE: ONLY the .spec file should be in the git.

IDEA: maybe other things should be removed from the git tree then?