Fix ldconfig to be run on -libs not on the main package.

Fix main package and plugins not to reset inappropriately.

1 files changed, 17 insertions, 8 deletions

diff --git a/scripts/plymouth.spec b/scripts/plymouth.spec
index ac29ef1..fa9bb41 100644
--- a/scripts/plymouth.spec
+++ b/scripts/plymouth.spec
@@ -76,34 +76,43 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-%preun
-if [ $1 -eq 1 ]; then
-    %{_sbindir}/plymouth-set-default-plugin --reset
+%postun
+echo plymouth postun "$@"
+if [ $1 -eq 0 ]; then
+	rm %{_libdir}/plymouth/default.so
 fi
 
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
 %post plugin-spinfinity
+echo plymouth-spinfinity post "$@"
 if [ $1 -eq 1 ]; then
     %{_sbindir}/plymouth-set-default-plugin spinfinity
 fi
 
 %postun plugin-spinfinity
+echo plymouth-spinfinity postun "$@"
 if [ $1 -eq 0 ]; then
-    %{_sbindir}/plymouth-set-default-plugin --reset
+    if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "spinfinity" ]; then
+        %{_sbindir}/plymouth-set-default-plugin --reset
+    fi
 fi
 
 %post plugin-fade-in
+echo plymouth-fade-in post "$@"
 if [ $1 -eq 1 ]; then
     %{_sbindir}/plymouth-set-default-plugin fade-in
 fi
 
 %postun plugin-fade-in
+echo plymouth-fade-in postun "$@"
 if [ $1 -eq 0 ]; then
-    %{_sbindir}/plymouth-set-default-plugin --reset
+    if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "fade-in" ]; then
+        %{_sbindir}/plymouth-set-default-plugin --reset
+    fi
 fi
 
-
 %files
 %defattr(-, root, root)
 %doc AUTHORS NEWS README