From c90d2ef7a96d7aff6e0aef6985b6e5f3f20f8d1d Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 27 Jan 2023 11:55:55 +0300 Subject: [PATCH] Initial commit --- SOURCES/alma-mountains-dark-metadata.desktop | 6 -- SOURCES/alma-mountains-white-metadata.desktop | 6 -- SOURCES/alma-waves-dark-metadata.desktop | 6 -- SOURCES/alma-waves-light-metadata.desktop | 6 -- SOURCES/alma-waves-sunset-metadata.desktop | 6 -- SPECS/almalinux-backgrounds-extras.spec | 66 +++++++------------ 6 files changed, 24 insertions(+), 72 deletions(-) delete mode 100644 SOURCES/alma-mountains-dark-metadata.desktop delete mode 100644 SOURCES/alma-mountains-white-metadata.desktop delete mode 100644 SOURCES/alma-waves-dark-metadata.desktop delete mode 100644 SOURCES/alma-waves-light-metadata.desktop delete mode 100644 SOURCES/alma-waves-sunset-metadata.desktop diff --git a/SOURCES/alma-mountains-dark-metadata.desktop b/SOURCES/alma-mountains-dark-metadata.desktop deleted file mode 100644 index 325ced9..0000000 --- a/SOURCES/alma-mountains-dark-metadata.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name=AlmaLinux mountains-dark -X-KDE-PluginInfo-Name=Alma-mountains-dark -X-KDE-PluginInfo-Author=Bala Raman -X-KDE-PluginInfo-Email=srbala@almalinux.org -X-KDE-PluginInfo-License=MIT diff --git a/SOURCES/alma-mountains-white-metadata.desktop b/SOURCES/alma-mountains-white-metadata.desktop deleted file mode 100644 index 499a417..0000000 --- a/SOURCES/alma-mountains-white-metadata.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name=AlmaLinux mountains-white -X-KDE-PluginInfo-Name=Alma-mountains-white -X-KDE-PluginInfo-Author=Bala Raman -X-KDE-PluginInfo-Email=srbala@almalinux.org -X-KDE-PluginInfo-License=MIT diff --git a/SOURCES/alma-waves-dark-metadata.desktop b/SOURCES/alma-waves-dark-metadata.desktop deleted file mode 100644 index daf27da..0000000 --- a/SOURCES/alma-waves-dark-metadata.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name=AlmaLinux waves-dark -X-KDE-PluginInfo-Name=Alma-waves-dark -X-KDE-PluginInfo-Author=Bala Raman -X-KDE-PluginInfo-Email=srbala@almalinux.org -X-KDE-PluginInfo-License=MIT diff --git a/SOURCES/alma-waves-light-metadata.desktop b/SOURCES/alma-waves-light-metadata.desktop deleted file mode 100644 index 55e8520..0000000 --- a/SOURCES/alma-waves-light-metadata.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name=AlmaLinux waves-light -X-KDE-PluginInfo-Name=Alma-waves-light -X-KDE-PluginInfo-Author=Bala Raman -X-KDE-PluginInfo-Email=srbala@almalinux.org -X-KDE-PluginInfo-License=MIT diff --git a/SOURCES/alma-waves-sunset-metadata.desktop b/SOURCES/alma-waves-sunset-metadata.desktop deleted file mode 100644 index faff7e9..0000000 --- a/SOURCES/alma-waves-sunset-metadata.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name=AlmaLinux waves-sunset -X-KDE-PluginInfo-Name=Alma-waves-sunset -X-KDE-PluginInfo-Author=Bala Raman -X-KDE-PluginInfo-Email=srbala@almalinux.org -X-KDE-PluginInfo-License=MIT diff --git a/SPECS/almalinux-backgrounds-extras.spec b/SPECS/almalinux-backgrounds-extras.spec index 2865596..386eb98 100644 --- a/SPECS/almalinux-backgrounds-extras.spec +++ b/SPECS/almalinux-backgrounds-extras.spec @@ -4,7 +4,7 @@ %global debug_package %{nil} Name: almalinux-backgrounds-extras -Version: 90.0 +Version: 84.0 Release: 1%{?dist} Summary: AlmaLinux-related desktop backgrounds for KDE and XFCE BuildArch: noarch @@ -15,11 +15,6 @@ Source0: alma-dark-metadata.desktop Source1: alma-light-metadata.desktop Source2: alma-abstract-dark-metadata.desktop Source3: alma-abstract-light-metadata.desktop -Source4: alma-mountains-dark-metadata.desktop -Source5: alma-mountains-white-metadata.desktop -Source6: alma-waves-dark-metadata.desktop -Source7: alma-waves-light-metadata.desktop -Source8: alma-waves-sunset-metadata.desktop License: MIT Requires: almalinux-backgrounds @@ -37,7 +32,7 @@ AlmaLinux-related desktop backgrounds for KDE and XFCE %install # Declare an array for background types -declare -a bgtypes=("dark" "light" "abstract-dark" "abstract-light" "mountains-dark" "mountains-white" "waves-dark" "waves-light" "waves-sunset") +declare -a bgtypes=("dark" "light" "abstract-dark" "abstract-light") # Declare an array for background sizes declare -a sizes=("1800x1440.jpg" "2048x1536.jpg" "2560x1080.jpg" "2560x1440.jpg" "2560x1600.jpg" "3440x1440.jpg") # kde @@ -45,32 +40,27 @@ declare -a sizes=("1800x1440.jpg" "2048x1536.jpg" "2560x1080.jpg" "2560x1440.jpg for bg in "${bgtypes[@]}" do # Remove any old folders and create new structure - rm -rf %{_datadir}/wallpapers/Alma-$bg* - mkdir -p %{buildroot}%{_datadir}/wallpapers/Alma-$bg/contents/images/ + rm -rf /usr/share/wallpapers/Alma-$bg* + mkdir -p %{buildroot}/usr/share/wallpapers/Alma-$bg/contents/images/ # create sym link for all sizes for size in "${sizes[@]}" do - ln -sf %{_datadir}/backgrounds/Alma-$bg-$size %{buildroot}%{_datadir}/wallpapers/Alma-$bg/contents/images/$size + ln -sf /usr/share/backgrounds/Alma-$bg-$size %{buildroot}/usr/share/wallpapers/Alma-$bg/contents/images/$size done done -install -p -m 644 %{SOURCE0} %{buildroot}%{_datadir}/wallpapers/Alma-dark/metadata.desktop -install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/wallpapers/Alma-light/metadata.desktop -install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/wallpapers/Alma-abstract-dark/metadata.desktop -install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/wallpapers/Alma-abstract-light/metadata.desktop -install -p -m 644 %{SOURCE4} %{buildroot}%{_datadir}/wallpapers/Alma-mountains-dark/metadata.desktop -install -p -m 644 %{SOURCE5} %{buildroot}%{_datadir}/wallpapers/Alma-mountains-white/metadata.desktop -install -p -m 644 %{SOURCE6} %{buildroot}%{_datadir}/wallpapers/Alma-waves-dark/metadata.desktop -install -p -m 644 %{SOURCE7} %{buildroot}%{_datadir}/wallpapers/Alma-waves-light/metadata.desktop -install -p -m 644 %{SOURCE8} %{buildroot}%{_datadir}/wallpapers/Alma-waves-sunset/metadata.desktop +install -p -m 644 %{SOURCE0} %{buildroot}/usr/share/wallpapers/Alma-dark/metadata.desktop +install -p -m 644 %{SOURCE1} %{buildroot}/usr/share/wallpapers/Alma-light/metadata.desktop +install -p -m 644 %{SOURCE2} %{buildroot}/usr/share/wallpapers/Alma-abstract-dark/metadata.desktop +install -p -m 644 %{SOURCE3} %{buildroot}/usr/share/wallpapers/Alma-abstract-light/metadata.desktop # xfce -mkdir -p %{buildroot}%{_datadir}/backgrounds/images -ln -s %{_datadir}/backgrounds/Alma-mountains-white-2560x1440.jpg %{buildroot}%{_datadir}/backgrounds/default.png -ln -s %{_datadir}/backgrounds/Alma-mountains-white-2560x1440.jpg %{buildroot}%{_datadir}/backgrounds/images/default.png -ln -s %{_datadir}/backgrounds/Alma-mountains-white-2560x1440.jpg %{buildroot}%{_datadir}/backgrounds/images/default-16_9.png -ln -s %{_datadir}/backgrounds/Alma-mountains-white-2560x1600.jpg %{buildroot}%{_datadir}/backgrounds/images/default-16_10.png +mkdir -p %{buildroot}/usr/share/backgrounds/images +ln -s /usr/share/backgrounds/Alma-dark-2560x1440.jpg %{buildroot}/usr/share/backgrounds/default.png +ln -s /usr/share/backgrounds/Alma-dark-2560x1440.jpg %{buildroot}/usr/share/backgrounds/images/default.png +ln -s /usr/share/backgrounds/Alma-dark-2560x1440.jpg %{buildroot}/usr/share/backgrounds/images/default-16_9.png +ln -s /usr/share/backgrounds/Alma-dark-2560x1600.jpg %{buildroot}/usr/share/backgrounds/images/default-16_10.png # TODO: Replace following symlink with an actual 5/4 ratio image if one is added in the future -ln -s %{_datadir}/backgrounds/Alma-mountains-white-2048x1536.jpg %{buildroot}%{_datadir}/backgrounds/images/default-5_4.png +ln -s /usr/share/backgrounds/Alma-dark-2048x1536.jpg %{buildroot}/usr/share/backgrounds/images/default-5_4.png %post @@ -80,27 +70,19 @@ ln -s %{_datadir}/backgrounds/Alma-mountains-white-2048x1536.jpg %{buildroot}%{_ %files -%{_datadir}/wallpapers/Alma-abstract-dark -%{_datadir}/wallpapers/Alma-abstract-light -%{_datadir}/wallpapers/Alma-dark -%{_datadir}/wallpapers/Alma-light -%{_datadir}/wallpapers/Alma-mountains-dark -%{_datadir}/wallpapers/Alma-mountains-white -%{_datadir}/wallpapers/Alma-waves-dark -%{_datadir}/wallpapers/Alma-waves-light -%{_datadir}/wallpapers/Alma-waves-sunset -%{_datadir}/backgrounds/default.png -%{_datadir}/backgrounds/images/default.png -%{_datadir}/backgrounds/images/default-16_9.png -%{_datadir}/backgrounds/images/default-16_10.png -%{_datadir}/backgrounds/images/default-5_4.png +/usr/share/wallpapers/Alma-abstract-dark +/usr/share/wallpapers/Alma-abstract-light +/usr/share/wallpapers/Alma-dark +/usr/share/wallpapers/Alma-light +/usr/share/backgrounds/default.png +/usr/share/backgrounds/images/default.png +/usr/share/backgrounds/images/default-16_9.png +/usr/share/backgrounds/images/default-16_10.png +/usr/share/backgrounds/images/default-5_4.png #%license COPYING %changelog -* Mon Jun 06 2022 Eduard Abdullin - 90.0-1 -- Update for AlmaLinux9 - * Tue Aug 24 2021 Jonathan Wright - 84.0-1 - package created