diff --git a/comps.xml b/comps.xml index a298abe..0aab7ed 100644 --- a/comps.xml +++ b/comps.xml @@ -99,6 +99,7 @@ gs-plugin-ultramarine-pkgdb-collections xdg-user-dirs-gtk xdg-desktop-portal-gtk + ultramarine-backgrounds-community-gnome @@ -252,6 +253,7 @@ xdg-desktop-portal-gtk xdg-user-dirs-gtk seahorse + ultramarine-backgrounds-community-gnome @@ -307,6 +309,7 @@ krdp + ultramarine-backgrounds-community-kde @@ -399,6 +402,7 @@ xfce4-dict-plugin system-config-printer mugshot + ultramarine-backgrounds-community-gnome @@ -428,4 +432,4 @@ ultramarine-xfce-product - + \ No newline at end of file diff --git a/ultramarine/backgrounds/ultramarine-backgrounds.spec b/ultramarine/backgrounds/ultramarine-backgrounds.spec index 93404fd..1e5dc43 100644 --- a/ultramarine/backgrounds/ultramarine-backgrounds.spec +++ b/ultramarine/backgrounds/ultramarine-backgrounds.spec @@ -1,4 +1,4 @@ -%define ver 41.2 +%define ver 41.5 %undefine _disable_source_fetch Name: ultramarine-backgrounds @@ -62,10 +62,29 @@ Conflicts: desktop-backgrounds-compat %description compat The desktop-backgrounds-compat package contains compatibility symlinks for other desktop environments. +%package community +Summary: Other submissions from the Ultramarine Wallpaper contest + +%description community +Other submissions from the Ultramarine Wallpaper contest + +%package community-kde +Summary: community wallpapers for KDE +Requires: ultramarine-backgrounds-community + +%description community-kde +community wallpapers for KDE + +%package community-gnome +Summary: community wallpapers for gnome +Requires: ultramarine-backgrounds-community + +%description community-gnome +community wallpapers for gnome + %prep %autosetup -n backgrounds-%{ver} - %install rm -rf $RPM_BUILD_ROOT %make_install @@ -83,7 +102,6 @@ kde_link() { ln -rsf "%{buildroot}%{_datadir}/backgrounds/ultramarine-linux/$file" "%{buildroot}%{_datadir}/wallpapers/$wallname/contents/screenshot.png" } - kde_link 38/tortuga-dark.png "Tortuga Dark" kde_link 38/tortuga-light.png "Tortuga Light" @@ -105,6 +123,23 @@ kde_link 41/viewport-fake-dark.png "Viewports Fake Dark" kde_link 41/paradise-light.png "Paradise Light" kde_link 41/paradise-dark.png "Paradise Dark" +kde_link 41-community-extras/Eternal-Ultramarine-Dark.png "Eternal Ultramarine Dark" +kde_link 41-community-extras/Eternal-Ultramarine-Light.png "Eternal Ultramarine Light" + +kde_link 41-community-extras/Lazuli-Dark.png "Lazuli Dark" +kde_link 41-community-extras/Lazuli-Light.png "Lazuli Light" + +kde_link 41-community-extras/Lumos-Dawn.png "Lumos Dawn" + +kde_link 41-community-extras/Really-Long-Name.png "Really Long Name" + +kde_link 41-community-extras/Wavelength.png "Wavelength" + +kde_link 41-community-extras/wavelet-dark.png "Wavelet Dark" +kde_link 41-community-extras/wavelet-light.png "Wavelet Light" + +kde_link 41-community-extras/waves-clean.png "Waves Clean" + kde_link preview/blueprint.png "Ultramarine Preview" kde_link ultramarine/ultramarine-dark.png "Ultramarine Dark" @@ -118,7 +153,6 @@ compat_link() { ln -rsf "%{buildroot}%{_datadir}/backgrounds/ultramarine-linux/$file" "%{buildroot}%{_datadir}/backgrounds/$dest" } - DEFAULT_WALL="41/viewports-light.png" DEFAULT_DARK_WALL="41/viewports-dark.png" DEFAULT_XML="41/viewports.xml" @@ -131,7 +165,6 @@ picture-uri='file://%{_datadir}/backgrounds/default.png' picture-uri-dark='file:///%{_datadir}/backgrounds/default-dark.png' EOF - compat_link $DEFAULT_WALL default.png compat_link $DEFAULT_DARK_WALL default-dark.png compat_link $DEFAULT_XML default.xml @@ -152,7 +185,14 @@ compat_link $DEFAULT_DARK_WALL images/default-dark-16_10.png %license COPYING %files common -%{_datadir}/backgrounds/ultramarine-linux/ +%{_datadir}/backgrounds/ultramarine-linux/38/ +%{_datadir}/backgrounds/ultramarine-linux/39/ +%{_datadir}/backgrounds/ultramarine-linux/40/ +%{_datadir}/backgrounds/ultramarine-linux/41/ +%{_datadir}/backgrounds/ultramarine-linux/41~beta/ +%{_datadir}/backgrounds/ultramarine-linux/extras/ +%{_datadir}/backgrounds/ultramarine-linux/preview/ +%{_datadir}/backgrounds/ultramarine-linux/ultramarine/ %{_datadir}/glib-2.0/schemas/30_default_backgrounds.gschema.override /usr/share/wallpapers/Ultramarine*/metadata.desktop @@ -161,7 +201,23 @@ compat_link $DEFAULT_DARK_WALL images/default-dark-16_10.png %{_datadir}/gnome-background-properties/ultramarine.xml %files kde -%{_datadir}/wallpapers/* +"%{_datadir}/wallpapers/Tortuga Dark" +"%{_datadir}/wallpapers/Tortuga Light" +"%{_datadir}/wallpapers/Forresty Skies Dark" +"%{_datadir}/wallpapers/Forresty Skies Light" +"%{_datadir}/wallpapers/Lost Dark" +"%{_datadir}/wallpapers/Lost Light" +"%{_datadir}/wallpapers/Umbrella Dark" +"%{_datadir}/wallpapers/Umbrella Light" +"%{_datadir}/wallpapers/Ultramarine 41 Beta" +"%{_datadir}/wallpapers/Viewports Light" +"%{_datadir}/wallpapers/Viewports Dark" +"%{_datadir}/wallpapers/Viewports Fake Dark" +"%{_datadir}/wallpapers/Paradise Light" +"%{_datadir}/wallpapers/Paradise Dark" +"%{_datadir}/wallpapers/Ultramarine Preview" +"%{_datadir}/wallpapers/Ultramarine Dark" +"%{_datadir}/wallpapers/Ultramarine Light" %files compat %dir %{_datadir}/backgrounds/images/ @@ -170,6 +226,23 @@ compat_link $DEFAULT_DARK_WALL images/default-dark-16_10.png %{_datadir}/backgrounds/default-dark.png %{_datadir}/backgrounds/default.xml +%files community +%{_datadir}/backgrounds/ultramarine-linux/41-community-extras/ + +%files community-gnome +%{_datadir}/gnome-background-properties/41-community-extras.xml + +%files community-kde +"%{_datadir}/wallpapers/Eternal Ultramarine Dark" +"%{_datadir}/wallpapers/Eternal Ultramarine Light" +"%{_datadir}/wallpapers/Lazuli Dark" +"%{_datadir}/wallpapers/Lazuli Light" +"%{_datadir}/wallpapers/Lumos Dawn" +"%{_datadir}/wallpapers/Really Long Name" +"%{_datadir}/wallpapers/Wavelength" +"%{_datadir}/wallpapers/Wavelet Dark" +"%{_datadir}/wallpapers/Wavelet Light" +"%{_datadir}/wallpapers/Waves Clean" %changelog %autochangelog -p -l 5 -s -c -o $PWD/ultramarine-backgrounds.spec