rpms/gnome-backgrounds
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Make -extras subpackage require the main package

Browse Source 
This makes it possible to drop the move-adwaita-backgrounds.patch which
we previously needed to constantly rebase every time when updating the
package.

What the patch did was to remove adwaita entries from the xml in -extras
to make the two subpackages truly independant.

However, what I believe was the intention here when Ryan originally did
the split was to make it possible to install adwaita backgrounds by
default, and leave the rest of the GNOME backgrounds off from the
install media.

If we now make the -extras package require the main gnome-backgrounds,
this still makes the main package independant from -extras (so it can be
installed by default), but it also means that we can drop the patch as
it was only needed to make gnome-backgrounds-extras independantly
installable from main gnome-bakgrounds subpackage -- but we only care
about the opposite case, which is making gnome-backgrounds
independently installable without gnome-backgrounds-extras.
This commit is contained in:
Kalev Lember 2021-03-18 15:04:14 +01:00
parent 3ca0f3743b
commit 25fd9f80d6
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnome-backgrounds.spec
View File

@ -9,8 +9,6 @@ License: GPLv2
URL: http://www.gnome.org
Source0: https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz
Patch0: move-adwaita-backgrounds.patch
BuildArch: noarch
BuildRequires: gettext
BuildRequires: meson
@ -24,7 +22,7 @@ for the GNOME Desktop version
%package extras
Summary: Additional GNOME Backgrounds
License: GPLv2
Requires: %{name} = %{version}-%{release}
# Make sure both gnome-backgrounds and -extras get installed on upgrades
Obsoletes: gnome-backgrounds < 3.24.0-3
@ -57,8 +55,6 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
%{_datadir}/backgrounds/gnome/adwaita-timed.xml
%files extras
%license COPYING
%doc AUTHORS NEWS README.md
%{_datadir}/gnome-background-properties/gnome-backgrounds.xml
%{_datadir}/backgrounds/gnome/ColdWarm.jpg
%{_datadir}/backgrounds/gnome/DepthLava.png
@ -75,6 +71,8 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
%changelog
* Thu Mar 18 2021 Kalev Lember <klember@redhat.com> - 40~rc-1
- Update to 40.rc
- Make -extras subpackage require the main package
- Drop move-adwaita-backgrounds.patch
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

18
move-adwaita-backgrounds.patch
View File

@ -1,18 +0,0 @@
diff --git a/backgrounds/gnome-backgrounds.xml.in b/backgrounds/gnome-backgrounds.xml.in
index 94caae6..3436592 100644
--- a/backgrounds/gnome-backgrounds.xml.in
+++ b/backgrounds/gnome-backgrounds.xml.in
@@ -41,13 +41,6 @@
<filename>@BACKGROUNDDIR@/IceCrystals.jpg</filename>
<options>zoom</options>
<pcolor>#ffffff</pcolor>
- <scolor>#000000</scolor>
- </wallpaper>
- <wallpaper deleted="false">
- <name>7</name>
- <filename>@BACKGROUNDDIR@/adwaita-timed.xml</filename>
- <options>zoom</options>
- <pcolor>#ffffff</pcolor>
<scolor>#000000</scolor>
</wallpaper>
<wallpaper deleted="false">