From 767b8c8a1ac0344e45037b199ce20397c93c7787 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 08:04:15 +0000 Subject: [PATCH 1/4] Initialize branch F-11 for lcdproc --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 4a2ecdf2ae64259cc91ae8290b6c598f0acb6d1b Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 13 May 2009 16:38:59 +0000 Subject: [PATCH 2/4] - Improve the initscripts patch - Fix #498384 --- lcdproc-0.5.2-initscripts.patch | 160 ++++++++++++++++++++++---------- lcdproc.spec | 5 +- 2 files changed, 113 insertions(+), 52 deletions(-) diff --git a/lcdproc-0.5.2-initscripts.patch b/lcdproc-0.5.2-initscripts.patch index ffb4880..fe83c45 100644 --- a/lcdproc-0.5.2-initscripts.patch +++ b/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 diff --git a/lcdproc.spec b/lcdproc.spec index 824a8c9..a55c70f 100644 --- a/lcdproc.spec +++ b/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) From abbad202da3c06b0f17e9860253f440608a45eaa Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:44:50 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 11d537e..7e9b620 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: lcdproc -# $Id$ +# $Id: Makefile,v 1.1 2007/05/21 17:27:39 wtogami Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 2cf94e6a35266d9fb8b387ed8c9cd2cda9483dbc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 20:34:06 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 7e9b620..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: lcdproc -# $Id: Makefile,v 1.1 2007/05/21 17:27:39 wtogami Exp $ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 diff --git a/import.log b/import.log deleted file mode 100644 index 91592a6..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -lcdproc-0_5_2-9_fc10:HEAD:lcdproc-0.5.2-9.fc10.src.rpm:1236187012