rpms/lcdproc/devel lcdproc-0.5.3-initscripts.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 lcdproc.spec, 1.15, 1.16 sources, 1.2, 1.3 lcdproc-0.5.2-imonlcd.patch, 1.1, NONE lcdproc-0.5.2-initscripts.patch, 1.7, NONE lcdproc-0.5.2-memset_swp.patch, 1.1, NONE
Jarod Wilson
jwilson at fedoraproject.org
Mon Jun 22 14:02:53 UTC 2009
Author: jwilson
Update of /cvs/pkgs/rpms/lcdproc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23009
Modified Files:
.cvsignore lcdproc.spec sources
Added Files:
lcdproc-0.5.3-initscripts.patch
Removed Files:
lcdproc-0.5.2-imonlcd.patch lcdproc-0.5.2-initscripts.patch
lcdproc-0.5.2-memset_swp.patch
Log Message:
* Mon Jun 22 2009 Jarod Wilson <jarod at redhat.com> - 0.5.3-1
- Update to lcdproc v0.5.3 release
- Drop upstreamed imonlcd and memset_swp patches
- Switch to upstream's rpm initscripts (albeit still patched, need
to get that bit upstream for the next release)
lcdproc-0.5.3-initscripts.patch:
--- NEW FILE lcdproc-0.5.3-initscripts.patch ---
Index: lcdproc-0.5.3/scripts/init-LCDd.rpm.in
===================================================================
--- lcdproc-0.5.3.orig/scripts/init-LCDd.rpm.in
+++ lcdproc-0.5.3/scripts/init-LCDd.rpm.in
@@ -1,5 +1,5 @@
#!/bin/sh
-# This is the LCDd init-script for RPM based (RedHat, Mandrake) systems
+# This is the LCDd init-script for RPM based (Red Hat, Mandrake) systems
#
# Copyright (C) 2001 Rene Wagner <reenoo at gmx.de>
# 2001 Guillaume Filion <gfk at logidac.com>
@@ -19,25 +19,53 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
#
#
-# chkconfig: 345 70 21
+# chkconfig: - 70 21
# description: LCDd(8) is the LCDproc server used for displaying text and other data to LCDs. \
# Apart from the main client lcdproc(1) there are various clients. \
# See http://lcdproc.omnipotent.net for details.
# processname: LCDd
# pidfile: /var/run/LCDd.pid
# config: @sysconfdir@/LCDd.conf
+#
+### BEGIN INIT INFO
+# Provides: LCDd
+# Required-Start: $syslog $local_fs $network $remote_fs
+# Required-Stop: $syslog $local_fs $network $remote_fs
+# Should-Start: udev
+# Default-Start:
+# Default-Stop: S 0 1 6
+# Short-Description: LCDproc Server Daemon
+# Description: init script for LCDd, the display
+# server daemon in the LCDproc suite
+### END INIT INFO
+
+prog=LCDd
+lockfile=/var/lock/subsys/$prog
+configfile=@sysconfdir@/$prog.conf
+
+# load LSB 3.x init functions
+if [ -e /lib/lsb/init-functions ]; then
+ . /lib/lsb/init-functions
+fi
# Source function library.
-. /etc/rc.d/init.d/functions
+if [ -e /etc/rc.d/init.d/functions ]; then
+ . /etc/rc.d/init.d/functions
+fi
# Source networking configuration.
-. /etc/sysconfig/network
+if [ -e /etc/sysconfig/network ]; then
+ . /etc/sysconfig/network
+fi
# Check that networking is up.
if [ ${NETWORKING} = "no" ]; then
exit 0
fi
+# check that non-default config file exists.
+[ -f $configfile ] || exit 6
+
RETVAL=0
prefix=@prefix@
@@ -46,41 +74,49 @@ bindir=@bindir@
sbindir=@sbindir@
etc=@sysconfdir@
-LCDd=${sbindir}/LCDd
-configfile=${etc}/LCDd.conf
-
-[ -x ${LCDd} ] || exit 0
+[ -x ${bindir}/${prog} ] || exit 0
start() {
- echo -n "Starting up LCDd: "
- daemon ${LCDd} -c ${configfile}
-
+ echo -n "Starting ${prog} service: "
+ daemon ${prog} -c ${configfile}
RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/LCDd
echo
+ [ $RETVAL -eq 0 ] && touch ${lockfile} || \
+ RETVAL=1
+ return $RETVAL
}
stop() {
- echo -n "Shutting down LCDd: "
- killproc LCDd
+ echo -n "Shutting down ${prog} service: "
+ killproc ${prog}
RETVAL=$?
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/LCDd
echo
+ [ $RETVAL -eq 0 ] && rm -f ${lockfile}
+ return $RETVAL
}
-dostatus() {
- status LCDd
+reload() {
+ echo -n $"Reloading ${prog} conig file: "
+ killproc ${prog} -HUP
RETVAL=$?
+ echo
+ return $RETVAL
+}
+
+dostatus() {
+ status ${prog}
+ return $?
}
restart() {
stop
start
- RETVAL=$?
+ return $?
}
condrestart() {
- [ -e /var/lock/subsys/LCDd ] && restart || :
+ [ -f ${lockfile} ] && restart || :
+ return $?
}
# See how we were called.
@@ -94,15 +130,18 @@ case "$1" in
status)
dostatus
;;
- restart)
+ restart|force-reload)
restart
;;
- condrestart)
+ try-restart|condrestart)
condrestart
;;
+ reload)
+ reload
+ ;;
*)
- echo "Usage: $0 {start|stop|status|restart|condrestart}"
- exit 1
+ echo "Usage: $0 {start|stop|status|restart|condrestart|reload}"
+ exit 2
esac
exit $RETVAL
Index: lcdproc-0.5.3/scripts/init-lcdproc.rpm.in
===================================================================
--- lcdproc-0.5.3.orig/scripts/init-lcdproc.rpm.in
+++ lcdproc-0.5.3/scripts/init-lcdproc.rpm.in
@@ -19,68 +19,104 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
#
#
-# chkconfig: 345 71 20
+# chkconfig: - 71 20
# description: LCDd(8) is the LCDproc server used for displaying text and other data to LCDs. \
# Apart from the main client lcdproc(1) there are various clients. \
# See http://lcdproc.omnipotent.net for details.
# processname: lcdproc
# pidfile: /var/run/lcdproc.pid
-# config: /etc/sysconfig/lcdproc
+# config: @sysconfdir@/lcdproc.conf
+#
+### BEGIN INIT INFO
+# Provides: lcdproc
+# Required-Start: $syslog $local_fs $network $remote_fs
+# Required-Stop: $syslog $local_fs $network $remote_fs
+# Should-Start: LCDd
+# Default-Start:
+# Default-Stop: S 0 1 6
+# Short-Description: LCDproc system status information viewer
+# Description: LSB init script for lcdproc, the system
+# status information viewer in the LCDproc suite
+### END INIT INFO
+
+prog=lcdproc
+lockfile=/var/lock/subsys/$prog
+configfile=@sysconfdir@/$prog.conf
+RETVAL=0
+
+# load LSB 3.x init functions
+if [ -e /lib/lsb/init-functions ]; then
+ . /lib/lsb/init-functions
+fi
# Source function library.
-. /etc/rc.d/init.d/functions
+if [ -e /etc/rc.d/init.d/functions ]; then
+ . /etc/rc.d/init.d/functions
+fi
# Source networking configuration.
-. /etc/sysconfig/network
+if [ -e /etc/sysconfig/network ]; then
+ . /etc/sysconfig/network
+fi
# Check that networking is up.
if [ ${NETWORKING} = "no" ]; then
exit 0
fi
-RETVAL=0
-
prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
sbindir=@sbindir@
etc=@sysconfdir@
-lcdproc=${bindir}/lcdproc
+[ -x ${bindir}/${prog} ] || exit 0
-[ -x ${lcdproc} ] || exit 0
+# check that non-default config file exists.
+ [ -f $configfile ] || exit 6
start() {
- echo -n "Starting up lcdproc: "
- daemon ${lcdproc} $SCREENS
-
+ echo -n "Starting ${prog} service: "
+ daemon ${prog} -c ${configfile}
RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/lcdproc
echo
+ [ $RETVAL -eq 0 ] && touch ${lockfile} || \
+ RETVAL=1
+ return $RETVAL
}
stop() {
- echo -n "Shutting down lcdproc: "
- killproc lcdproc
+ echo -n "Shutting down ${prog} service: "
+ killproc ${prog}
RETVAL=$?
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/lcdproc
echo
+ [ $RETVAL -eq 0 ] && rm -f ${lockfile}
+ return $RETVAL
}
-dostatus() {
- status lcdproc
+reload() {
+ echo -n $"Reloading ${prog} config file: "
+ killproc ${prog} -HUP
RETVAL=$?
+ echo
+ return $RETVAL
+}
+
+dostatus() {
+ status ${prog}
+ return $?
}
restart() {
stop
start
- RETVAL=$?
+ return $?
}
condrestart() {
- [ -e /var/lock/subsys/lcdproc ] && restart || :
+ [ -f ${lockfile} ] && restart || :
+ return $?
}
# See how we were called.
@@ -94,14 +130,17 @@ case "$1" in
status)
dostatus
;;
- restart)
+ restart|force-reload)
restart
;;
- condrestart)
+ try-restart|condrestart)
condrestart
;;
+ reload)
+ reload
+ ;;
*)
- echo "Usage: $0 {start|stop|status|restart|condrestart}"
+ echo "Usage: $0 {start|stop|status|restart|condrestart|reload}"
exit 1
esac
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lcdproc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 21 May 2007 23:22:04 -0000 1.2
+++ .cvsignore 22 Jun 2009 14:02:19 -0000 1.3
@@ -1 +1,2 @@
lcdproc-0.5.2.tar.gz
+lcdproc-0.5.3.tar.gz
Index: lcdproc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcdproc/devel/lcdproc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- lcdproc.spec 13 May 2009 16:38:58 -0000 1.15
+++ lcdproc.spec 22 Jun 2009 14:02:20 -0000 1.16
@@ -1,23 +1,18 @@
Summary: LCDproc displays real-time system information on a 20x4 backlit LCD
Name: lcdproc
-Version: 0.5.2
-Release: 12%{?dist}
+Version: 0.5.3
+Release: 1%{?dist}
License: GPLv2
URL: http://lcdproc.omnipotent.net
Group: System Environment/Libraries
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0: lcdproc-0.5.2-initscripts.patch
-Patch1: lcdproc-0.5.2-memset_swp.patch
-Patch2: lcdproc-0.5.2-imonlcd.patch
-Patch3: lcdproc-0.5.2-novalidate.patch
+Patch0: lcdproc-0.5.3-initscripts.patch
+Patch1: lcdproc-0.5.2-novalidate.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen
BuildRequires: graphviz
-# necessary for imonlcd patch
-BuildRequires: libtool
-
BuildRequires: libusb-devel
BuildRequires: lirc-devel
BuildRequires: ncurses-devel
@@ -55,19 +50,13 @@ See also http://lcdproc.omnipotent.net.
%prep
%setup -q
%patch0 -p1 -b .initscripts
-%patch1 -p1 -b .memset_swp
-%patch2 -p1 -b .imonlcd
-%patch3 -p1 -b .novalidate
+%patch1 -p1 -b .novalidate
chmod 644 server/drivers/timing.h
sed -i -e 's|server/drivers|%{_libdir}/lcdproc|' LCDd.conf
touch -r TODO LCDd.conf
%build
-# run autoreconf to pick up the imon lcd additions
-# liboolize to refresh libtool
-autoreconf -f -i
-libtoolize --force
%configure \
--sysconfdir=%{_sysconfdir}/sysconfig/%{name} \
--enable-libusb \
@@ -96,8 +85,8 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
# init
install -d $RPM_BUILD_ROOT%{_initrddir}
-install -pm 0755 scripts/init-LCDd.LSB $RPM_BUILD_ROOT%{_initrddir}/LCDd
-install -pm 0755 scripts/init-lcdproc.LSB $RPM_BUILD_ROOT%{_initrddir}/lcdproc
+install -pm 0755 scripts/init-LCDd.rpm $RPM_BUILD_ROOT%{_initrddir}/LCDd
+install -pm 0755 scripts/init-lcdproc.rpm $RPM_BUILD_ROOT%{_initrddir}/lcdproc
#Disable default configuration
#Thoses are only provided as an example since ncurses isn't a suitable default configuration.
@@ -134,7 +123,7 @@ rm -rf $RPM_BUILD_ROOT __doc
%files
%defattr(-,root,root,-)
%doc README* INSTALL COPYING CREDITS TODO ChangeLog
-%doc docs/*.txt docs/README.* __doc/*
+%doc __doc/*
%{_bindir}/*
%dir %{_libdir}/lcdproc
%{_libdir}/lcdproc/*
@@ -148,6 +137,12 @@ rm -rf $RPM_BUILD_ROOT __doc
%changelog
+* Mon Jun 22 2009 Jarod Wilson <jarod at redhat.com> - 0.5.3-1
+- Update to lcdproc v0.5.3 release
+- Drop upstreamed imonlcd and memset_swp patches
+- Switch to upstream's rpm initscripts (albeit still patched, need
+ to get that bit upstream for the next release)
+
* Wed May 13 2009 kwizart < kwizart at gmail.com > - 0.5.2-12
- Improve the initscripts patch - Fix #498384
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lcdproc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 21 May 2007 23:22:04 -0000 1.2
+++ sources 22 Jun 2009 14:02:20 -0000 1.3
@@ -1 +1 @@
-860f192d061d87dda6512b11b79daac2 lcdproc-0.5.2.tar.gz
+fe9a7c9d8f2c5e76250ce2ea8f644921 lcdproc-0.5.3.tar.gz
--- lcdproc-0.5.2-imonlcd.patch DELETED ---
--- lcdproc-0.5.2-initscripts.patch DELETED ---
--- lcdproc-0.5.2-memset_swp.patch DELETED ---
More information about the fedora-extras-commits
mailing list