Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit splashy
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 06 Aug 2007 23:15:44 +0200
  • Message-id: <20070806211544.AC41167817A@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package splashy
checked in at Mon Aug 6 23:15:44 CEST 2007.

--------
--- splashy/splashy.changes     2007-08-03 21:19:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/splashy/splashy.changes        2007-08-06 15:46:07.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Aug  6 11:42:46 CEST 2007 - hmacht@xxxxxxx
+
+- call /sbin/mkinitrd_setup in %postun to remove links
+  (novell bug 297219)
+- exit gracefully if convert is not installed
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ splashy.spec ++++++
--- /var/tmp/diff_new_pack.i10694/_old  2007-08-06 23:15:07.000000000 +0200
+++ /var/tmp/diff_new_pack.i10694/_new  2007-08-06 23:15:07.000000000 +0200
@@ -12,7 +12,7 @@
 Name:           splashy
 Summary:        A complete user-space boot splash system
 Version:        0.3.3
-Release:        13
+Release:        15
 License:        GPL v2 or later
 Group:          System/Boot
 URL:            http://splashy.alioth.debian.org/wiki/doku.php
@@ -162,6 +162,7 @@
 
 %postun
 %run_ldconfig
+/sbin/mkinitrd_setup
 
 %files
 %defattr(-,root,root)
@@ -186,6 +187,10 @@
 %{_libdir}/lib%{name}*.so
 
 %changelog
+* Mon Aug 06 2007 - hmacht@xxxxxxx
+- call /sbin/mkinitrd_setup in %%postun to remove links
+  (novell bug 297219)
+- exit gracefully if convert is not installed
 * Fri Aug 03 2007 - hmacht@xxxxxxx
 - pm-utils-splashy.sh: Don't create screenshot if splash is
   disabled

++++++ pm-utils-splashy.sh ++++++
--- splashy/pm-utils-splashy.sh 2007-08-03 21:18:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/splashy/pm-utils-splashy.sh    2007-08-06 12:52:29.000000000 +0200
@@ -21,19 +21,25 @@
     get_x_user
     if [ -z "$X_USER" -o -z "$DISP" ]; then
        echo "Could not get X_USER"
-       exit 0
+       exit 1
+    fi
+
+    if [ ! -x "`which convert`" ]; then
+       echo "convert from ImageMagick package not found"
+       exit 1
     fi
 
     su - $X_USER -c "DISPLAY=$DISP xwd -root -silent > /tmp/$IMG"
     convert /tmp/$IMG -blur 20 -separate /tmp/${IMG}.png
 
-    cp /etc/splashy/themes/default/suspend.png /tmp/${IMG}.png.bak
+    cp /etc/splashy/themes/default/suspend.png /etc/splashy/themes/default/suspend.png.bak
     cp /tmp/${IMG}-0.png /etc/splashy/themes/default/suspend.png
 }
 
 restore_snapshot() {
-    mv /tmp/${IMG}.png.bak /etc/splashy/themes/default/suspend.png
-    rm /tmp/${IMG}
+    [ -e "/etc/splashy/themes/default/suspend.png.bak" ] || exit 0
+    mv /etc/splashy/themes/default/suspend.png.bak /etc/splashy/themes/default/suspend.png
+    rm /etc/splashy/themes/default/suspend.png.bak
     rm /tmp/${IMG}*.png
 }
 
@@ -46,5 +52,6 @@
        RES=`grep '^ *splash *= *n' /etc/suspend.conf`
        [ -z "$RES" ] && restore_snapshot
        ;;
+
     *) ;;
 esac



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >