From f5a98f3571983c61bba004985c1c64bd05b698b2 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 24 Mar 2009 14:05:55 +0000
Subject: [PATCH] Monotone-Parent: 43675f1618c28a385375562d6eaf3afabaa316ae
 Monotone-Revision: 261d328a4a30eba63838d32540b23a78ce2a3840

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-03-24T14:05:55
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/GNUmakefile | 2 +-
 sogo.spec                         | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/UI/WebServerResources/GNUmakefile b/UI/WebServerResources/GNUmakefile
index b2e166e74..36c2bab6f 100644
--- a/UI/WebServerResources/GNUmakefile
+++ b/UI/WebServerResources/GNUmakefile
@@ -2,7 +2,7 @@
 
 include ../common.make
 
-WEBSERVER_RESOURCE_FILES = $(shell ls *css *ico *js *.jpg *gif *png *html *txt)
+WEBSERVER_RESOURCE_FILES = $(shell ls *css *ico *js *gif *png *html *txt)
 
 all ::
 
diff --git a/sogo.spec b/sogo.spec
index 044f9af60..315d2141a 100644
--- a/sogo.spec
+++ b/sogo.spec
@@ -222,8 +222,11 @@ if ! id sogo >& /dev/null; then /usr/sbin/adduser sogo > /dev/null 2>&1; fi
 /sbin/chkconfig --add sogod
 
 %preun
-/sbin/chkconfig --del sogod
-/sbin/service sogod stop > /dev/null 2>&1
+if [ "$1" == "0" ]
+then
+  /sbin/chkconfig --del sogod
+  /sbin/service sogod stop > /dev/null 2>&1
+fi
 
 %postun
 if test "$1" = "0"