[gtk] fix rpm package version

.gitea/workflows/gtk-rpm-release.yaml

@@ -10,11 +10,15 @@ permissions:
   releases: write
   packages: write
 
+env:
+  RPM_DISTRO_NAME: fedora
+  RPM_DISTRO_VERSION: '43'
+
 jobs:
   build-gtk-rpm-release:
     runs-on: ubuntu-latest
     container:
-      image: fedora:40
+      image: fedora:43
 
     steps:
       # The default Gitea runner image is Debian-based. Build the GTK RPM in a
@@ -60,6 +64,8 @@ jobs:
         env:
           RELEASE_TAG: ${{ github.ref_name }}
           RPM_PACKAGE_GROUP: ${{ vars.RPM_PACKAGE_GROUP }}
+          RPM_DISTRO_NAME: ${{ env.RPM_DISTRO_NAME }}
+          RPM_DISTRO_VERSION: ${{ env.RPM_DISTRO_VERSION }}
         run: |
           set -eu
 
@@ -92,18 +98,18 @@ jobs:
             exit 1
           fi
 
+          package_group="${RPM_PACKAGE_GROUP:-${RPM_DISTRO_NAME}/${RPM_DISTRO_VERSION}}"
+
           {
             printf 'RELEASE_VERSION=%s\n' "$version"
             printf 'RELEASE_ASSETS_DIR=%s\n' "$assets_dir"
-            printf 'RPM_PACKAGE_GROUP=%s\n' "${RPM_PACKAGE_GROUP:-}"
+            printf 'RPM_PACKAGE_GROUP=%s\n' "$package_group"
           } >> "$GITHUB_ENV"
 
       - name: Upload RPMs to Gitea package registry
         env:
-          GITEA_ACTOR: ${{ gitea.actor }}
           GITEA_SERVER_URL: ${{ gitea.server_url }}
-          GITEA_REPOSITORY: ${{ gitea.repository }}
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+          GITEA_REPOSITORY_OWNER: ${{ gitea.repository_owner }}
           RPM_PACKAGE_GROUP: ${{ env.RPM_PACKAGE_GROUP }}
           RPM_PACKAGE_TOKEN: ${{ secrets.RPM_PACKAGE_TOKEN }}
           RPM_PACKAGE_USERNAME: ${{ vars.RPM_PACKAGE_USERNAME }}
@@ -111,23 +117,23 @@ jobs:
         run: |
           set -eu
 
-          owner="${GITEA_REPOSITORY%%/*}"
-          package_user="${RPM_PACKAGE_USERNAME:-${GITEA_ACTOR:-}}"
-          token="${RPM_PACKAGE_TOKEN:-${GITEA_TOKEN:-}}"
+          owner="${GITEA_REPOSITORY_OWNER}"
+          package_user="${RPM_PACKAGE_USERNAME:-${GITEA_REPOSITORY_OWNER}}"
+          token="${RPM_PACKAGE_TOKEN:-}"
           group="${RPM_PACKAGE_GROUP:-}"
 
-          if [ -z "$owner" ] || [ "$owner" = "$GITEA_REPOSITORY" ]; then
-            echo "Could not determine package owner from repository: $GITEA_REPOSITORY" >&2
+          if [ -z "$owner" ]; then
+            echo "Could not determine package owner from workflow context." >&2
             exit 1
           fi
 
           if [ -z "$package_user" ]; then
-            echo "Missing package upload username. Set RPM_PACKAGE_USERNAME or ensure gitea.actor is available." >&2
+            echo "Missing package upload username. Set repository or organization variable RPM_PACKAGE_USERNAME." >&2
             exit 1
           fi
 
           if [ -z "$token" ]; then
-            echo "Missing upload token. Set RPM_PACKAGE_TOKEN or ensure secrets.GITEA_TOKEN is available." >&2
+            echo "Missing package upload token. Set repository or organization secret RPM_PACKAGE_TOKEN." >&2
             exit 1
           fi
 

gtk/Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:40
+FROM fedora:43
 
 # Install RPM build tools and dependencies
 RUN dnf update -y && dnf install -y \