rpms/lcdproc/devel import.log, NONE, 1.1 lcdproc-0.5.2-initscripts.patch, 1.2, 1.3 lcdproc.spec, 1.10, 1.11
NicolasChauvet
kwizart at fedoraproject.org
Wed Mar 4 17:26:06 UTC 2009
Author: kwizart
Update of /cvs/pkgs/rpms/lcdproc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24031/devel
Modified Files:
lcdproc-0.5.2-initscripts.patch lcdproc.spec
Added Files:
import.log
Log Message:
rework scripts
--- NEW FILE import.log ---
lcdproc-0_5_2-9_fc10:HEAD:lcdproc-0.5.2-9.fc10.src.rpm:1236187012
lcdproc-0.5.2-initscripts.patch:
Index: lcdproc-0.5.2-initscripts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lcdproc/devel/lcdproc-0.5.2-initscripts.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lcdproc-0.5.2-initscripts.patch 7 Nov 2008 17:14:46 -0000 1.2
+++ lcdproc-0.5.2-initscripts.patch 4 Mar 2009 17:26:05 -0000 1.3
@@ -1,28 +1,56 @@
-diff -Naurp lcdproc-0.5.2.orig/scripts/init-LCDd.LSB.in lcdproc-0.5.2/scripts/init-LCDd.LSB.in
---- lcdproc-0.5.2.orig/scripts/init-LCDd.LSB.in 2007-04-14 10:41:20.000000000 -0400
-+++ lcdproc-0.5.2/scripts/init-LCDd.LSB.in 2008-11-07 12:07:34.597854268 -0500
-@@ -4,6 +4,7 @@
+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-03-03 17:06:11.000000000 +0100
+@@ -1,6 +1,14 @@
+ #! /bin/sh
++#
++# chkconfig: 345 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
++#
++# config: /etc/sysconfig/lcdproc/LCDd.conf
+
+-#### BEGIN INIT INFO
++### 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: 2 3 4 5
- # Default-Stop: S 0 1 6
- # Short-Description: LCDproc Server Daemon
-@@ -23,8 +24,10 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
- NAME=LCDd
- DAEMON=${sbindir}/$NAME
- DESC="LCDproc display server daemon"
+@@ -12,57 +20,59 @@
+ ### END INIT INFO
+
+
+-# local variables
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-bindir=@bindir@
+-sbindir=@sbindir@
+-etc=@sysconfdir@
+-
+-PATH=/sbin:/bin:/usr/sbin:/usr/bin
+-NAME=LCDd
+-DAEMON=${sbindir}/$NAME
+-DESC="LCDproc display server daemon"
-DEFAULTS=/etc/default/$NAME
-+DEFAULTS=@sysconfdir@/${NAME}
- START=yes
+-START=yes
+-
+-# Source defaults file; edit that file to configure this script.
+-if [ -e "${DEFAULTS}" ]; then
+- . "${DEFAULTS}"
+-fi
+-
+-# If we're not to start the daemon, simply exit
+-if [ "${START}" != "yes" ]; then
+- exit 0
+-fi
++prog=LCDd
++lockfile=/var/lock/subsys/$prog
++configfile=@sysconfdir@/$prog.conf
+RETVAL=0
-+
- # Source defaults file; edit that file to configure this script.
- if [ -e "${DEFAULTS}" ]; then
-@@ -40,29 +43,39 @@ fi
- test -x $DAEMON || exit 5
+-# installation check
+-test -x $DAEMON || exit 5
# load LSB 3.x init functions
-. /lib/lsb/init-functions
@@ -41,38 +69,70 @@
- log_daemon_msg "Starting $DESC" "$NAME"
- start_daemon $DAEMON $OPTIONS
- log_end_msg $?
-+ echo -n $"Starting $DESC $NAME :"
-+ daemon $DAEMON $OPTIONS
++ echo -n $"Starting $prog: "
++ daemon $prog -c $configfile
+ RETVAL=$?
+ echo
++ [ $RETVAL -eq 0 ] && touch $lockfile
++ return $RETVAL
;;
stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
-+ echo -n $"Stopping $DESC $NAME :"
- killproc $DAEMON
+- killproc $DAEMON
- log_end_msg $?
+- ;;
+- restart|reload|force-reload)
+- $0 stop
+- sleep 1
+- $0 start
++ echo -n $"Shutting down $prog: "
++ killproc $prog
+ RETVAL=$?
+ echo
- ;;
- restart|reload|force-reload)
- $0 stop
- sleep 1
-+ RETVAL=0
- $0 start
++ [ $RETVAL -eq 0 ] && rm -f $lockfile
++ return $RETVAL
++ ;;
++ status)
++ status $prog
++ ;;
++ restart|force-reload)
++ stop
++ start
++ ;;
++ try-restart|condrestart)
++ if [ -f $lockfile ]; then
++ stop
++ start
++ fi
++ ;;
++ reload)
++ exit 3
;;
*)
- echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
-+ echo $"Usage: $0 {start|stop|restart|reload|force-reload}" >&2
++ echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
exit 2
- ;;
+- ;;
esac
-exit 0
+exit $RETVAL
-diff -Naurp lcdproc-0.5.2.orig/scripts/init-lcdproc.LSB.in lcdproc-0.5.2/scripts/init-lcdproc.LSB.in
---- lcdproc-0.5.2.orig/scripts/init-lcdproc.LSB.in 2007-04-14 10:41:20.000000000 -0400
-+++ lcdproc-0.5.2/scripts/init-lcdproc.LSB.in 2008-11-07 12:06:30.333851207 -0500
-@@ -4,6 +4,7 @@
+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-03-03 17:09:51.000000000 +0100
+@@ -1,9 +1,18 @@
+ #! /bin/sh
++#
++# chkconfig: 345 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
++#
++# config: /etc/sysconfig/lcdproc/lcdproc.conf
+
+-#### BEGIN INIT INFO
++### BEGIN INIT INFO
# Provides: lcdproc
# Required-Start: $syslog $local_fs $network $remote_fs
# Required-Stop: $syslog $local_fs $network $remote_fs
@@ -80,26 +140,46 @@
# Default-Start: 2 3 4 5
# Default-Stop: S 0 1 6
# Short-Description: LCDproc system status information viewer
-@@ -23,8 +24,9 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
- NAME=lcdproc
- DAEMON=${bindir}/$NAME
- DESC="LCDproc system status monitor"
+@@ -12,57 +21,58 @@
+ ### END INIT INFO
+
+
+-# local variables
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-bindir=@bindir@
+-sbindir=@sbindir@
+-etc=@sysconfdir@
+-
+-PATH=/sbin:/bin:/usr/sbin:/usr/bin
+-NAME=lcdproc
+-DAEMON=${bindir}/$NAME
+-DESC="LCDproc system status monitor"
-DEFAULTS=/etc/default/$NAME
-+DEFAULTS=@sysconfdir@/${NAME}
- START=yes
+-START=yes
+-
+-# 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
- # Source defaults file; edit that file to configure this script.
- if [ -e "${DEFAULTS}" ]; then
-@@ -40,29 +42,39 @@ fi
- 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
++# load LSB 3.x init functions
+if [ -e /lib/lsb/init-functions ]; then
+ . /lib/lsb/init-functions
-+fi
-+
+ fi
+
+-# installation check
+-test -x $DAEMON || exit 5
+-
+-# load LSB 3.x init functions
+-. /lib/lsb/init-functions
+# Source function library.
+if [ -e /etc/rc.d/init.d/functions ]; then
+ . /etc/rc.d/init.d/functions
@@ -111,30 +191,50 @@
- log_daemon_msg "Starting $DESC" "$NAME"
- start_daemon $DAEMON $OPTIONS
- log_end_msg $?
-+ echo -n $"Starting $DESC $NAME :"
-+ daemon $DAEMON $OPTIONS
++ echo -n $"Starting $prog: "
++ daemon $prog -c $configfile
+ RETVAL=$?
+ echo
++ [ $RETVAL -eq 0 ] && touch $lockfile
++ return $RETVAL
;;
stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
-+ echo -n $"Stopping $DESC $NAME :"
- killproc $DAEMON
+- killproc $DAEMON
- log_end_msg $?
+- ;;
+- restart|reload|force-reload)
+- $0 stop
+- sleep 1
+- $0 start
++ echo -n $"Shutting down $prog: "
++ killproc $prog
+ RETVAL=$?
+ echo
- ;;
- restart|reload|force-reload)
- $0 stop
- sleep 1
-+ RETVAL=0
- $0 start
++ [ $RETVAL -eq 0 ] && rm -f $lockfile
++ return $RETVAL
++ ;;
++ status)
++ status $prog
++ ;;
++ restart|force-reload)
++ stop
++ start
++ ;;
++ try-restart|condrestart)
++ if [ -f $lockfile ]; then
++ stop
++ start
++ fi
++ ;;
++ reload)
++ exit 3
;;
*)
- echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
-+ echo $"Usage: $0 {start|stop|restart|reload|force-reload}" >&2
++ echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
exit 2
- ;;
+- ;;
esac
-exit 0
Index: lcdproc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcdproc/devel/lcdproc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lcdproc.spec 25 Feb 2009 12:45:06 -0000 1.10
+++ lcdproc.spec 4 Mar 2009 17:26:05 -0000 1.11
@@ -1,7 +1,7 @@
Summary: LCDproc displays real-time system information on a 20x4 backlit LCD
Name: lcdproc
Version: 0.5.2
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPLv2
URL: http://lcdproc.omnipotent.net
Group: System Environment/Libraries
@@ -15,9 +15,8 @@
BuildRequires: graphviz
# necessary for imonlcd patch
-BuildRequires: automake
+BuildRequires: libtool
-BuildRequires: glibc-headers
BuildRequires: libusb-devel
BuildRequires: lirc-devel
BuildRequires: ncurses-devel
@@ -54,7 +53,7 @@
%prep
%setup -q
-#patch0 -p1 -b .initscripts
+%patch0 -p1 -b .initscripts
%patch1 -p1 -b .memset_swp
%patch2 -p1 -b .imonlcd
chmod 644 server/drivers/timing.h
@@ -63,9 +62,10 @@
touch -r TODO LCDd.conf
%build
-# run aclocal and automake to pick up the imon lcd additions
-aclocal
-automake
+# 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 \
@@ -77,21 +77,19 @@
--enable-stat-smbfs \
--with-lcdport=13666
-sed -i -e 's|-L/usr/lib|-L%{_libdir}|g' Makefile
-
-make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT __doc
-make install DESTDIR=$RPM_BUILD_ROOT
-make install-html-guides DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install-html-guides DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
# Fix docs
mkdir -p __doc/developer-guide
mkdir -p __doc/user-guide
-install -m 0644 $RPM_BUILD_ROOT%{_datadir}/doc/lcdproc/user-guide/* __doc/user-guide
-install -m 0644 $RPM_BUILD_ROOT%{_datadir}/doc/lcdproc/developer-guide/* __doc/developer-guide
+install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/doc/lcdproc/user-guide/* __doc/user-guide
+install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/doc/lcdproc/developer-guide/* __doc/developer-guide
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
# init
@@ -138,6 +136,10 @@
%changelog
+* Mon Mar 2 2009 kwizart < kwizart at gmail.com > - 0.5.2-9
+- re-enable patch0
+- Prevent some timestamps changes.
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the fedora-extras-commits
mailing list