You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
77 lines
2.9 KiB
77 lines
2.9 KiB
3 years ago
|
From 301896137149b7f3ee4c23d318b91fcd93c482d1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Adam Williamson <awilliam@redhat.com>
|
||
|
|
Date: Thu, 3 Mar 2022 16:25:34 -0800
|
||
|
|
Subject: [PATCH] Rename f36-time.xml back to f36.xml
|
||
|
|
|
||
|
|
It is not safe to just rename this file. The schema override in
|
||
|
|
desktop-backgrounds-gnome points to exactly
|
||
|
|
/usr/share/backgrounds/fNN/default/fNN.xml (where NN is the
|
||
|
|
release number); if that file does not exist, then new user
|
||
|
|
accounts will have a broken config. Also I think when the user
|
||
|
|
account is created this string is written into their config -
|
||
|
|
so even if we changed the override to point to this new name,
|
||
|
|
anyone who installed F36 already would still have a config that
|
||
|
|
looks for f36.xml and if there is no f36.xml their background
|
||
|
|
would break.
|
||
|
|
|
||
|
|
I'm not clear whether we want the animated background or the
|
||
|
|
static night one to be the default, but whichever it is should
|
||
|
|
be installed as f36.xml, not any other name. This assumes the
|
||
|
|
one we want to be default is the animated one.
|
||
|
|
|
||
|
|
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
||
|
|
---
|
||
|
|
default/Makefile | 2 +-
|
||
|
|
default/{f36-time.xml => f36.xml} | 0
|
||
|
|
default/gnome-backgrounds-f36.xml | 2 +-
|
||
|
|
default/mate-backgrounds-f36.xml | 2 +-
|
||
|
|
4 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
rename default/{f36-time.xml => f36.xml} (100%)
|
||
|
|
|
||
|
|
diff --git a/default/Makefile b/default/Makefile
|
||
|
|
index 7ae187e..e419d2a 100644
|
||
|
|
--- a/default/Makefile
|
||
|
|
+++ b/default/Makefile
|
||
|
|
@@ -23,7 +23,7 @@ install:
|
||
|
|
$(INSTALL) $(WP_NAME)-$${tod}.png $(WP_DIR)/default/$(WP_NAME)-$${tod}.png ; \
|
||
|
|
done;
|
||
|
|
$(LN_S) ../default/$(WP_NAME)-01-day.png $(WP_DIR)/default/$(WP_NAME).png
|
||
|
|
- $(INSTALL) $(WP_NAME)-time.xml $(WP_DIR)/default/$(WP_NAME)-time.xml
|
||
|
|
+ $(INSTALL) $(WP_NAME).xml $(WP_DIR)/default/$(WP_NAME).xml
|
||
|
|
|
||
|
|
#~ GNOME background
|
||
|
|
$(MKDIR) $(GNOME_BG_DIR)
|
||
|
|
diff --git a/default/f36-time.xml b/default/f36.xml
|
||
|
|
similarity index 100%
|
||
|
|
rename from default/f36-time.xml
|
||
|
|
rename to default/f36.xml
|
||
|
|
diff --git a/default/gnome-backgrounds-f36.xml b/default/gnome-backgrounds-f36.xml
|
||
|
|
index c533931..e6e803b 100644
|
||
|
|
--- a/default/gnome-backgrounds-f36.xml
|
||
|
|
+++ b/default/gnome-backgrounds-f36.xml
|
||
|
|
@@ -13,7 +13,7 @@
|
||
|
|
|
||
|
|
<wallpaper deleted="false">
|
||
|
|
<name>Fedora 36 Time of Day</name>
|
||
|
|
- <filename>/usr/share/backgrounds/f36/default/f36-time.xml</filename>
|
||
|
|
+ <filename>/usr/share/backgrounds/f36/default/f36.xml</filename>
|
||
|
|
<options>zoom</options>
|
||
|
|
</wallpaper>
|
||
|
|
</wallpapers>
|
||
|
|
diff --git a/default/mate-backgrounds-f36.xml b/default/mate-backgrounds-f36.xml
|
||
|
|
index ce3c2eb..83f3362 100644
|
||
|
|
--- a/default/mate-backgrounds-f36.xml
|
||
|
|
+++ b/default/mate-backgrounds-f36.xml
|
||
|
|
@@ -3,7 +3,7 @@
|
||
|
|
<wallpapers>
|
||
|
|
<wallpaper deleted="false">
|
||
|
|
<name>Fedora 36 Time of Day</name>
|
||
|
|
- <filename>/usr/share/backgrounds/f36/default/f36-time.xml</filename>
|
||
|
|
+ <filename>/usr/share/backgrounds/f36/default/f36.xml</filename>
|
||
|
|
<options>zoom</options>
|
||
|
|
</wallpaper>
|
||
|
|
|
||
|
|
--
|
||
|
|
2.35.1
|
||
|
|
|