-%define plymouthdaemon_execdir /sbin
-%define plymouthclient_execdir /bin
-%define plymouth_libdir /%{_lib}
-
+# TODO
+# - revisit subpackages
+# - fix: Requires: /bin/bash
+# - integrate with geninitrd
Summary: Graphical Boot Animation and Logger
Name: plymouth
-Version: 0.6.0
-Release: 0.1
+Version: 0.8.3
+Release: 1
License: GPL v2+
Group: Base
-Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: e29e754e942e6fcaf5185772d18fd97e
+Source0: http://www.freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
+# Source0-md5: a479180467b21dd1c5477160d5a1fd35
Source1: %{name}-logo.png
# Source1-md5: 6b38a868585adfd3a96a4ad16973c1f8
-URL: http://freedesktop.org/software/plymouth/releases
+Source2: %{name}.tmpfiles
+#Patch0: libdrm.patch
+Patch0: %{name}-libpng15.patch
+URL: http://www.freedesktop.org/wiki/Software/Plymouth
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: cairo-devel
BuildRequires: gtk+2-devel
+BuildRequires: libdrm-devel
BuildRequires: libpng-devel
BuildRequires: libtool
-BuildRequires: pango-devel >= 1.21.0
+BuildRequires: pango-devel >= 1:1.21.0
BuildRequires: pkgconfig
-Requires(post): %{name}-scripts
+Requires(post): %{name}-scripts = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define plymouthdaemon_execdir /sbin
+%define plymouthclient_execdir /bin
+%define plymouth_libdir /%{_lib}
+
%description
Plymouth provides an attractive graphical boot animation in place of
the text messages that normally get shown. Text messages are instead
redirected to a log file for viewing after boot.
-%package system-plugin
-Summary: Plymouth default plugin
-Group: Base
-Requires: plymouth(system-plugin) = %{version}-%{release}
-Provides: rhgb = 1:10.0.0
-Obsoletes: rhgb < 1:10.0.0
-
-%description system-plugin
-This metapackage tracks the current distribution default plugin.
-
%package libs
Summary: Plymouth libraries
Group: Development/Libraries
Namely, it adds hooks to show boot messages at the login screen in the
event start-up services fail.
-%package plugin-label
-Summary: Plymouth label plugin
-Group: Base
-Requires: %{name}-libs = %{version}-%{release}
-
-%description plugin-label
-This package contains the label control plugin for Plymouth. It
-provides the ability to render text on graphical boot splashes using
-pango and cairo.
-
-%package plugin-fade-in
-Summary: Plymouth "Fade-In" plugin
-Group: Base
-Requires(post): %{_sbindir}/plymouth-set-default-plugin
-Requires: %{name}-libs = %{version}-%{release}
-
-%description plugin-fade-in
-This package contains the "Fade-In" boot splash plugin for Plymouth.
-It features a centered logo that fades in and out while stars twinkle
-around the logo during system boot up.
-
-%package plugin-pulser
-Summary: Plymouth "Pulser" plugin
-Group: Base
-Requires(post): %{_sbindir}/plymouth-set-default-plugin
-Requires: %{name}-libs = %{version}-%{release}
-
-%description plugin-pulser
-This package contains the "Pulser" boot splash plugin for Plymouth. It
-features a pulsing text progress indicator centered in the screen
-during system boot up.
-
-%package plugin-spinfinity
-Summary: Plymouth "Spinfinity" plugin
-Group: Base
-Requires(post): %{_sbindir}/plymouth-set-default-plugin
-Requires: %{name}-libs = %{version}-%{release}
-Requires: plymouth-plugin-label
-
-%description plugin-spinfinity
-This package contains the "Spinfinity" boot splash plugin for
-Plymouth. It features a centered logo and animated spinner that spins
-in the shape of an infinity sign.
-
-%package plugin-solar
-Summary: Plymouth "Solar" plugin
-Group: Base
-Requires(post): %{_sbindir}/plymouth-set-default-plugin
-Requires: %{name}-libs = %{version}-%{release}
-Requires: plymouth-plugin-label
-Provides: plymouth(system-plugin) = %{version}-%{release}
-
-%description plugin-solar
-This package contains the "Solar" boot splash plugin for Plymouth. It
-features a blue flamed sun with animated solar flares.
-
%prep
%setup -q
+%patch0 -p1
%build
%{__libtoolize}
--enable-tracing \
--disable-tests \
--without-boot-entry \
- --without-default-plugin \
--with-logo=%{_pixmapsdir}/plymouth-logo.png \
--with-background-start-color-stop=0x0073B3 \
--with-background-end-color-stop=0x00457E \
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
(cd $RPM_BUILD_ROOT%{_bindir}; ln -s ../../bin/plymouth)
install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth
-install %SOURCE1 %{_pixmapsdir}/plymouth-logo.png
+install -d $RPM_BUILD_ROOT%{_pixmapsdir}
+install %SOURCE1 $RPM_BUILD_ROOT%{_pixmapsdir}/plymouth-logo.png
+install %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-[ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
-
%postun
if [ $1 -eq 0 ]; then
- rm -f %{_libdir}/plymouth/default.so
+ rm -f %{_libdir}/plymouth/default.so
fi
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
-%postun plugin-spinfinity
-export LIB=%{_lib}
-if [ $1 -eq 0 ]; then
- if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "spinfinity" ]; then
- %{_sbindir}/plymouth-set-default-plugin --reset
- fi
-fi
-
-%postun plugin-fade-in
-export LIB=%{_lib}
-if [ $1 -eq 0 ]; then
- if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "fade-in" ]; then
- %{_sbindir}/plymouth-set-default-plugin --reset
- fi
-fi
-
-%post plugin-solar
-export LIB=%{_lib}
-if [ $1 -eq 1 ]; then
- %{_sbindir}/plymouth-set-default-plugin solar
-fi
-
-%postun plugin-solar
-export LIB=%{_lib}
-if [ $1 -eq 0 ]; then
- if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "solar" ]; then
- %{_sbindir}/plymouth-set-default-plugin text
- fi
-fi
-
-%postun plugin-pulser
-export LIB=%{_lib}
-if [ $1 -eq 0 ]; then
- if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "pulser" ]; then
- %{_sbindir}/plymouth-set-default-plugin --reset
- fi
-fi
-
%files
%defattr(644,root,root,755)
%doc AUTHORS NEWS README
+%attr(755,root,root) %{_bindir}/rhgb-client
+%attr(755,root,root) %{_sbindir}/plymouth-set-default-theme
+%dir %{_sysconfdir}/plymouth
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plymouth/plymouthd.conf
+%{_mandir}/man8/plymouth.8*
%dir %{_datadir}/plymouth
+%{_datadir}/plymouth/plymouthd.defaults
+%{_datadir}/plymouth/themes
%dir %{_libexecdir}/plymouth
%dir %{_localstatedir}/lib/plymouth
-%{plymouthdaemon_execdir}/plymouthd
-%{plymouthclient_execdir}/plymouth
+%attr(755,root,root) %{plymouthdaemon_execdir}/plymouthd
+%attr(755,root,root) %{plymouthclient_execdir}/plymouth
%attr(755,root,root) %{_bindir}/plymouth
-%attr(755,root,root) %{_bindir}/rhgb-client
-%{_libdir}/plymouth/details.so
-%{_libdir}/plymouth/text.so
+%attr(755,root,root) %{_libdir}/plymouth/details.so
+%attr(755,root,root) %{_libdir}/plymouth/fade-throbber.so
+%attr(755,root,root) %{_libdir}/plymouth/label.so
+%attr(755,root,root) %{_libdir}/plymouth/script.so
+%attr(755,root,root) %{_libdir}/plymouth/space-flares.so
+%attr(755,root,root) %{_libdir}/plymouth/text.so
+%attr(755,root,root) %{_libdir}/plymouth/throbgress.so
+%attr(755,root,root) %{_libdir}/plymouth/two-step.so
+/usr/lib/tmpfiles.d/%{name}.conf
%{_localstatedir}/run/plymouth
%{_localstatedir}/spool/plymouth
%{_pixmapsdir}/plymouth-logo.png
-#%ghost %{_localstatedir}/lib/plymouth/boot-duration
%files devel
%defattr(644,root,root,755)
-%{plymouth_libdir}/libply.so
-%{_libdir}/libplybootsplash.so
-%{_pkgconfigdir}/plymouth-1.pc
+%attr(755,root,root) %{plymouth_libdir}/libply.so
+%attr(755,root,root) %{plymouth_libdir}/libply-splash-core.so
+%attr(755,root,root) %{_libdir}/libply-boot-client.so
+%attr(755,root,root) %{_libdir}/libply-splash-graphics.so
+%{_pkgconfigdir}/ply-boot-client.pc
+%{_pkgconfigdir}/ply-splash-core.pc
+%{_pkgconfigdir}/ply-splash-graphics.pc
%{_includedir}/plymouth-1
%files libs
%defattr(644,root,root,755)
-%attr(755,root,root) %{plymouth_libdir}/libply.so.*
-%attr(755,root,root) %{_libdir}/libplybootsplash.so.*
+%attr(755,root,root) %{plymouth_libdir}/libply.so.*.*.*
+%attr(755,root,root) %ghost %{plymouth_libdir}/libply.so.2
+%attr(755,root,root) %{plymouth_libdir}/libply-splash-core.so.*.*.*
+%attr(755,root,root) %ghost %{plymouth_libdir}/libply-splash-core.so.2
+%attr(755,root,root) %{_libdir}/libply-boot-client.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libply-boot-client.so.2
+%attr(755,root,root) %{_libdir}/libply-splash-graphics.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libply-splash-graphics.so.2
%dir %{_libdir}/plymouth
+%dir %{_libdir}/plymouth/renderers
+%attr(755,root,root) %{_libdir}/plymouth/renderers/drm.so
+%attr(755,root,root) %{_libdir}/plymouth/renderers/frame-buffer.so
+%attr(755,root,root) %{_libdir}/plymouth/renderers/x11.so
%files scripts
%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/plymouth-set-default-plugin
-%{_libexecdir}/plymouth/plymouth-update-initrd
-%{_libexecdir}/plymouth/plymouth-populate-initrd
+%attr(755,root,root) %{_libexecdir}/plymouth/plymouth-generate-initrd
+%attr(755,root,root) %{_libexecdir}/plymouth/plymouth-populate-initrd
+%attr(755,root,root) %{_libexecdir}/plymouth/plymouth-update-initrd
%files utils
%defattr(644,root,root,755)
%files gdm-hooks
%defattr(644,root,root,755)
%{_datadir}/gdm/autostart/LoginWindow/plymouth-log-viewer.desktop
-
-%files plugin-label
-%defattr(644,root,root,755)
-%{_libdir}/plymouth/label.so
-
-%files plugin-fade-in
-%defattr(644,root,root,755)
-%dir %{_datadir}/plymouth/fade-in
-%{_datadir}/plymouth/fade-in/bullet.png
-%{_datadir}/plymouth/fade-in/entry.png
-%{_datadir}/plymouth/fade-in/lock.png
-%{_datadir}/plymouth/fade-in/star.png
-%{_libdir}/plymouth/fade-in.so
-
-%files plugin-pulser
-%defattr(644,root,root,755)
-%{_libdir}/plymouth/pulser.so
-
-%files plugin-spinfinity
-%defattr(644,root,root,755)
-%dir %{_datadir}/plymouth/spinfinity
-%{_datadir}/plymouth/spinfinity/box.png
-%{_datadir}/plymouth/spinfinity/bullet.png
-%{_datadir}/plymouth/spinfinity/entry.png
-%{_datadir}/plymouth/spinfinity/lock.png
-%{_datadir}/plymouth/spinfinity/throbber-[0-3][0-9].png
-%{_libdir}/plymouth/spinfinity.so
-
-%files plugin-solar
-%defattr(644,root,root,755)
-%dir %{_datadir}/plymouth/solar
-%{_datadir}/plymouth/solar/*.png
-%{_libdir}/plymouth/solar.so
-
-%files system-plugin
-%defattr(644,root,root,755)