rpms/plymouth/devel plymouth.spec,1.9,1.10

[Peter Jones (pjones)]

Author: pjones

Update of /cvs/extras/rpms/plymouth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21994

Modified Files:
	plymouth.spec 
Log Message:
Fix ldconfig to be run on -libs not on the main package.
Fix main package and plugins not to reset inappropriately.



Index: plymouth.spec
===================================================================
RCS file: /cvs/extras/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plymouth.spec	16 Jun 2008 21:33:14 -0000	1.9
+++ plymouth.spec	17 Jun 2008 17:43:57 -0000	1.10
@@ -86,32 +86,41 @@
 %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