plymouth:

- update to 0.8.2
- update script theme
- install vinelogo-bw.png
- add default boot-duration


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@989 ec354946-7b23-47d6-9f5a-488ba84defc7

p/plymouth/boot-duration

@@ -0,0 +1,40 @@
+0.545:RCkernelparam
+0.622:RChostname
+0.629:RCquotacheck
+0.629:RCmountfs
+0.632:RCmd
+0.634:RClocalfs
+0.641:RCusbstorage
+0.651:lvm2-monitor
+0.657:dkms_autoinstaller
+0.672:cpuspeed
+0.679:iscsid
+0.683:iptables
+0.686:syslog
+0.690:irqbalance
+0.695:iscsi
+0.697:rpcbind
+0.707:mdmonitor
+0.709:random
+0.713:messagebus
+0.716:avahi-daemon
+0.720:nfslock
+0.726:rpcidmapd
+0.738:netfs
+0.742:acpid
+0.744:haldaemon
+0.782:udev-post
+0.784:NetworkManager
+0.789:autofs
+0.896:bluetooth
+0.899:sshd
+0.903:nfs
+0.924:postfix
+0.969:crond
+0.972:system-setup-keyboard
+0.974:anacron
+0.977:atd
+0.979:cups
+0.983:firstboot
+0.986:local
+0.988:preload

p/plymouth/plymouth-vl.spec

@@ -3,10 +3,10 @@
 %define plymouth_libdir /%{_lib}
 
 Summary: Graphical Boot Animation and Logger
-Summary(ja): Graphical Boot Animation and Logger
+Summary(ja): グラフィカルブートアニメーション
 Name: plymouth
-Version: 0.8.0
-Release: 0.20100305.1%{?_dist_release}
+Version: 0.8.2
+Release: 1%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -14,6 +14,7 @@ Source1: boot-duration
 Source2: charge.plymouth
 Source3: plymouth-set-default-plugin
 Source10: vinelogo-bw.png
+Source11: plymouth-theme-script.tar.bz2
 
 URL: http://freedesktop.org/software/plymouth/releases
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -22,13 +23,13 @@ Requires: vine-logos
 Requires(post): plymouth-scripts
 Requires: initscripts
 
-#BuildRequires: pkgconfig(libdrm)
-#BuildRequires: pkgconfig(libdrm_intel)
-#BuildRequires: pkgconfig(libdrm_radeon)
-#BuildRequires: pkgconfig(libdrm_nouveau)
 BuildRequires: libdrm
 BuildRequires: kernel-headers
 
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+
 %description
 Plymouth provides an attractive graphical boot animation in
 place of the text messages that normally get shown.  Text
@@ -141,9 +142,6 @@ Summary: Plymouth "Fade-In" theme
 Summary(ja): Plymouth "Fade-In" theme
 Group: System Environment/Base
 Requires: %{name}-plugin-fade-throbber = %{version}-%{release}
-Requires(post): %{_sbindir}/plymouth-set-default-theme
-Obsoletes: plymouth-plugin-fade-in <= 0.7.0-0.2009.05.08.2
-Provides: plymouth-plugin-fade-in = 0.7.0-0.2009.05.08.2
 
 %description theme-fade-in
 This package contains the "Fade-In" boot splash theme for
@@ -168,9 +166,6 @@ Summary: Plymouth "Spinfinity" theme
 Summary(ja): Plymouth "Spinfinity" theme
 Group: System Environment/Base
 Requires: %{name}-plugin-throbgress = %{version}-%{release}
-Requires(post): %{_sbindir}/plymouth-set-default-theme
-Obsoletes: plymouth-plugin-spinfinity <= 0.7.0-0.2009.05.08.2
-Provides: plymouth-plugin-spinfinity = 0.7.0-0.2009.05.08.2
 
 %description theme-spinfinity
 This package contains the "Spinfinity" boot splash theme for
@@ -193,11 +188,6 @@ Summary: Plymouth "Solar" theme
 Summary(ja): Plymouth "Solar" theme
 Group: System Environment/Base
 Requires: %{name}-plugin-space-flares = %{version}-%{release}
-Requires(post): %{_sbindir}/plymouth-set-default-theme
-Obsoletes: plymouth-plugin-solar <= 0.7.0-0.2009.05.08.2
-Provides: plymouth-plugin-solar = 0.7.0-0.2009.05.08.2
-# We require this to fix upgrades (see bug 499940).
-Requires: plymouth-system-theme
 
 %description theme-solar
 This package contains the "Solar" boot splash theme for
@@ -221,8 +211,6 @@ Summary: Plymouth "Charge" plugin
 Summary(ja): Plymouth "Charge" plugin
 Group: System Environment/Base
 Requires: %{name}-plugin-two-step = %{version}-%{release}
-Requires(post): %{_sbindir}/plymouth-set-default-theme
-Provides: plymouth(system-theme) = %{version}-%{release}
 
 %description theme-charge
 This package contains the "charge" boot splash theme for
@@ -247,6 +235,7 @@ Summary(ja): Plymouth "Script" plugin
 Group: System Environment/Base
 Requires: %{name}-plugin-script = %{version}-%{release}
 Requires(post): %{_sbindir}/plymouth-set-default-theme
+Provides: plymouth(system-theme) = %{version}-%{release}
 
 %description theme-script
 This package contains the "script" boot splash theme for
@@ -256,18 +245,21 @@ plugin.
 %prep
 %setup -q
 
+# Change the default theme
+sed -i -e 's/fade-in/script/g' src/plymouthd.defaults
+
 %build
 %configure --enable-tracing --disable-tests                      \
            --without-default-plugin                              \
            --with-logo=%{_datadir}/pixmaps/vine/vinelogo-bw.png  \
-           --with-background-start-color-stop=0x0073B3           \
-           --with-background-end-color-stop=0x00457E             \
+           --with-background-start-color-stop=0x3A3A6A           \
+           --with-background-end-color-stop=0x000000             \
            --with-background-color=0x000000                      \
 	   --with-release-file=/etc/vine-release                 \
            --enable-gdm-transition                               \
            --with-system-root-install
 
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -288,18 +280,25 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth
 cp $RPM_SOURCE_DIR/boot-duration $RPM_BUILD_ROOT%{_datadir}/plymouth/default-boot-duration
 cp $RPM_SOURCE_DIR/boot-duration $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth
 
-# Add charge, our new default
+# update script theme
+tar xjvf %{SOURCE11} -C $RPM_BUILD_ROOT%{_datadir}/plymouth/themes
+
+# Add charge theme
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge
 cp %{SOURCE2} $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
 
-# Drop glow, it's not very Fedora-y
+# Drop glow
 rm -rf $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow
 
 # Add compat script for upgrades
 cp $RPM_SOURCE_DIR/plymouth-set-default-plugin $RPM_BUILD_ROOT%{_sbindir}
 chmod +x $RPM_BUILD_ROOT%{_sbindir}/plymouth-set-default-plugin
 
+# install vinelogo-bw.png
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/vine/
+cp %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/pixmaps/vine/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -318,47 +317,6 @@ fi
 %post graphics-libs -p /sbin/ldconfig
 %postun graphics-libs -p /sbin/ldconfig
 
-%postun theme-spinfinity
-export LIB=%{_lib}
-if [ $1 -eq 0 ]; then
-    if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "spinfinity" ]; then
-        %{_sbindir}/plymouth-set-default-theme text
-    fi
-fi
-
-%postun theme-fade-in
-export LIB=%{_lib}
-if [ $1 -eq 0 ]; then
-    if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "fade-in" ]; then
-        %{_sbindir}/plymouth-set-default-theme --reset
-    fi
-fi
-
-%postun theme-solar
-export LIB=%{_lib}
-if [ $1 -eq 0 ]; then
-    if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "solar" ]; then
-        %{_sbindir}/plymouth-set-default-theme --reset
-    fi
-fi
-
-%post theme-charge
-export LIB=%{_lib}
-if [ $1 -eq 1 ]; then
-    %{_sbindir}/plymouth-set-default-theme charge
-else
-    if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "solar" ]; then
-        %{_sbindir}/plymouth-set-default-theme charge
-    fi
-fi
-
-%postun theme-charge
-export LIB=%{_lib}
-if [ $1 -eq 0 ]; then
-    if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "charge" ]; then
-        %{_sbindir}/plymouth-set-default-theme --reset
-    fi
-fi
 
 %files
 %defattr(-, root, root)
@@ -367,6 +325,7 @@ fi
 %dir %{_datadir}/plymouth/themes
 %dir %{_libexecdir}/plymouth
 %dir %{_localstatedir}/lib/plymouth
+%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf
 %{plymouthdaemon_execdir}/plymouthd
 %{plymouthclient_execdir}/plymouth
 %{_bindir}/plymouth
@@ -378,6 +337,8 @@ fi
 %{_datadir}/plymouth/default-boot-duration
 %{_datadir}/plymouth/themes/details/details.plymouth
 %{_datadir}/plymouth/themes/text/text.plymouth
+%{_datadir}/plymouth/plymouthd.defaults
+%{_datadir}/pixmaps/vine/*.png
 %{_localstatedir}/run/plymouth
 %{_localstatedir}/spool/plymouth
 %{_mandir}/man?/*
@@ -487,6 +448,11 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Tue May 11 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.2-1
+- new upstream release
+- update script theme
+- update boot-duration
+
 * Wed Mar 17 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.0-0.20100305.1
 - update to new snapshot