diff --git a/plymouth.changes b/plymouth.changes index e27b87a..5af4c72 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Feb 23 12:38:51 UTC 2012 - saschpe@suse.de + +- Replaced package core-libs with individual packages for each shared + library (SLPP) +- Proper provides/obsoletes pair for bootsplash +- Could not resist to run spec-cleaner ;-) + ------------------------------------------------------------------- Tue Feb 21 09:49:52 UTC 2012 - tittiatcoke@gmail.com diff --git a/plymouth.spec b/plymouth.spec index d717b47..c901b5e 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -11,7 +11,7 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. - +# # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -27,8 +27,9 @@ Name: plymouth Version: %{tarversion}_git%{patchversion} Release: 0 -Summary: Graphical Boot Animation and Logger License: GPL-2.0+ +Summary: Graphical Boot Animation and Logger +Url: http://freedesktop.org/software/plymouth/releases Group: System/Base Source0: %{name}-%{version}.tar.bz2 Source1: boot-duration @@ -39,11 +40,6 @@ Patch1: suse-initrd-support Patch2: plymouth-trace-lines # PATCH-OPENSUSE -- Handle correctly multiple displays with different sizes Patch3: plymouth-fix-window-size - -Url: http://freedesktop.org/software/plymouth/releases - -Requires(post): plymouth-scripts - BuildRequires: automake BuildRequires: kernel-headers BuildRequires: libtool @@ -56,7 +52,9 @@ BuildRequires: pkgconfig(libkms) Requires: %{name}-branding = %{version} Requires: suspend >= 0.80.20100129.1 Requires: systemd-plymouth -Obsoletes: bootsplash +Provides: bootsplash = %{version} +Obsoletes: bootsplash < %{version} +Requires(post): plymouth-scripts %description Plymouth provides an attractive graphical boot animation in @@ -64,28 +62,45 @@ place of the text messages that normally get shown. Text messages are instead redirected to a log file for viewing after boot. -%package core-libs -Summary: Plymouth core libraries +%package -n libply-boot-client2 +Summary: Plymouth core library Group: Development/Libraries/C and C++ -%description core-libs -This package contains the libply and libply-splash-core libraries -used by Plymouth. +%description -n libply-boot-client2 +This package contains the libply-boot-client library used by Plymouth. + +%package -n libply-splash-core2 +Summary: Plymouth core library +Group: Development/Libraries/C and C++ + +%description -n libply-splash-core2 +This package contains the libply-splash-core library +used by graphical Plymouth splashes. %package -n libply-splash-graphics2 Summary: Plymouth graphics libraries Group: Development/Libraries/C and C++ BuildRequires: libpng-devel -Requires: %{name}-core-libs %description -n libply-splash-graphics2 This package contains the libply-splash-graphics library used by graphical Plymouth splashes. +%package -n libply2 +Summary: Plymouth core library +Group: Development/Libraries/C and C++ + +%description -n libply2 +This package contains the libply library used by Plymouth. + %package devel Summary: Libraries and headers for writing Plymouth splash plugins Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +Requires: libply-boot-client = %{version} +Requires: libply-splash-core2 = %{version} +Requires: libply-splash-graphics2 = %{version} +Requires: libply2 = %{version} Requires: pkgconfig %description devel @@ -121,7 +136,7 @@ Summary: Plymouth label plugin Group: System/Base BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(pango) >= 1.21.0 -Requires: %{name}-core-libs = %{version} +Requires: libply-splash-core2 = %{version} %description plugin-label This package contains the label control plugin for @@ -131,7 +146,9 @@ graphical boot splashes using pango and cairo. %package plugin-fade-throbber Summary: Plymouth "Fade-Throbber" plugin Group: System/Base -Requires: %{name}-core-libs = %{version} +Requires: libply-splash-core2 = %{version} +Requires: libply-splash-graphics2 = %{version} +Requires: libply2 = %{version} %description plugin-fade-throbber This package contains the "Fade-In" boot splash plugin for @@ -141,7 +158,9 @@ while other images pulsate around during system boot up. %package plugin-throbgress Summary: Plymouth "Throbgress" plugin Group: System/Base -Requires: %{name}-core-libs = %{version} +Requires: libply-splash-core2 = %{version} +Requires: libply-splash-graphics2 = %{version} +Requires: libply2 = %{version} Requires: %{name}-plugin-label = %{version} %description plugin-throbgress @@ -153,7 +172,9 @@ the screen. %package plugin-space-flares Summary: Plymouth "space-flares" plugin Group: System/Base -Requires: %{name}-core-libs = %{version} +Requires: libply-splash-core2 = %{version} +Requires: libply-splash-graphics2 = %{version} +Requires: libply2 = %{version} Requires: %{name}-plugin-label = %{version} %description plugin-space-flares @@ -163,7 +184,9 @@ Plymouth. It features a corner image with animated flares. %package plugin-two-step Summary: Plymouth "two-step" plugin Group: System/Base -Requires: %{name}-core-libs = %{version} +Requires: libply-splash-core2 = %{version} +Requires: libply-splash-graphics2 = %{version} +Requires: libply2 = %{version} Requires: plymouth-plugin-label %description plugin-two-step @@ -175,7 +198,9 @@ short, fast one-shot animation. %package plugin-script Summary: Plymouth "script" plugin Group: System/Base -Requires: %{name}-core-libs = %{version} +Requires: libply-splash-core2 = %{version} +Requires: libply-splash-graphics2 = %{version} +Requires: libply2 = %{version} %description plugin-script This package contains the "script" boot splash plugin for @@ -186,11 +211,11 @@ boot splash themes. %package branding-upstream Summary: Plymouth default theme Group: System/Base -Provides: %{name}-branding = %{version} -Supplements: packageand(plymouth:branding-upstream) Requires: plymouth-theme-solar = %{version} -Conflicts: otherproviders(plymouth-branding) +Supplements: packageand(plymouth:branding-upstream) +Provides: %{name}-branding = %{version} BuildArch: noarch +Conflicts: otherproviders(plymouth-branding) %description branding-upstream This metapackage tracks the Plymouth default theme from upstream. @@ -199,8 +224,8 @@ This metapackage tracks the Plymouth default theme from upstream. Summary: Plymouth "Fade-In" theme Group: System/Base Requires: %{name}-plugin-fade-throbber = %{version} -Requires(post): %{name}-scripts BuildArch: noarch +Requires(post): %{name}-scripts %description theme-fade-in This package contains the "Fade-In" boot splash theme for @@ -211,8 +236,8 @@ while stars twinkle around the logo during system boot up. Summary: Plymouth "Spinfinity" theme Group: System/Base Requires: %{name}-plugin-throbgress = %{version} -Requires(post): %{name}-scripts BuildArch: noarch +Requires(post): %{name}-scripts %description theme-spinfinity This package contains the "Spinfinity" boot splash theme for @@ -223,8 +248,8 @@ spins in the shape of an infinity sign. Summary: Plymouth "Spinner" theme Group: System/Base Requires: %{name}-plugin-two-step = %{version} -Requires(post): %{name}-scripts BuildArch: noarch +Requires(post): %{name}-scripts %description theme-spinner This package contains the "spinner" boot splash theme for @@ -234,8 +259,8 @@ Plymouth. Summary: Plymouth "Solar" theme Group: System/Base Requires: %{name}-plugin-space-flares = %{version} -Requires(post): %{name}-scripts BuildArch: noarch +Requires(post): %{name}-scripts %description theme-solar This package contains the "Solar" boot splash theme for @@ -245,8 +270,8 @@ Plymouth. It features a blue flamed sun with animated solar flares. Summary: Plymouth "Script" plugin Group: System/Base Requires: %{name}-plugin-script = %{version} -Requires(post): %{name}-scripts BuildArch: noarch +Requires(post): %{name}-scripts %description theme-script This package contains the "script" boot splash theme for @@ -327,12 +352,18 @@ fi %post scripts -p /sbin/mkinitrd_setup %postun scripts -p /sbin/mkinitrd_setup -%post core-libs -p /sbin/ldconfig -%postun core-libs -p /sbin/ldconfig +%post -n libply-boot-client2 -p /sbin/ldconfig +%postun -n libply-boot-client2 -p /sbin/ldconfig + +%post -n libply-splash-core2 -p /sbin/ldconfig +%postun -n libply-splash-core2 -p /sbin/ldconfig %post -n libply-splash-graphics2 -p /sbin/ldconfig %postun -n libply-splash-graphics2 -p /sbin/ldconfig +%post -n libply2 -p /sbin/ldconfig +%postun -n libply2 -p /sbin/ldconfig + %post theme-spinfinity export LIB=%{_libdir} %{_sbindir}/plymouth-set-default-theme spinfinity @@ -390,6 +421,7 @@ fi %dir %{_datadir}/plymouth/themes/text %dir %{_libexecdir}/plymouth %dir %{_localstatedir}/lib/plymouth +%dir %{_libdir}/plymouth %dir %{_libdir}/plymouth/renderers %dir %{_sysconfdir}/plymouth %{plymouthdaemon_execdir}/plymouthd @@ -420,16 +452,21 @@ fi %{_libdir}/plymouth/renderers/x11* %{_includedir}/plymouth-1 -%files core-libs +%files -n libply-boot-client2 %defattr(-, root, root) -%{plymouth_libdir}/libply.so.* -%{plymouth_libdir}/libply-splash-core.so.* -%{_libdir}/libply-boot-client.so.* -%dir %{_libdir}/plymouth +%{_libdir}/libply-boot-client.so.2* + +%files -n libply-splash-core2 +%defattr(-, root, root) +%{plymouth_libdir}/libply-splash-core.so.2* %files -n libply-splash-graphics2 %defattr(-, root, root) -%{_libdir}/libply-splash-graphics.so.* +%{_libdir}/libply-splash-graphics.so.2* + +%files -n libply2 +%defattr(-, root, root) +%{plymouth_libdir}/libply.so.2* %files scripts %defattr(-, root, root)