Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cockpit for openSUSE:Factory checked in at 2026-09-07 11:28:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cockpit (Old) and /work/SRC/openSUSE:Factory/.cockpit.new.1265 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cockpit" Mon Sep 7 11:28:33 2026 rev:78 rq:1375321 version:365 Changes: -------- --- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2026-08-29 17:40:26.378975381 +0200 +++ /work/SRC/openSUSE:Factory/.cockpit.new.1265/cockpit.changes 2026-09-07 11:30:05.738608110 +0200 @@ -1,0 +2,6 @@ +Thu Aug 27 14:46:56 UTC 2026 - Alice Brooks <[email protected]> + +- Symlink opensuse's branding to opensuse-leap as they should share the same + (bsc#1268639) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cockpit.spec ++++++ --- /var/tmp/diff_new_pack.1JunLO/_old 2026-09-07 11:30:08.189693995 +0200 +++ /var/tmp/diff_new_pack.1JunLO/_new 2026-09-07 11:30:08.191694065 +0200 @@ -475,6 +475,9 @@ sed -i "s|%{buildroot}||" *.list +# Leap shares the same branding as opensuse +ln -s ./opensuse %{buildroot}%{_datadir}/cockpit/branding/opensuse-leap + %if 0%{?suse_version} test -e %{buildroot}/usr/share/cockpit/branding/opensuse/default-1920x1200.jpg || install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/opensuse/default-1920x1200.jpg test -e %{buildroot}/usr/share/cockpit/branding/suse/apple-touch-icon.png || install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/suse/apple-touch-icon.png ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.1JunLO/_old 2026-09-07 11:30:08.329698900 +0200 +++ /var/tmp/diff_new_pack.1JunLO/_new 2026-09-07 11:30:08.336699146 +0200 @@ -1,6 +1,7 @@ -mtime: 1786615798 -commit: 8c1a350153a951aef8d861a1bc2f75e6522b025cb4aa0e876b5d4d8df58bcbc8 +mtime: 1787842071 +commit: c7b22ff22a99d6df40799c8a8afceaed45f3979a5a901bf91e968b93c6898d56 url: https://src.opensuse.org/cockpit/cockpit -revision: 8c1a350153a951aef8d861a1bc2f75e6522b025cb4aa0e876b5d4d8df58bcbc8 +revision: c7b22ff22a99d6df40799c8a8afceaed45f3979a5a901bf91e968b93c6898d56 +trackingbranch: main projectscmsync: https://src.opensuse.org/cockpit/_ObsPrj.git ++++++ build.specials.obscpio ++++++ ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2026-08-27 16:47:51.000000000 +0200 @@ -0,0 +1,3 @@ +.osc +node_modules.sums +_build* \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/update_version.sh new/update_version.sh --- old/update_version.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/update_version.sh 2026-08-27 16:47:51.000000000 +0200 @@ -0,0 +1,121 @@ +#!/usr/bin/bash + +set -e + +curVersion=$(grep Version: cockpit.spec | sed -e 's,^\(\s*Version:\s*\)\(.*\)\s*$,\2,') + +if [[ ! "$curVersion" =~ ^[0-9]+(.[0-9]+)?$ ]]; then + echo "Error: curVersion is not a valid integer" + exit 1 +fi + +if [[ "$curVersion" =~ '.' ]]; then + curMajor=$(echo ${curVersion} | cut -d'.' -f1) + curMinor=$(echo ${curVersion} | cut -d'.' -f2) +else + curMajor=$curVersion + curMinor='0' +fi + +### +### Fetch latest soruces +### + +# fetch latest theme +if [ ! -d cockpit-suse-theme ]; then + git clone https://github.com/dgdavid/cockpit-suse-theme.git +else + git -C cockpit-suse-theme pull --ff-only +fi +git -C cockpit-suse-theme archive --format=tar --prefix=cockpit-suse-theme/ -o ../cockpit-suse-theme.tar HEAD + +# fetch latest cockpit +if [ ! -d cockpit ]; then + git clone https://github.com/cockpit-project/cockpit.git cockpit +else + git -C cockpit checkout main + git -C cockpit fetch +fi + +newVersion=$(git -C cockpit tag | grep '^[0-9.]\+$' | sort -rn | head -1) + +if [[ ! "$newVersion" =~ ^[0-9]+(.[0-9]+)?$ ]]; then + echo "Error: newVersion cannot be determined" + exit 1 +fi + +if [[ "$newVersion" =~ '.' ]]; then + newMajor=$(echo ${newVersion} | cut -d'.' -f1) + newMinor=$(echo ${newVersion} | cut -d'.' -f2) +else + newMajor=$newVersion + newMinor='0' +fi + +if [ "$curMajor" -gt "$newMajor" ]; then + echo "Nothing to do." + exit 0 +elif [[ "$curMajor" -eq "$newMajor" && "$curMinor" -ge "$newMinor" ]]; then + echo "Nothing to do." + exit 0 +fi + +### +### UPDATE +### +git -C cockpit checkout $newVersion +pushd $PWD +cd cockpit +npm install --include optional +rm -rf node_modules +popd +cp "cockpit/package-lock.json" . +# update node_modules +osc service mr +rm --verbose *.tgz || true + +# # initialize all submodules +git -C cockpit submodule update --init --depth 1 +# remove node_modules and tests +git -C cockpit submodule deinit node_modules test/reference + +# update tarballs +CockpitPath="cockpit-$newVersion/" +MainTarball="cockpit.tar" +D=$PWD + +git -C cockpit archive --format=tar --prefix=$CockpitPath -o "$D/$MainTarball" $newVersion + +# append each initialized submodule +git -C cockpit submodule foreach "n=\$(basename \$sm_path) +git archive --format=tar --prefix=${CockpitPath}\${sm_path}/ -o \"$D/\$n.tar\" HEAD +" +SubmoduleTarballs=$(git -C cockpit submodule foreach --quiet "echo \$(basename \$sm_path.tar)") + +# need to unpack and pack again, because OBS can't deal with concatenated tarballs :( +rm -f "cockpit-$newVersion.tar" +rm -rf cockpit-$newVersion/ +for i in $MainTarball $SubmoduleTarballs; do + tar xf $i +done +rm $MainTarball $SubmoduleTarballs +tar zcf cockpit-$newVersion.tar.gz cockpit-$newVersion/ + +echo "Archive created: cockpit-$newVersion.tar" + +# Update spec file +git -C cockpit remote show suse || git -C cockpit remote add suse [email protected]:openSUSE/cockpit.git +git -C cockpit fetch suse opensuse-$curVersion +git -C cockpit checkout -b opensuse-$newVersion suse/opensuse-$curVersion +git -C cockpit rebase -i $newVersion || true + +echo "Don't forget to:" +echo " 1. finish rebase" +echo " 2. push new branch" +echo " 3. update cockpit.spec, and" +echo " 4. set new default branch on GitHub" + +# Updating version in spec file +sed -i -e "s,^\(\s*Version:\s*\)\(.*\)\s*$,\1${newVersion}," cockpit/tools/cockpit.spec +git rm cockpit-$curVersion.tar.gz +git add cockpit-$newVersion.tar.gz
