Accepting request 122988 from Base:System

Add missing Requires to branding-openSUSE (forwarded request 122949 from vuntz)

OBS-URL: https://build.opensuse.org/request/show/122988
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=10
This commit is contained in:
Stephan Kulow 2012-06-01 05:22:54 +00:00 committed by Git OBS Bridge
commit e44973e819
2 changed files with 31 additions and 13 deletions

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed May 30 16:41:02 UTC 2012 - vuntz@opensuse.org
- Add plymouth-scripts Requires(post) to branding-openSUSE
subpackage, to make sure that the %post scriptlet will work.
- Make sure we export LIB and not lib in the %postun scriptlets of
theme-solar and branding-openSUSE subpackages.
-------------------------------------------------------------------
Tue May 29 10:03:07 UTC 2012 - tittiatcoke@gmail.com
- Ensure that label.so is being installed for the openSUSE branding
(bnc#763574)
-------------------------------------------------------------------
Mon May 21 11:25:36 UTC 2012 - tittiatcoke@gmail.com

View File

@ -53,13 +53,14 @@ BuildRequires: pkgconfig(libdrm_nouveau)
BuildRequires: pkgconfig(libdrm_radeon)
BuildRequires: pkgconfig(libkms)
Requires: %{name}-branding
Requires: gnu-unifont-bitmap-fonts
Requires: suspend >= 0.80.20100129.1
Requires: systemd-plymouth
Provides: bootsplash = %{version}
Obsoletes: bootsplash < %{version}
Requires: gnu-unifont-bitmap-fonts
Requires(post): plymouth-scripts
Requires(post): mkinitrd
Suggests: plymouth-plugin-label
Provides: bootsplash = %{version}
Obsoletes: bootsplash < %{version}
%description
Plymouth provides an attractive graphical boot animation in
@ -229,11 +230,11 @@ boot splash themes.
Summary: Plymouth default theme
Group: System/Base
Requires: plymouth-theme-solar = %{version}
Requires(pre): %{name}
Supplements: packageand(plymouth:branding-upstream)
Provides: %{name}-branding = %{version}
BuildArch: noarch
Conflicts: otherproviders(plymouth-branding)
Requires(pre): %{name}
BuildArch: noarch
%description branding-upstream
This metapackage tracks the Plymouth default theme from upstream.
@ -241,11 +242,13 @@ This metapackage tracks the Plymouth default theme from upstream.
%package branding-openSUSE
Summary: Plymouth openSUSE theme
Group: System/Base
Requires: plymouth-plugin-label = %{version}
Requires: plymouth-plugin-script = %{version}
Requires(post): %{name}-scripts
Supplements: packageand(plymouth:branding-openSUSE)
Provides: %{name}-branding = %{version}
BuildArch: noarch
Conflicts: otherproviders(plymouth-branding)
BuildArch: noarch
%description branding-openSUSE
This metapackage tracks the Plymouth openSUSE branding.
@ -255,8 +258,9 @@ This metapackage tracks the Plymouth openSUSE branding.
Summary: Plymouth "Fade-In" theme
Group: System/Base
Requires: %{name}-plugin-fade-throbber = %{version}
BuildArch: noarch
Requires: plymouth-plugin-label
Requires(post): %{name}-scripts
BuildArch: noarch
%description theme-fade-in
This package contains the "Fade-In" boot splash theme for
@ -268,8 +272,8 @@ Summary: Plymouth "Spinfinity" theme
Group: System/Base
Requires: %{name}-plugin-throbgress = %{version}
Requires(pre): %{name}
BuildArch: noarch
Requires(post): %{name}-scripts
BuildArch: noarch
%description theme-spinfinity
This package contains the "Spinfinity" boot splash theme for
@ -280,8 +284,8 @@ spins in the shape of an infinity sign.
Summary: Plymouth "Spinner" theme
Group: System/Base
Requires: %{name}-plugin-two-step = %{version}
BuildArch: noarch
Requires(post): %{name}-scripts
BuildArch: noarch
%description theme-spinner
This package contains the "spinner" boot splash theme for
@ -291,8 +295,8 @@ Plymouth.
Summary: Plymouth "Solar" theme
Group: System/Base
Requires: %{name}-plugin-space-flares = %{version}
BuildArch: noarch
Requires(post): %{name}-scripts
BuildArch: noarch
%description theme-solar
This package contains the "Solar" boot splash theme for
@ -302,8 +306,8 @@ Plymouth. It features a blue flamed sun with animated solar flares.
Summary: Plymouth "Script" plugin
Group: System/Base
Requires: %{name}-plugin-script = %{version}
BuildArch: noarch
Requires(post): %{name}-scripts
BuildArch: noarch
%description theme-script
This package contains the "script" boot splash theme for
@ -464,7 +468,7 @@ fi
%postun theme-solar
if [ $1 -eq 0 ]; then
export lib=%{_libdir}
export LIB=%{_libdir}
if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "solar" ]; then
%{_sbindir}/plymouth-set-default-theme -R --reset
fi
@ -480,7 +484,7 @@ fi
%postun branding-openSUSE
if [ $1 -eq 0 ]; then
export lib=%{_libdir}
export LIB=%{_libdir}
if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "openSUSE" ]; then
%{_sbindir}/plymouth-set-default-theme -R --reset
fi