rpms/plymouth/F-13 plymouth.spec,1.158,1.159 sources,1.67,1.68

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32614

Modified Files:
	plymouth.spec sources 
Log Message:
- Update to 0.8.0



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-13/plymouth.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- plymouth.spec	5 Mar 2010 19:58:02 -0000	1.158
+++ plymouth.spec	24 Mar 2010 17:16:07 -0000	1.159
@@ -5,13 +5,14 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.20100305.1%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
 Source1: boot-duration
-Source2: charge.plymouth
-Source3: plymouth-set-default-plugin
+Source2: plymouth-update-initrd
+Source3: charge.plymouth
+Source4: plymouth-set-default-plugin
 
 URL: http://freedesktop.org/software/plymouth/releases
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -242,6 +243,9 @@ plugin.
 %prep
 %setup -q
 
+# Change the default theme
+sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults
+
 %build
 %configure --enable-tracing --disable-tests                      \
            --without-default-plugin                              \
@@ -276,9 +280,12 @@ cp $RPM_SOURCE_DIR/boot-duration $RPM_BU
 
 # Add charge, our new default
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge
-cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge
+cp $RPM_SOURCE_DIR/charge.plymouth $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
 
+# Override plymouth-update-initrd to work dracut or mkinitrd
+cp -f $RPM_SOURCE_DIR/plymouth-update-initrd $RPM_BUILD_ROOT%{_libexecdir}/plymouth/plymouth-update-initrd
+
 # Drop glow, it's not very Fedora-y
 rm -rf $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow
 
@@ -304,48 +311,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)
 %doc AUTHORS NEWS README
@@ -353,6 +318,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
@@ -364,6 +330,7 @@ fi
 %{_datadir}/plymouth/default-boot-duration
 %{_datadir}/plymouth/themes/details/details.plymouth
 %{_datadir}/plymouth/themes/text/text.plymouth
+%{_datadir}/plymouth/plymouthd.defaults
 %{_localstatedir}/run/plymouth
 %{_localstatedir}/spool/plymouth
 %{_mandir}/man?/*
@@ -473,6 +440,12 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Wed Mar 24 2010 Ray Strode <rstrode at redhat.com> 0.8.0-1
+- Update to 0.8.0
+
+* Fri Mar 05 2010 Ray Strode <rstrode at redhat.com> 0.8.0-0.20100305.2
+- Fix plymouth-update-initrd to work with dracut
+
 * Fri Mar 05 2010 Ray Strode <rstrode at redhat.com> 0.8.0-0.20100305.1
 - More crash fixes when booting into runlevel 3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-13/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	5 Mar 2010 20:17:51 -0000	1.67
+++ sources	24 Mar 2010 17:16:08 -0000	1.68
@@ -1 +1 @@
-6f4469bcf65ce2e7977e6f1fdafcf4f5  plymouth-0.8.0.tar.bz2
+f0cd114d8612395f1c7d0a191d8e9983  plymouth-0.8.0.tar.bz2