From ada56aecb842f5d506ac8e5154ceafa8ee315a7b5a39bc96b88540807b955516 Mon Sep 17 00:00:00 2001 From: Max Lin Date: Wed, 5 Nov 2025 16:05:35 +0800 Subject: [PATCH 1/2] Deleted patchinfo package --- patchinfo.ga/_patchinfo | 96 ----------------------------------------- 1 file changed, 96 deletions(-) delete mode 100644 patchinfo.ga/_patchinfo diff --git a/patchinfo.ga/_patchinfo b/patchinfo.ga/_patchinfo deleted file mode 100644 index 06199ca..0000000 --- a/patchinfo.ga/_patchinfo +++ /dev/null @@ -1,96 +0,0 @@ - - msmeissn - important - no_updateinfo - - Initial (GA) content of the Standard codestream - This patchinfo is intended to preserve the GA contents before start shipping updates. - -After its initial build it should never be rebuilt. - -CoreFreq -MozillaFirefox-branding-openSUSE:MozillaFirefox-branding-openSUSE -MozillaFirefox-branding-openSUSE:firefox-esr-branding-openSUSE -NetworkManager-branding:openSUSE -PackageKit-branding-openSUSE -agama-products -baseiso-containment -branding-openSUSE -budgie-desktop-branding -cdemu-daemon -cinnamon -cinnamon-session -cinnamon-translations -desktop-data-openSUSE -distribution-logos-openSUSE -dracula-gtk-theme -droidcam -enlightenment-branding-openSUSE -enlightenment-profiles-openSUSE -enlightenment-theme-openSUSE -epiphany-branding-openSUSE -facetimehd -framework-laptop -gasket-driver -gcdemu -gdm-branding-openSUSE -glib2-branding:openSUSE -gnome-branding-Leap -gtk2-branding:openSUSE -gtk3-branding:openSUSE -gtk4-branding:openSUSE -hardinfo2 -hdjmod -hicolor-icon-theme-branding-openSUSE -icewm-theme-branding:openSUSE -lightdm-gtk-greeter-branding-openSUSE -live-net-installer -mate-branding-openSUSE -mcomix -memtest86+ -mhvtl -msr-safe -muffin -openSUSE-EULAs -openSUSE-build-key -openSUSE-repos:openSUSE-repos-Leap -openSUSEway -opensuse-migration-tool -opensuse-welcome -opensuse-welcome-launcher -ovpn-dco -patterns-base -patterns-cinnamon -patterns-devel-base -patterns-enlightenment -patterns-gnome -patterns-kde -patterns-lxqt -patterns-mate -patterns-server -patterns-xfce -pcmanfm-qt -plasma6-openSUSE -plasma6-welcome -python-PyMuPDF -rage -release-notes-openSUSE -rpm-repos-openSUSE -sddm -sddm:qt6 -skelcd-openSUSE -slick-greeter-branding-openSUSE -systemd-presets-branding-openSUSE -terminology -terminology-theme-dark -terminology-theme-openSUSE -terminology-theme-openSUSE-oliveleaf -tp_smapi -v4l2loopback -vendor-reset -vhba-kmp -wallpapers-openSUSE-extra -xfce4-branding-openSUSE -xpadneo -xtables-addons - \ No newline at end of file -- 2.51.1 From bf00031d9300ee6d342eca3bc969ac41abe9859efb39e9b1d7067d287dfb264d Mon Sep 17 00:00:00 2001 From: Max Lin Date: Wed, 5 Nov 2025 16:05:58 +0800 Subject: [PATCH 2/2] Reset Leap 16.1 configurations --- _config | 23 +++++---------- _maintainership.json | 2 +- staging.config | 4 +-- workflow.config | 69 +++++--------------------------------------- 4 files changed, 18 insertions(+), 80 deletions(-) diff --git a/_config b/_config index 689c03c..f96c570 100644 --- a/_config +++ b/_config @@ -1,5 +1,9 @@ -Release: . spec:lp160.. +%if 0%{?is_stage_project} +Release: . spec:lp161.999999.. +%else +Release: . spec:lp161.. +%endif # uncomment before RC phase to get aaa_base-malloccheck etc. # make sure to rebuild patterns-base and skelcd-openSUSE @@ -193,7 +197,7 @@ Macros: %if 0%{?_is_in_project} Macros: %vendor openSUSE -%distribution openSUSE Leap 16.0 +%distribution openSUSE Leap 16.1 %packager https://bugs.opensuse.org :Macros %endif @@ -220,10 +224,6 @@ Substitute: system-packages:podman podman buildah createrepo_c release-compare c # conflict of provider of docker-stable with docker, docker-stable-buildx with docker-buildx Prefer: -docker-stable -docker-stable-buildx -# %if "%_project" == "openSUSE:Leap:16.0" -# BuildFlags: excludebuild:openh264 -# %endif - Substitute: kiwi-setup:image python3-kiwi createrepo_c Substitute: kiwi-image:tbz python3-kiwi Substitute: kiwi-image:iso kiwi-systemdeps-iso-media qemu-tools @@ -1955,15 +1955,6 @@ Macros: # END MULTIMEDIA STUFF -# BEGIN GIMP STUFF - remove this section when gimp3 is ready -# %if "%_project" == "openSUSE:Leap:16.0" -# Macros: -# Do not build python plugin in gimp2 -# %_without_python_plugin 1 -# :Macros -# %endif -# END GIMP STUFF - # Default to Java 17 Prefer: java-21-openjdk-devel java-21-openjdk java-21-openjdk-headless java-21-openjdk-javadoc Prefer: java-17-openjdk-devel java-17-openjdk java-17-openjdk-headless java-17-openjdk-javadoc @@ -2193,7 +2184,7 @@ Prefer: -go1.18-openssl # Leap specific package list, the same list with excludebuild must add to Backports project # Most of package should be built in Backports -%if "%_project" == "openSUSE:Leap:16.0" +%if "%_project" == "openSUSE:Leap:16.1" # excluding the failed/unresolvable package %ifarch i586 # unresolvable diff --git a/_maintainership.json b/_maintainership.json index a136c7c..4577d79 100644 --- a/_maintainership.json +++ b/_maintainership.json @@ -1,3 +1,3 @@ { - "": ["maintenance-release-review"] + "": ["maxlin_factory", "lkocman-factory"] } diff --git a/staging.config b/staging.config index 4dc8ca9..1d42a8c 100644 --- a/staging.config +++ b/staging.config @@ -1,4 +1,4 @@ { - "ObsProject": "openSUSE:Leap:16.0", - "StagingProject": "openSUSE:Leap:16.0:PullRequest" + "ObsProject": "openSUSE:Leap:16.1", + "StagingProject": "openSUSE:Leap:16.1:PullRequest" } diff --git a/workflow.config b/workflow.config index 66a7fcd..7cbc8e5 100644 --- a/workflow.config +++ b/workflow.config @@ -1,74 +1,21 @@ { "Workflows": ["pr"], - "GitProjectName": "openSUSE/Leap#leap-16.0", + "GitProjectName": "openSUSE/Leap#leap-16.1", "Organization": "pool", - "Branch": "Leap-16.0", + "Branch": "Leap-16.1", "ManualMergeProject": true, - "NoProjectGitPR": true, "Reviewers": [ - "*maintenance-release-review", - "*opensuse-review", + "*leap-review", "+legaldb", - "-autogits_obs_staging_bot", - "-qam-openqa-review" + "-autogits_obs_staging_bot" ], "ReviewGroups": [ { - "Name": "maintenance-release-review", + "Name": "leap-review", "Reviewers": [ - "abergmann", - "amattiazzo", - "bfilho", - "cmatos", - "crazybyte", - "emanuelecappello", - "gsonnu", - "maintenance-robot", - "mauriziogalli", - "mbozicevic", - "mimi_vx", - "mschnitzer", - "msmeissn", - "pluskalm", - "rfrohl", - "slemke" - ], - "Silent": true - }, - { - "Name": "opensuse-review", - "Reviewers": [ - "alarrosa", - "anag", - "atartamo", - "bigironman", - "darix", - "dimstar", - "dmach", - "eroca", - "jdsn", - "jengelh", - "mcalabkova", - "mstrigl", - "nkrapp", - "oertel", - "RBrownSUSE", - "simotek", - "smithfarm" - ], - "Silent": true - }, - { - "Name": "qam-openqa-review", - "Reviewers": [ - "mimi_vx", - "mschnitzer", - "msmeissn", - "openqa-maintenance", - "foursixnine-openqa", - "szarate" - ], - "Silent": true + "maxlin_factory", + "lkocman-factory" + ] } ] } -- 2.51.1