Merge remote-tracking branch 'origin/um39' into um39

Ultramarine-Linux · Sep 1, 2023 · 19a2068 · 19a2068
2 parents 82e5739 + 54c5432
commit 19a2068
Show file tree

Hide file tree

Showing 21 changed files with 29 additions and 640 deletions.
diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
@@ -8,7 +8,7 @@ on:
       - ultramarine/**
     branches:
       - main
-      - um38
+      - um39
   workflow_dispatch:
   workflow_call:
 
@@ -52,7 +52,7 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["38"]
+        version: ["39"]
         arch: ["x86_64", "aarch64"]
       fail-fast: false
     #if: ${{ matrix.changed_folders != '' }}

diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     strategy:
       matrix:
-        version: ["38"]
+        version: ["39"]
         arch: ["x86_64", "aarch64"]
       fail-fast: false
     runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}

diff --git a/.github/workflows/mass-rebuild.yml b/.github/workflows/mass-rebuild.yml
@@ -9,7 +9,7 @@ jobs:
   manifest:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f39
       options: --cap-add=SYS_ADMIN --privileged
 
     outputs:
@@ -41,7 +41,7 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["38"]
+        version: ["39"]
       fail-fast: false
     #if: ${{ matrix.changed_folders != '' }}
     runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}

diff --git a/ultramarine/backgrounds/ultramarine-backgrounds.spec b/ultramarine/backgrounds/ultramarine-backgrounds.spec
@@ -1,7 +1,7 @@
 %undefine _disable_source_fetch
 
 Name: ultramarine-backgrounds
-Version: 38
+Version: 39
 Release: 2%{?dist}
 BuildArch: noarch
 # details for the artworks' licenses can be seen in the COPYING file

diff --git a/ultramarine/flatpak-selinux-fix/.gitignore b/ultramarine/flatpak-selinux-fix/.gitignore
diff --git a/ultramarine/flatpak-selinux-fix/anda.hcl b/ultramarine/flatpak-selinux-fix/anda.hcl
diff --git a/ultramarine/flatpak-selinux-fix/flatpak-selinux-fix.spec b/ultramarine/flatpak-selinux-fix/flatpak-selinux-fix.spec
diff --git a/ultramarine/flatpak-selinux-fix/umpkg.toml b/ultramarine/flatpak-selinux-fix/umpkg.toml
diff --git a/ultramarine/kde-settings/kde-settings.spec b/ultramarine/kde-settings/kde-settings.spec
@@ -1,7 +1,7 @@
 Summary: Config files for KDE
 Name:    kde-settings
 Epoch:   1
-Version: 38.1
+Version: 39
 Release: 10%{?dist}
 
 License: MIT

diff --git a/ultramarine/logos/ultramarine-logos.spec b/ultramarine/logos/ultramarine-logos.spec
@@ -3,7 +3,7 @@
 Name:          ultramarine-logos
 %define        _alt_name fedora-logos
 Summary:       Icons and pictures related to Ultramarine Linux
-Version:       38
+Version:       39
 %define        _release 3%{?dist}
 Release:       3%{?dist}
 URL:           https://github.com/Ultramarine-Linux/logos-src

diff --git a/ultramarine/mock-core-configs/.gitignore b/ultramarine/mock-core-configs/.gitignore
diff --git a/ultramarine/mock-core-configs/anda.hcl b/ultramarine/mock-core-configs/anda.hcl