From ed7eac23df8787aed5ef36fd0e54a26bc06137e3 Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@fedoraproject.org>
Date: Tue, 13 Aug 2024 08:33:40 -0700
Subject: [PATCH] Ready for Fedor 41

---
 Makefile                                |  2 +-
 extras/Makefile                         | 38 ++++++++++++-------------
 extras/f40-extras.xml                   | 21 --------------
 extras/gnome-backgrounds-f40-extras.xml | 12 --------
 extras/mate-backgrounds-f40-extras.xml  | 22 --------------
 5 files changed, 20 insertions(+), 75 deletions(-)
 delete mode 100644 extras/f40-extras.xml
 delete mode 100644 extras/gnome-backgrounds-f40-extras.xml
 delete mode 100644 extras/mate-backgrounds-f40-extras.xml

diff --git a/Makefile b/Makefile
index d8ba877..c88ed12 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS = default extras
+SUBDIRS = default
 VERSION = 41.0.0
 NAME =  f41-backgrounds-$(VERSION)
 
diff --git a/extras/Makefile b/extras/Makefile
index fd09cd3..a9151ab 100644
--- a/extras/Makefile
+++ b/extras/Makefile
@@ -1,4 +1,4 @@
-F40_DIR=$(DESTDIR)/usr/share/backgrounds/f40
+F41_DIR=$(DESTDIR)/usr/share/backgrounds/f41
 GNOME_BG_DIR=$(DESTDIR)/usr/share/gnome-background-properties
 MATE_BG_DIR=$(DESTDIR)/usr/share/mate-background-properties
 KDE_BG_DIR=$(DESTDIR)/usr/share/wallpapers/
@@ -15,40 +15,40 @@ THEMES_PNG=01-dark-blue\
 all:
 
 install:
-	$(MKDIR) $(F40_DIR)/extras
+	$(MKDIR) $(F41_DIR)/extras
 	$(MKDIR) $(GNOME_BG_DIR)
 	$(MKDIR) $(MATE_BG_DIR)
 	$(MKDIR) $(XFCE_BG_DIR)
-	$(INSTALL) f40-extras.xml 				$(F40_DIR)/extras/f40-extras.xml
-	$(INSTALL) gnome-backgrounds-f40-extras.xml 	$(GNOME_BG_DIR)/f40-extras.xml
-	$(INSTALL) mate-backgrounds-f40-extras.xml 	$(MATE_BG_DIR)/f40-extras.xml
+	$(INSTALL) f41-extras.xml 				$(F41_DIR)/extras/f41-extras.xml
+	$(INSTALL) gnome-backgrounds-f41-extras.xml 	$(GNOME_BG_DIR)/f41-extras.xml
+	$(INSTALL) mate-backgrounds-f41-extras.xml 	$(MATE_BG_DIR)/f41-extras.xml
 	for theme in $(THEMES_JPG) ; do \
-	  $(INSTALL) $${theme}.jpg $(F40_DIR)/extras/$${theme}.jpg ;\
-	  $(MKDIR) $(KDE_BG_DIR)/F40_$${theme}/contents/images ;\
-	  $(INSTALL) $${theme}.desktop $(KDE_BG_DIR)/F40_$${theme}/metadata.desktop ; \
+	  $(INSTALL) $${theme}.jpg $(F41_DIR)/extras/$${theme}.jpg ;\
+	  $(MKDIR) $(KDE_BG_DIR)/F41_$${theme}/contents/images ;\
+	  $(INSTALL) $${theme}.desktop $(KDE_BG_DIR)/F41_$${theme}/metadata.desktop ; \
 	  for res in 1280x1024 \
 		     640x480 800x600 1024x768 1152x864 1200x900 1280x960 1440x1080 1600x1200 1600x1280 1920x1440 2048x1536 \
 		     800x480 1024x600 1152x720 1280x720 1280x768 1280x800 1366x768 1440x900 1680x1050 1920x1080 1920x1200 \
 		     2160x1440 2304x1440 2560x1440 2560x1600 2960x1440 3000x2000 3200x1800  3440x1440 3840x2160; do \
-	    $(LN_S) ../../../../backgrounds/f40/extras/$${theme}.jpg \
-	            $(KDE_BG_DIR)/F40_$${theme}/contents/images/$${res}.jpg ; \
+	    $(LN_S) ../../../../backgrounds/f41/extras/$${theme}.jpg \
+	            $(KDE_BG_DIR)/F41_$${theme}/contents/images/$${res}.jpg ; \
 	  done; \
-	  $(LN_S) ../../backgrounds/f40/extras/$${theme}.jpg \
-			$(XFCE_BG_DIR)/f40-$${theme}.jpg ;\
+	  $(LN_S) ../../backgrounds/f41/extras/$${theme}.jpg \
+			$(XFCE_BG_DIR)/f41-$${theme}.jpg ;\
 	done;
 	#~ Compress to 8-bit png format
 	for theme in $(THEMES_PNG) ; do \
-	  $(INSTALL) $${theme}.png     $(F40_DIR)/extras/$${theme}.png ; \
-	  $(MKDIR) $(KDE_BG_DIR)/F40_$${theme}/contents/images ;\
-	  $(INSTALL) $${theme}.desktop $(KDE_BG_DIR)/F40_$${theme}/metadata.desktop ; \
+	  $(INSTALL) $${theme}.png     $(F41_DIR)/extras/$${theme}.png ; \
+	  $(MKDIR) $(KDE_BG_DIR)/F41_$${theme}/contents/images ;\
+	  $(INSTALL) $${theme}.desktop $(KDE_BG_DIR)/F41_$${theme}/metadata.desktop ; \
 	  for res in 1280x1024 \
 		     640x480 800x600 1024x768 1152x864 1200x900 1280x960 1440x1080 1600x1200 1600x1280 1920x1440 2048x1536 \
 		     800x480 1024x600 1152x720 1280x720 1280x768 1280x800 1366x768 1440x900 1680x1050 1920x1080 1920x1200 \
 		     2160x1440 2304x1440 2560x1440 2560x1600 2960x1440 3000x2000 3200x1800  3440x1440 3840x2160; do \
-	    $(LN_S) ../../../../backgrounds/f40/extras/$${theme}.png \
-	            $(KDE_BG_DIR)/F40_$${theme}/contents/images/$${res}.png ; \
+	    $(LN_S) ../../../../backgrounds/f41/extras/$${theme}.png \
+	            $(KDE_BG_DIR)/F41_$${theme}/contents/images/$${res}.png ; \
 	  done; \
-	  $(LN_S) ../../backgrounds/f40/extras/$${theme}.png \
-			$(XFCE_BG_DIR)/f40-$${theme}.png ;\
+	  $(LN_S) ../../backgrounds/f41/extras/$${theme}.png \
+			$(XFCE_BG_DIR)/f41-$${theme}.png ;\
 	done;
 
diff --git a/extras/f40-extras.xml b/extras/f40-extras.xml
deleted file mode 100644
index f45f56c..0000000
--- a/extras/f40-extras.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<background>
-  <starttime>
-    <year>2024</year>
-    <month>03</month>
-    <day>07</day>
-    <hour>08</hour>
-    <minute>00</minute>
-    <second>00</second>
-  </starttime>
-
-  <static>
-    <duration>1800.0</duration>
-    <file>/usr/share/backgrounds/f40/extras/01-dark-blue.png</file>
-  </static>
-
-  <static>
-    <duration>1800.0</duration>
-    <file>/usr/share/backgrounds/f40/extras/01-light-blue.png</file>
-  </static>
-
-</background>
diff --git a/extras/gnome-backgrounds-f40-extras.xml b/extras/gnome-backgrounds-f40-extras.xml
deleted file mode 100644
index d9bda26..0000000
--- a/extras/gnome-backgrounds-f40-extras.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-<wallpapers>
-    <wallpaper deleted="false">
-        <name>F40 Supplemental Wallpapers</name>
-        <filename>/usr/share/backgrounds/f40/extras/01-light-blue.png</filename>
-        <filename-dark>/usr/share/backgrounds/f40/default/01-dark-night.png</filename-dark>
-        <options>zoom</options>
-        <shade_type>solid</shade_type>
-        <pcolor>#51a2da</pcolor>
-        <scolor>#294172</scolor>
-</wallpapers>
diff --git a/extras/mate-backgrounds-f40-extras.xml b/extras/mate-backgrounds-f40-extras.xml
deleted file mode 100644
index 5d1a79b..0000000
--- a/extras/mate-backgrounds-f40-extras.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE wallpapers SYSTEM "mate-wp-list.dtd">
-<wallpapers>
-    <wallpaper deleted="false">
-        <name>F40 Supplemental Wallpapers Slideshow</name>
-        <filename>/usr/share/backgrounds/f40/extras/f40-extras.xml</filename>
-        <options>scaled</options>
-    </wallpaper>
-
-    <wallpaper deleted="false">
-        <name>Dark Blue (F40 Supplemental)</name>
-        <filename>/usr/share/backgrounds/f40/extras/01-dark-blue.png</filename>
-        <options>scaled</options>
-    </wallpaper>
-
-    <wallpaper deleted="false">
-        <name>Light Blue (F40 Supplemental)</name>
-        <filename>/usr/share/backgrounds/f40/extras/01-light-blue.png</filename>
-        <options>scaled</options>
-    </wallpaper>
-
-</wallpapers>