]> git.pld-linux.org Git - packages/plymouth.git/blobdiff - plymouth.spec
- added git patch to update the package to current state
[packages/plymouth.git] / plymouth.spec
index 6edfebd138aebdd38337a8220904575764e150a1..894f4f4943308e6efd9c8fdab11ad9bda3ef1b8b 100644 (file)
@@ -1,20 +1,15 @@
 # TODO
 # - integrate with geninitrd
 # - pldize recent update (r1.18)
-# - verify if systemd services have to be installed for targets,
-#      and remove the symlinks if not
 #
 # Conditional build:
-%bcond_without drm_intel       # disable building with libdrm_intel support
-%bcond_without drm_radeon      # disable building with libdrm_radeon support
-%bcond_with    drm_nouveau     # enable building with libdrm_nouveau support
-%bcond_without kms             # disable building with libkms support
+%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.8
-Release:       1
+Release:       9
 License:       GPL v2+
 Group:         Base
 Source0:       http://www.freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -22,23 +17,20 @@ Source0:    http://www.freedesktop.org/software/plymouth/releases/%{name}-%{version
 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
-Source7:       systemd-ask-password-plymouth.path
-Source8:       systemd-ask-password-plymouth.service
 Patch0:                text-colors.patch
-Patch1:                path-udevadm.patch
+Patch1:                %{name}-restore-suspend.patch
+Patch100:      %{name}-git.patch
 URL:           http://www.freedesktop.org/wiki/Software/Plymouth
 BuildRequires: cairo-devel
 BuildRequires: gtk+2-devel >= 2:2.12.0
-%if %{with drm_intel} ||  %{with drm_radeon} ||  %{with drm_nouveau} ||  %{with kms}
-BuildRequires: libdrm-devel
-%endif
+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
@@ -48,10 +40,6 @@ 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
@@ -108,6 +96,20 @@ libraries needed to develop 3rd party splash plugins for Plymouth.
 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
@@ -241,23 +243,22 @@ This metapackage tracks the current distribution default theme.
 %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
@@ -345,21 +346,21 @@ Odznacza się on małym kółkiem kręcącym się na ciemnym tle.
 
 %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 \
-       %{__enable_disable drm_intel libdrm_intel} \
-       %{__enable_disable drm_radeon libdrm_radeon} \
-       %{__enable_disable drm_nouveau libdrm_nouveau} \
-       %{__enable_disable kms libkms} \
+       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 \
@@ -375,56 +376,31 @@ sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults
 
 %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
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
-cp -p %{SOURCE7} $RPM_BUILD_ROOT%{systemdunitdir}/systemd-ask-password-plymouth.path
-cp -p %{SOURCE8} $RPM_BUILD_ROOT%{systemdunitdir}/systemd-ask-password-plymouth.service
-
-# install plymouth services for targets
-# http://cgit.freedesktop.org/systemd/systemd/commit/?id=26cbf29c52a36b6ad9d1ccc16d8f7adccefeddca
-install -d $RPM_BUILD_ROOT%{systemdunitdir}/{halt,kexec,poweroff,reboot,sysinit,multi-user}.target.wants
-ln -sf ../plymouth-start.service $RPM_BUILD_ROOT%{systemdunitdir}/sysinit.target.wants/plymouth-start.service
-ln -sf ../plymouth-read-write.service $RPM_BUILD_ROOT%{systemdunitdir}/sysinit.target.wants/plymouth-read-write.service
-ln -sf ../plymouth-quit.service $RPM_BUILD_ROOT%{systemdunitdir}/multi-user.target.wants/plymouth-quit.service
-ln -sf ../plymouth-quit-wait.service $RPM_BUILD_ROOT%{systemdunitdir}/multi-user.target.wants/plymouth-quit-wait.service
-ln -sf ../plymouth-reboot.service $RPM_BUILD_ROOT%{systemdunitdir}/reboot.target.wants/plymouth-reboot.service
-ln -sf ../plymouth-kexec.service $RPM_BUILD_ROOT%{systemdunitdir}/kexec.target.wants/plymouth-kexec.service
-ln -sf ../plymouth-poweroff.service $RPM_BUILD_ROOT%{systemdunitdir}/poweroff.target.wants/plymouth-poweroff.service
-ln -sf ../plymouth-halt.service $RPM_BUILD_ROOT%{systemdunitdir}/halt.target.wants/plymouth-halt.service
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -445,30 +421,34 @@ fi
 %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
@@ -482,7 +462,9 @@ fi
 %{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
@@ -493,10 +475,10 @@ fi
 
 %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
@@ -510,9 +492,9 @@ fi
 
 %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
@@ -521,11 +503,11 @@ fi
 
 %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)
@@ -554,11 +536,11 @@ fi
 %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)
This page took 0.039652 seconds and 4 git commands to generate.