rpms/lcdproc/devel lcdproc-0.5.2-initscripts.patch, 1.5, 1.6 lcdproc.spec, 1.13, 1.14

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/pkgs/rpms/lcdproc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10855

Modified Files:
	lcdproc-0.5.2-initscripts.patch lcdproc.spec 
Log Message:
- Disable default configuration (only provided as examples)


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lcdproc-0.5.2-initscripts.patch	5 Mar 2009 10:15:49 -0000	1.5
+++ lcdproc-0.5.2-initscripts.patch	14 Apr 2009 14:23:10 -0000	1.6
@@ -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-03-05 11:11:24.000000000 +0100
++++ lcdproc-0.5.2/scripts/init-LCDd.LSB.in	2009-04-14 16:15:46.000000000 +0200
 @@ -1,10 +1,18 @@
  #! /bin/sh
 +#
@@ -22,7 +22,7 @@
  # Default-Stop:      S 0 1 6
  # Short-Description: LCDproc Server Daemon
  # Description:       LSB init script for LCDd, the display
-@@ -12,57 +20,59 @@
+@@ -12,57 +20,62 @@
  ### END INIT INFO
  
  
@@ -44,30 +44,32 @@
 -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
++
  
--# 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
++# 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
 +# Source function library.
 +if [ -e /etc/rc.d/init.d/functions ]; then
 +  . /etc/rc.d/init.d/functions
 +fi
  
+-# load LSB 3.x init functions
+-. /lib/lsb/init-functions
++# check that non-default config file exists.
++ [ -f $configfile ] || exit 6
+ 
  
  case "$1" in
    start)
@@ -124,7 +126,7 @@
 +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-03-05 11:12:01.000000000 +0100
++++ lcdproc-0.5.2/scripts/init-lcdproc.LSB.in	2009-04-14 16:16:19.000000000 +0200
 @@ -1,10 +1,19 @@
  #! /bin/sh
 +#
@@ -147,7 +149,7 @@
  # Default-Stop:      S 0 1 6
  # Short-Description: LCDproc system status information viewer
  # Description:       LSB init script for lcdproc, the system
-@@ -12,57 +21,58 @@
+@@ -12,57 +21,60 @@
  ### END INIT INFO
  
  
@@ -192,6 +194,8 @@
 +  . /etc/rc.d/init.d/functions
 +fi
  
++# check that non-default config file exists.
++ [ -f $configfile ] || exit 6
  
  case "$1" in
    start)


Index: lcdproc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcdproc/devel/lcdproc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lcdproc.spec	14 Apr 2009 13:47:47 -0000	1.13
+++ lcdproc.spec	14 Apr 2009 14:23:10 -0000	1.14
@@ -99,6 +99,15 @@
 install -pm 0755 scripts/init-LCDd.LSB  $RPM_BUILD_ROOT%{_initrddir}/LCDd
 install -pm 0755 scripts/init-lcdproc.LSB  $RPM_BUILD_ROOT%{_initrddir}/lcdproc
 
+#Disable default configuration
+#Thoses are only provided as an example since ncurses isn't a suitable default configuration.
+for f in LCDd.conf lcdproc.conf ; do
+mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}/${f} \
+  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}/${f}.example
+touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}/${f}
+done
+
+
 
 
 %post
@@ -132,7 +141,8 @@
 %{_sbindir}/*
 %{_mandir}/man?/*
 %dir %{_sysconfdir}/sysconfig/%{name}
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}/*.conf
+%ghost %{_sysconfdir}/sysconfig/%{name}/*.conf
+%config %{_sysconfdir}/sysconfig/%{name}/*.conf.example
 %{_initrddir}/LCDd
 %{_initrddir}/lcdproc
 
@@ -140,6 +150,7 @@
 %changelog
 * 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)
 
 * Thu Mar  5 2009 kwizart < kwizart at gmail.com > - 0.5.2-10
 - Disable LCDd lcdproc initscript by default.