From 63f00be2d5106f5ea5b043eb826201d5b03c3d83 Mon Sep 17 00:00:00 2001
From: Lleyton Gray <lleyton@fyralabs.com>
Date: Sat, 30 Sep 2023 03:56:12 -0700
Subject: [PATCH] deprecate ultramarine-gnome-filesystem

---
 ultramarine/gnome-filesystem/.gitignore       |  5 ----
 ultramarine/gnome-filesystem/anda.hcl         |  6 -----
 .../ultramarine-gnome-filesystem.spec         | 26 -------------------
 ultramarine/gnome-filesystem/umpkg.cfg        |  9 -------
 ultramarine/gnome-filesystem/umpkg.toml       |  6 -----
 .../50_ultramarine-gnome.gschema.override     |  0
 ultramarine/release/ultramarine-release.spec  | 11 +++++++-
 7 files changed, 10 insertions(+), 53 deletions(-)
 delete mode 100644 ultramarine/gnome-filesystem/.gitignore
 delete mode 100644 ultramarine/gnome-filesystem/anda.hcl
 delete mode 100644 ultramarine/gnome-filesystem/ultramarine-gnome-filesystem.spec
 delete mode 100644 ultramarine/gnome-filesystem/umpkg.cfg
 delete mode 100644 ultramarine/gnome-filesystem/umpkg.toml
 rename ultramarine/{gnome-filesystem => release}/50_ultramarine-gnome.gschema.override (100%)

diff --git a/ultramarine/gnome-filesystem/.gitignore b/ultramarine/gnome-filesystem/.gitignore
deleted file mode 100644
index 9d76a6f..0000000
--- a/ultramarine/gnome-filesystem/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.rpm
-*.src.rpm
-*.log
-build/
-.tar.*
diff --git a/ultramarine/gnome-filesystem/anda.hcl b/ultramarine/gnome-filesystem/anda.hcl
deleted file mode 100644
index e2fe0b8..0000000
--- a/ultramarine/gnome-filesystem/anda.hcl
+++ /dev/null
@@ -1,6 +0,0 @@
-project "pkg" {
-    rpm {
-        spec = "ultramarine-gnome-filesystem.spec"
-        sources =  "."
-    }
-}
\ No newline at end of file
diff --git a/ultramarine/gnome-filesystem/ultramarine-gnome-filesystem.spec b/ultramarine/gnome-filesystem/ultramarine-gnome-filesystem.spec
deleted file mode 100644
index 06f6dff..0000000
--- a/ultramarine/gnome-filesystem/ultramarine-gnome-filesystem.spec
+++ /dev/null
@@ -1,26 +0,0 @@
-Name:           ultramarine-gnome-filesystem
-Version:        0.1.2
-Release:        1%{?dist}
-Summary:        GNOME settings for Ultramarine Linux
-
-License:        MIT
-URL:            https://ultramarine-linux.org
-Source0:        50_ultramarine-gnome.gschema.override
-
-%description
-%summary
-
-
-
-%install
-mkdir -p %{buildroot}%{_datadir}/glib-2.0/schemas/
-install %{SOURCE0} %{buildroot}%{_datadir}/glib-2.0/schemas/
-
-%files
-%{_datadir}/glib-2.0/schemas/50_ultramarine-gnome.gschema.override
-
-
-
-%changelog
-* Thu May 19 2022 Cappy Ishihara <cappy@cappuchino.xyz>
-- owo
diff --git a/ultramarine/gnome-filesystem/umpkg.cfg b/ultramarine/gnome-filesystem/umpkg.cfg
deleted file mode 100644
index 9625ae9..0000000
--- a/ultramarine/gnome-filesystem/umpkg.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-[umpkg]
-srcdir = $PWD
-git_repo = https://github.com/Ultramarine-Linux/ultramarine-gnome-filesystem.git
-git_ref = 
-build_script = 
-build_mode = local
-tag = 
-spec = 
-
diff --git a/ultramarine/gnome-filesystem/umpkg.toml b/ultramarine/gnome-filesystem/umpkg.toml
deleted file mode 100644
index 08afe29..0000000
--- a/ultramarine/gnome-filesystem/umpkg.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[ultramarine-gnome-filesystem]
-spec = "ultramarine-gnome-filesystem.spec"
-build_script = ""
-build_method = "mock"
-owner = "cappy"
-git_repo = "https://github.com/ultramarine-linux/pkg-ultramarine-gnome-filesystem.git"
diff --git a/ultramarine/gnome-filesystem/50_ultramarine-gnome.gschema.override b/ultramarine/release/50_ultramarine-gnome.gschema.override
similarity index 100%
rename from ultramarine/gnome-filesystem/50_ultramarine-gnome.gschema.override
rename to ultramarine/release/50_ultramarine-gnome.gschema.override
diff --git a/ultramarine/release/ultramarine-release.spec b/ultramarine/release/ultramarine-release.spec
index 0a14431..3b8757c 100644
--- a/ultramarine/release/ultramarine-release.spec
+++ b/ultramarine/release/ultramarine-release.spec
@@ -38,6 +38,7 @@ Source8:	99-default-disable.preset
 Source9:	90-default-user.preset
 Source13:   60-ultramarine-presets.conf
 Source14:   lightdm-gtk-greeter.conf
+Source15:   50_ultramarine-gnome.gschema.override
 
 Source19:   distro-template.swidtag
 Source20:   distro-edition-template.swidtag
@@ -255,6 +256,10 @@ Provides:		ultramarine-release-identity = %{version}-%{release}
 Conflicts:		ultramarine-release-identity
 Requires(meta):   ultramarine-release-gnome = %{version}-%{release}
 
+# Allow migration from the legacy ultramarine-gnome-filesystem package
+Provides: ultramarine-gnome-filesystem = %{version}-%{release}
+Obsoletes: ultramarine-gnome-filesystem < 0.1.2-2
+
 %description identity-gnome
 Provides the necessary files for a Ultramarine GNOME installation.
 
@@ -430,11 +435,14 @@ cp -pr %{SOURCE30} %{buildroot}%{_sysconfdir}/anaconda/profile.d/ultramarine.con
 
 
 
-#Budgie config
+# Budgie config
 mkdir -p %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/
 install %{SOURCE13} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/
 install %{SOURCE14} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-lightdm-gtk-greeter.conf
 
+# GNOME config
+install -Dm0644 %{SOURCE15} -t %{buildroot}%{_datadir}/glib-2.0/schemas/
+
 # Create distro-level SWID tag file
 install -d %{buildroot}%{_swidtagdir}
 sed -e "s#\$version#%{bug_version}#g" -e 's/<!--.*-->//;/^$/d' %{SOURCE19} > %{buildroot}%{_swidtagdir}/org.ultramarinelinux.Ultramarine-%{bug_version}.swidtag
@@ -554,6 +562,7 @@ install -Dm0644 %{SOURCE28} -t %{buildroot}%{_prefix}/lib/systemd/user.conf.d/
 %files identity-gnome
 %{_prefix}/lib/os-release.gnome
 %attr(0644,root,root) %{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.gnome
+%{_datadir}/glib-2.0/schemas/50_ultramarine-gnome.gschema.override
 %endif
 
 %files notes