Minor fixes to openSUSE packaging.

opensuse/SOURCES/jenkins.init.in

@@ -95,7 +95,7 @@ case "$1" in
         if [ $CHECK -eq 7 ]; then
                 rm -f "$JENKINS_PID_FILE"
                 startproc -s -l /var/log/jenkins.rc -u "$JENKINS_USER" -p "$JENKINS_PID_FILE" $JAVA_CMD $PARAMS
-                JPROC=$( find /proc -maxdepth 2 -user jenkins -name exe -lname "*/bin/java" )
+                JPROC=$( find /proc -maxdepth 2 -user $JENKINS_USER -name exe -lname "*/bin/java" )
                 if [ -n "$JPROC" ]; then
                         basename `dirname $JPROC` >"$JENKINS_PID_FILE"
                         rc_status -v

opensuse/SOURCES/jenkins.logrotate

@@ -8,10 +8,10 @@
     missingok
     create 644
     postrotate
-        # NB: no dependencies to configuration in /etc/sysconfig/jenkins
+        [ -r /etc/sysconfig/jenkins ] && source /etc/sysconfig/jenkins
         if [ -s /var/run/jenkins.pid ]; then
             JPID=`cat /var/run/jenkins.pid`
-            test -n "`find /proc/$JPID -maxdepth 0 -user jenkins 2>/dev/null`" && kill -s ALRM $JPID || :
+            test -n "`find /proc/$JPID -maxdepth 0 -user ${JENKINS_USER:-jenkins} 2>/dev/null`" && kill -s ALRM $JPID || :
         fi
     endscript
 }

opensuse/SPECS/jenkins.spec

@@ -88,7 +88,7 @@ rm -rf "%{buildroot}"
 	-d "%{workdir}" jenkins &>/dev/null || :
 
 %post
-/sbin/chkconfig --add jenkins
+[ $1 -eq 1 ] && /sbin/chkconfig --add jenkins
 
 # If we have an old hudson install, rename it to jenkins
 if test -d /var/lib/hudson; then