From 3d30ddfc651b2cfd10d5cc0a82726fe8fde9e6bccaec4e4c2c366557736fb11d Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 29 May 2012 10:03:35 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=43 --- plymouth.changes | 6 ++++++ plymouth.spec | 3 +++ 2 files changed, 9 insertions(+) diff --git a/plymouth.changes b/plymouth.changes index 9849bd7..b8004ca 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/plymouth.spec b/plymouth.spec index 8fcf365..634a334 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -60,6 +60,7 @@ Obsoletes: bootsplash < %{version} Requires: gnu-unifont-bitmap-fonts Requires(post): plymouth-scripts Requires(post): mkinitrd +Suggests: plymouth-plugin-label %description Plymouth provides an attractive graphical boot animation in @@ -241,6 +242,7 @@ 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} Supplements: packageand(plymouth:branding-openSUSE) Provides: %{name}-branding = %{version} @@ -255,6 +257,7 @@ This metapackage tracks the Plymouth openSUSE branding. Summary: Plymouth "Fade-In" theme Group: System/Base Requires: %{name}-plugin-fade-throbber = %{version} +Requires: plymouth-plugin-label BuildArch: noarch Requires(post): %{name}-scripts From 623be877e8423aba48db54d7da66a6ebfcf2d4872bd438623aa7b84ad1155426 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 31 May 2012 07:55:22 +0000 Subject: [PATCH 2/2] Accepting request 122949 from home:vuntz:branches:Base:System Add missing Requires to branding-openSUSE OBS-URL: https://build.opensuse.org/request/show/122949 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=44 --- plymouth.changes | 8 ++++++++ plymouth.spec | 27 ++++++++++++++------------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index b8004ca..5d1826a 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/plymouth.spec b/plymouth.spec index 634a334..e47068b 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -53,14 +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 @@ -230,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. @@ -244,10 +244,11 @@ 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. @@ -258,8 +259,8 @@ Summary: Plymouth "Fade-In" theme Group: System/Base Requires: %{name}-plugin-fade-throbber = %{version} Requires: plymouth-plugin-label -BuildArch: noarch Requires(post): %{name}-scripts +BuildArch: noarch %description theme-fade-in This package contains the "Fade-In" boot splash theme for @@ -271,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 @@ -283,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 @@ -294,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 @@ -305,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 @@ -467,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 @@ -483,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