deprecate ultramarine-gnome-filesystem

Ultramarine-Linux · Sep 30, 2023 · 63f00be · 63f00be
1 parent 48c5438
commit 63f00be
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 53 deletions.
diff --git a/ultramarine/gnome-filesystem/.gitignore b/ultramarine/gnome-filesystem/.gitignore
diff --git a/ultramarine/gnome-filesystem/anda.hcl b/ultramarine/gnome-filesystem/anda.hcl
diff --git a/ultramarine/gnome-filesystem/ultramarine-gnome-filesystem.spec b/ultramarine/gnome-filesystem/ultramarine-gnome-filesystem.spec
diff --git a/ultramarine/gnome-filesystem/umpkg.cfg b/ultramarine/gnome-filesystem/umpkg.cfg
diff --git a/ultramarine/gnome-filesystem/umpkg.toml b/ultramarine/gnome-filesystem/umpkg.toml
diff --git a/...tem/50_ultramarine-gnome.gschema.override → ...ase/50_ultramarine-gnome.gschema.override b/...tem/50_ultramarine-gnome.gschema.override → ...ase/50_ultramarine-gnome.gschema.override
diff --git 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