dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: lcdproc
-# $Id$
-NAME := lcdproc
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

import.log

@@ -1 +0,0 @@
-lcdproc-0_5_2-9_fc10:HEAD:lcdproc-0.5.2-9.fc10.src.rpm:1236187012

lcdproc-0.5.2-initscripts.patch

@@ -1,6 +1,6 @@
 diff -up lcdproc-0.5.2/scripts/init-LCDd.LSB.in.initscripts lcdproc-0.5.2/scripts/init-LCDd.LSB.in
 --- lcdproc-0.5.2/scripts/init-LCDd.LSB.in.initscripts	2007-04-14 16:41:20.000000000 +0200
-+++ lcdproc-0.5.2/scripts/init-LCDd.LSB.in	2009-04-14 16:15:46.000000000 +0200
++++ lcdproc-0.5.2/scripts/init-LCDd.LSB.in	2009-05-13 17:14:25.000000000 +0200
 @@ -1,10 +1,18 @@
  #! /bin/sh
 +#
@@ -22,7 +22,7 @@ diff -up lcdproc-0.5.2/scripts/init-LCDd.LSB.in.initscripts lcdproc-0.5.2/script
  # Default-Stop:      S 0 1 6
  # Short-Description: LCDproc Server Daemon
  # Description:       LSB init script for LCDd, the display
-@@ -12,57 +20,62 @@
+@@ -12,57 +20,92 @@
  ### END INIT INFO
  
  
@@ -43,32 +43,71 @@ diff -up lcdproc-0.5.2/scripts/init-LCDd.LSB.in.initscripts lcdproc-0.5.2/script
 -# Source defaults file; edit that file to configure this script.
 -if [ -e "${DEFAULTS}" ]; then
 -  . "${DEFAULTS}"
--fi
 +prog=LCDd
 +lockfile=/var/lock/subsys/$prog
 +configfile=@sysconfdir@/$prog.conf
 +RETVAL=0
 +
- 
--# If we're not to start the daemon, simply exit
--if [ "${START}" != "yes" ]; then
--    exit 0
++
 +# load LSB 3.x init functions
 +if [ -e /lib/lsb/init-functions ]; then
 +  . /lib/lsb/init-functions
  fi
  
--# installation check
--test -x $DAEMON || exit 5
+-# If we're not to start the daemon, simply exit
+-if [ "${START}" != "yes" ]; then
+-    exit 0
 +# Source function library.
 +if [ -e /etc/rc.d/init.d/functions ]; then
 +  . /etc/rc.d/init.d/functions
-+fi
+ fi
+ 
+-# installation check
+-test -x $DAEMON || exit 5
++# check that non-default config file exists.
++ [ -f $configfile ] || exit 6
  
 -# load LSB 3.x init functions
 -. /lib/lsb/init-functions
-+# check that non-default config file exists.
-+ [ -f $configfile ] || exit 6
++
++start() {
++	echo -n $"Starting $prog services: "
++	daemon $prog -c $configfile
++	RETVAL=$?
++	echo
++	[ $RETVAL -eq 0 ] && touch $lockfile || \
++	   RETVAL=1
++	return $RETVAL
++}	
++
++stop() {
++	echo -n $"Shutting down $prog services: "
++	killproc $prog
++	RETVAL=$?
++	echo
++	[ $RETVAL -eq 0 ] && rm -f $lockfile
++	return $RETVAL
++}	
++
++reload() {
++        echo -n $"Reloading $prog file: "
++	killproc $prog -HUP
++	RETVAL=$?
++	echo
++	return $RETVAL
++}	
++
++rhstatus() {
++	status $prog
++	return $?
++}	
++
++
++# Allow status as non-root.
++if [ "$1" = status ]; then
++       rhstatus
++       exit $?
++fi
  
  
  case "$1" in
@@ -76,12 +115,7 @@ diff -up lcdproc-0.5.2/scripts/init-LCDd.LSB.in.initscripts lcdproc-0.5.2/script
 -	log_daemon_msg "Starting $DESC" "$NAME"
 -	start_daemon $DAEMON $OPTIONS
 -	log_end_msg $?
-+	echo -n $"Starting $prog: "
-+	daemon $prog -c $configfile
-+	RETVAL=$?
-+        echo
-+	[ $RETVAL -eq 0 ] && touch $lockfile
-+	return $RETVAL
++	start
  	;;
    stop)
 -	log_daemon_msg "Stopping $DESC" "$NAME"
@@ -92,12 +126,7 @@ diff -up lcdproc-0.5.2/scripts/init-LCDd.LSB.in.initscripts lcdproc-0.5.2/script
 -	$0 stop
 -	sleep 1
 -	$0 start
-+	echo -n $"Shutting down $prog: "
-+	killproc $prog
-+	RETVAL=$?
-+        echo
-+	[ $RETVAL -eq 0 ] && rm -f $lockfile
-+	return $RETVAL
++	stop
 +	;;
 +  status)
 +	status $prog
@@ -113,7 +142,7 @@ diff -up lcdproc-0.5.2/scripts/init-LCDd.LSB.in.initscripts lcdproc-0.5.2/script
 +	fi
 +	;;
 +  reload)
-+	exit 3
++	reload
  	;;
    *)
 -	echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
@@ -126,7 +155,7 @@ diff -up lcdproc-0.5.2/scripts/init-LCDd.LSB.in.initscripts lcdproc-0.5.2/script
 +exit $RETVAL
 diff -up lcdproc-0.5.2/scripts/init-lcdproc.LSB.in.initscripts lcdproc-0.5.2/scripts/init-lcdproc.LSB.in
 --- lcdproc-0.5.2/scripts/init-lcdproc.LSB.in.initscripts	2007-04-14 16:41:20.000000000 +0200
-+++ lcdproc-0.5.2/scripts/init-lcdproc.LSB.in	2009-04-14 16:16:19.000000000 +0200
++++ lcdproc-0.5.2/scripts/init-lcdproc.LSB.in	2009-05-13 10:37:32.000000000 +0200
 @@ -1,10 +1,19 @@
  #! /bin/sh
 +#
@@ -149,7 +178,7 @@ diff -up lcdproc-0.5.2/scripts/init-lcdproc.LSB.in.initscripts lcdproc-0.5.2/scr
  # Default-Stop:      S 0 1 6
  # Short-Description: LCDproc system status information viewer
  # Description:       LSB init script for lcdproc, the system
-@@ -12,57 +21,60 @@
+@@ -12,57 +21,91 @@
  ### END INIT INFO
  
  
@@ -170,44 +199,78 @@ diff -up lcdproc-0.5.2/scripts/init-lcdproc.LSB.in.initscripts lcdproc-0.5.2/scr
 -# Source defaults file; edit that file to configure this script.
 -if [ -e "${DEFAULTS}" ]; then
 -  . "${DEFAULTS}"
--fi
 +prog=lcdproc
 +lockfile=/var/lock/subsys/$prog
 +configfile=@sysconfdir@/$prog.conf
 +RETVAL=0
- 
--# If we're not to start the daemon, simply exit
--if [ "${START}" != "yes" ]; then
--    exit 0
++
 +# load LSB 3.x init functions
 +if [ -e /lib/lsb/init-functions ]; then
 +  . /lib/lsb/init-functions
  fi
  
--# installation check
--test -x $DAEMON || exit 5
--
--# load LSB 3.x init functions
--. /lib/lsb/init-functions
+-# If we're not to start the daemon, simply exit
+-if [ "${START}" != "yes" ]; then
+-    exit 0
 +# Source function library.
 +if [ -e /etc/rc.d/init.d/functions ]; then
 +  . /etc/rc.d/init.d/functions
-+fi
+ fi
  
+-# installation check
+-test -x $DAEMON || exit 5
 +# check that non-default config file exists.
 + [ -f $configfile ] || exit 6
  
+-# load LSB 3.x init functions
+-. /lib/lsb/init-functions
++
++start() {
++	echo -n $"Starting $prog services: "
++	daemon $prog -c $configfile
++	RETVAL=$?
++	echo
++	[ $RETVAL -eq 0 ] && touch $lockfile || \
++	   RETVAL=1
++	return $RETVAL
++}	
++
++stop() {
++	echo -n $"Shutting down $prog services: "
++	killproc $prog
++	RETVAL=$?
++	echo
++	[ $RETVAL -eq 0 ] && rm -f $lockfile
++	return $RETVAL
++}	
++
++reload() {
++        echo -n $"Reloading $prog file: "
++	killproc $prog -HUP
++	RETVAL=$?
++	echo
++	return $RETVAL
++}	
++
++rhstatus() {
++	status $prog
++	return $?
++}	
++
++
++# Allow status as non-root.
++if [ "$1" = status ]; then
++       rhstatus
++       exit $?
++fi
+ 
+ 
  case "$1" in
    start)
 -	log_daemon_msg "Starting $DESC" "$NAME"
 -	start_daemon $DAEMON $OPTIONS
 -	log_end_msg $?
-+	echo -n $"Starting $prog: "
-+	daemon $prog -c $configfile
-+	RETVAL=$?
-+        echo
-+	[ $RETVAL -eq 0 ] && touch $lockfile
-+	return $RETVAL
++	start
  	;;
    stop)
 -	log_daemon_msg "Stopping $DESC" "$NAME"
@@ -218,12 +281,7 @@ diff -up lcdproc-0.5.2/scripts/init-lcdproc.LSB.in.initscripts lcdproc-0.5.2/scr
 -	$0 stop
 -	sleep 1
 -	$0 start
-+	echo -n $"Shutting down $prog: "
-+	killproc $prog
-+	RETVAL=$?
-+        echo
-+	[ $RETVAL -eq 0 ] && rm -f $lockfile
-+	return $RETVAL
++	stop
 +	;;
 +  status)
 +	status $prog
@@ -239,7 +297,7 @@ diff -up lcdproc-0.5.2/scripts/init-lcdproc.LSB.in.initscripts lcdproc-0.5.2/scr
 +	fi
 +	;;
 +  reload)
-+	exit 3
++	reload
  	;;
    *)
 -	echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2

lcdproc.spec

@@ -1,7 +1,7 @@
 Summary:        LCDproc displays real-time system information on a 20x4 backlit LCD
 Name:           lcdproc
 Version:        0.5.2
-Release:        11%{?dist}
+Release:        12%{?dist}
 License:        GPLv2
 URL:            http://lcdproc.omnipotent.net
 Group:          System Environment/Libraries
@@ -148,6 +148,9 @@ rm -rf $RPM_BUILD_ROOT __doc
 
 
 %changelog
+* Wed May 13 2009 kwizart < kwizart at gmail.com > - 0.5.2-12
+- Improve the initscripts patch - Fix #498384
+
 * Tue Apr 14 2009 kwizart < kwizart at gmail.com > - 0.5.2-11
 - Disable xmlto validation (Fix FTBFS)
 - Disable default configuration (only provided as examples)