# TODO
-# - revisit subpackages
-# - fix: Requires: /bin/bash
# - integrate with geninitrd
-# - pldize recent update
+# - pldize recent update (r1.18)
+#
+# Conditional build:
+%bcond_without drm # disable building with DRM renderer support
+
Summary: Graphical Boot Animation and Logger
Summary(pl.UTF-8): Graficzna animacja i logowanie startu systemu
Name: plymouth
-Version: 0.8.4
-Release: 4
+Version: 0.8.8
+Release: 9
License: GPL v2+
Group: Base
Source0: http://www.freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: 6f370cd69bd6d0c67657d243a99dc260
+# Source0-md5: 38f5e613e5ab17806b950cee2d0d0d4e
Source1: %{name}-logo.png
# Source1-md5: 6b38a868585adfd3a96a4ad16973c1f8
Source2: %{name}.tmpfiles
-Source3: charge.%{name}
Source4: boot-duration
-Source5: %{name}-set-default-plugin
Source6: %{name}-update-initrd
-Patch0: check_for_consoles.patch
-Patch1: text-colors.patch
+Patch0: text-colors.patch
+Patch1: %{name}-restore-suspend.patch
+Patch100: %{name}-git.patch
URL: http://www.freedesktop.org/wiki/Software/Plymouth
-#BuildRequires: autoconf >= 2.50
-#BuildRequires: automake
BuildRequires: cairo-devel
BuildRequires: gtk+2-devel >= 2:2.12.0
-BuildRequires: libdrm-devel
-BuildRequires: libpng-devel >= 1.2.16
-#BuildRequires: libtool >= 2:2.0
+BuildRequires: xorg-lib-libpciaccess-devel
+%{?with_drm:BuildRequires: libdrm-devel}
+BuildRequires: libpng-devel >= 2:1.2.16
BuildRequires: pango-devel >= 1:1.21.0
BuildRequires: pkgconfig
+BuildRequires: udev-devel
Requires: %{name}-graphics-libs = %{version}-%{release}
Requires(post): %{name}-scripts = %{version}-%{release}
Requires: /etc/os-release
-Requires: systemd-plymouth
+Requires: systemd-units
Obsoletes: plymouth-gdm-hooks
Obsoletes: plymouth-utils
+Obsoletes: systemd-plymouth
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
Ten pakiet zawiera pliki nagłówkowe bibliotek libply i
libplybootsplash, potrzebne do tworzenia wtyczek graficznych Plymouth.
+%package static
+Summary: Static libraries for writing Plymouth splash plugins
+Summary(pl.UTF-8): Statyczne biblioteki do tworzenia wtyczek graficznych Plymouth
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+This package contains the static libraries used to develop 3rd party
+splash plugins for Plymouth.
+
+%description static -l pl.UTF-8
+Ten pakiet zawiera statyczne biblioteki, przydatne do tworzenia
+wtyczek graficznych Plymouth.
+
%package scripts
Summary: Plymouth related scripts
Summary(pl.UTF-8): Skrypty pomocnicze do Plymouth
%description system-theme -l pl.UTF-8
Ten metapakiet śledzi domyślny motyw dystrybucji.
-%package theme-charge
-Summary: Plymouth "Charge" theme
-Summary(pl.UTF-8): Motyw Plymouth "Charge"
+%package theme-glow
+Summary: Plymouth "Glow" theme
+Summary(pl.UTF-8): Motyw Plymouth "Glow"
Group: Base
Requires: %{name}-plugin-two-step = %{version}-%{release}
Requires(post): %{name}-scripts = %{version}-%{release}
Provides: %{name}(system-theme) = %{version}-%{release}
+Obsoletes: plymouth-theme-charge
-%description theme-charge
-This package contains the "charge" boot splash theme for Plymouth. It
-features the shadowy hull of a Fedora logo charge up and and finally
-burst into full form.
+%description theme-glow
+This package contains the "Glow" boot splash theme for Plymouth.
+Corporate theme with pie chart boot progress followed by a glowing
+emerging logo.
-%description theme-charge -l pl.UTF-8
-Ten pakiet zawiera motyw ekranu startowego Plymouth "Charge". Odznacza
-się on cieniowaną łupiną loga Fedory, która rośnie, a ostatecznie
-wybucha do pełnej postaci.
+%description theme-glow -l pl.UTF-8
+Ten pakiet zawiera motyw ekranu startowego Plymouth "Glow".
%package theme-fade-in
Summary: Plymouth "Fade-In" theme
%prep
%setup -q
+%patch100 -p1
%patch0 -p1
%patch1 -p1
-# Change the default theme
-sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults
-
%build
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
%configure \
+ UDEVADM=/sbin/udevadm \
+ SYSTEMD_ASK_PASSWORD_AGENT=/bin/systemd-tty-ask-password-agent \
+ %{__enable_disable drm drm} \
--disable-silent-rules \
- --disable-static \
- --disable-tests \
+ --enable-documentation \
--disable-gdm-transition \
--enable-systemd-integration \
--enable-tracing \
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{systemdtmpfilesdir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pixmapsdir},%{systemdtmpfilesdir}}
+
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libply.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libply.so
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libply-splash-core.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libply-splash-core.so
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/libply{,-splash-core}.so
+
install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth
cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/plymouth/default-boot-duration
> $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth/boot-duration
-# FC: Add charge, our new default
-install -d $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge
-cp %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge
-cp $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow/{box,bullet,entry,lock}.png $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge
-
-# FC: Drop glow, it's not very Fedora-y
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow
-
-# FC: Override plymouth-update-initrd to work dracut or mkinitrd
+# Override plymouth-update-initrd to work with dracut or mkinitrd
cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/plymouth/plymouth-update-initrd
-# FC: Add compat script for upgrades
-install -p %{SOURCE5} $RPM_BUILD_ROOT%{_sbindir}
-
-%{__rm} $RPM_BUILD_ROOT{%{plymouth_libdir},%{_libdir}}/*.la \
+%{__rm} $RPM_BUILD_ROOT{/%{_lib},%{_libdir}}/*.la \
$RPM_BUILD_ROOT%{_libdir}/plymouth/*.la \
$RPM_BUILD_ROOT%{_libdir}/plymouth/renderers/*.la
-# Temporary symlink until rc.sysinit is fixed
-ln -sf /bin/plymouth $RPM_BUILD_ROOT%{_bindir}/plymouth
-
install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}/plymouth-logo.png
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+%systemd_reload
+
%postun
if [ $1 -eq 0 ]; then
rm -f %{_libdir}/plymouth/default.so
fi
+%systemd_reload
%post core-libs -p /sbin/ldconfig
%postun core-libs -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
%doc AUTHORS README TODO
-%attr(755,root,root) %{_bindir}/plymouth
%dir %{_sysconfdir}/plymouth
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plymouth/plymouthd.conf
%{_mandir}/man8/plymouth.8*
-%attr(755,root,root) %{plymouthdaemon_execdir}/plymouthd
-%attr(755,root,root) %{plymouthclient_execdir}/plymouth
+%attr(755,root,root) /bin/plymouth
+%attr(755,root,root) /sbin/plymouthd
%attr(755,root,root) %{_libdir}/plymouth/details.so
%attr(755,root,root) %{_libdir}/plymouth/text.so
+%attr(755,root,root) %{_libdir}/plymouth/tribar.so
%attr(755,root,root) %{_libdir}/plymouth/renderers/drm.so
%attr(755,root,root) %{_libdir}/plymouth/renderers/frame-buffer.so
%dir %{_datadir}/plymouth
%dir %{_datadir}/plymouth/themes
%dir %{_datadir}/plymouth/themes/details
%dir %{_datadir}/plymouth/themes/text
+%dir %{_datadir}/plymouth/themes/tribar
%{_datadir}/plymouth/plymouthd.defaults
%{_datadir}/plymouth/default-boot-duration
%{_datadir}/plymouth/themes/details/details.plymouth
%{_datadir}/plymouth/themes/text/text.plymouth
+%{_datadir}/plymouth/themes/tribar/tribar.plymouth
%{_pixmapsdir}/plymouth-logo.png
%{systemdtmpfilesdir}/%{name}.conf
%dir %{_localstatedir}/lib/plymouth
%ghost %{_localstatedir}/lib/plymouth/boot-duration
%{_localstatedir}/run/plymouth
%{_localstatedir}/spool/plymouth
+%{_mandir}/man1/plymouth.1*
+%{_mandir}/man8/plymouthd.8*
+
+%{systemdunitdir}/plymouth-halt.service
+%{systemdunitdir}/plymouth-kexec.service
+%{systemdunitdir}/plymouth-poweroff.service
+%{systemdunitdir}/plymouth-quit-wait.service
+%{systemdunitdir}/plymouth-quit.service
+%{systemdunitdir}/plymouth-read-write.service
+%{systemdunitdir}/plymouth-reboot.service
+%{systemdunitdir}/plymouth-start.service
+%{systemdunitdir}/plymouth-switch-root.service
+%{systemdunitdir}/systemd-ask-password-plymouth.path
+%{systemdunitdir}/systemd-ask-password-plymouth.service
+%{systemdunitdir}/halt.target.wants/plymouth-halt.service
+%dir %{systemdunitdir}/initrd-switch-root.target.wants
+%{systemdunitdir}/initrd-switch-root.target.wants/plymouth-switch-root.service
+%{systemdunitdir}/initrd-switch-root.target.wants/plymouth-start.service
+%{systemdunitdir}/kexec.target.wants/plymouth-kexec.service
+%{systemdunitdir}/multi-user.target.wants/plymouth-quit.service
+%{systemdunitdir}/multi-user.target.wants/plymouth-quit-wait.service
+%{systemdunitdir}/poweroff.target.wants/plymouth-poweroff.service
+%{systemdunitdir}/reboot.target.wants/plymouth-reboot.service
+%{systemdunitdir}/sysinit.target.wants/plymouth-read-write.service
+%{systemdunitdir}/sysinit.target.wants/plymouth-start.service
%files core-libs
%defattr(644,root,root,755)
-%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) /%{_lib}/libply.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libply.so.2
+%attr(755,root,root) /%{_lib}/libply-splash-core.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/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
%dir %{_libdir}/plymouth
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{plymouth_libdir}/libply.so
-%attr(755,root,root) %{plymouth_libdir}/libply-splash-core.so
+%attr(755,root,root) %{_libdir}/libply.so
%attr(755,root,root) %{_libdir}/libply-boot-client.so
+%attr(755,root,root) %{_libdir}/libply-splash-core.so
%attr(755,root,root) %{_libdir}/libply-splash-graphics.so
%{_includedir}/plymouth-1
%{_pkgconfigdir}/ply-boot-client.pc
%files scripts
%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/plymouth-set-default-plugin
%attr(755,root,root) %{_sbindir}/plymouth-set-default-theme
%attr(755,root,root) %{_libdir}/plymouth/plymouth-generate-initrd
%attr(755,root,root) %{_libdir}/plymouth/plymouth-populate-initrd
%attr(755,root,root) %{_libdir}/plymouth/plymouth-update-initrd
+%{_mandir}/man1/plymouth-set-default-theme.1*
%files plugin-fade-throbber
%defattr(644,root,root,755)
%files system-theme
%defattr(644,root,root,755)
-%files theme-charge
+%files theme-glow
%defattr(644,root,root,755)
-%dir %{_datadir}/plymouth/themes/charge
-%{_datadir}/plymouth/themes/charge/*.png
-%{_datadir}/plymouth/themes/charge/charge.plymouth
+%dir %{_datadir}/plymouth/themes/glow
+%{_datadir}/plymouth/themes/glow/*.png
+%{_datadir}/plymouth/themes/glow/glow.plymouth
%files theme-fade-in
%defattr(644,root,root,755)
projects / packages / plymouth.git / blobdiff