rpms/lcdproc/F-10 import.log, NONE, 1.1 lcdproc-0.5.2-novalidate.patch, NONE, 1.1 lcdproc-0.5.2-initscripts.patch, 1.2, 1.3 lcdproc.spec, 1.8, 1.9

Sun Apr 26 09:10:07 UTC 2009

Author: kwizart

Update of /cvs/pkgs/rpms/lcdproc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6939/F-10

Modified Files:
	lcdproc-0.5.2-initscripts.patch lcdproc.spec 
Added Files:
	import.log lcdproc-0.5.2-novalidate.patch 
Log Message:
Backport fixed for branches

--- NEW FILE import.log ---
lcdproc-0_5_2-11_fc12:F-10:lcdproc-0.5.2-11.fc12.src.rpm:1240736949

lcdproc-0.5.2-novalidate.patch:

--- NEW FILE lcdproc-0.5.2-novalidate.patch ---
diff -up lcdproc-0.5.2/docs/lcdproc-dev/Makefile.am.novalidate lcdproc-0.5.2/docs/lcdproc-dev/Makefile.am
--- lcdproc-0.5.2/docs/lcdproc-dev/Makefile.am.novalidate	2007-04-14 16:39:53.000000000 +0200
+++ lcdproc-0.5.2/docs/lcdproc-dev/Makefile.am	2009-04-14 15:28:01.000000000 +0200
@@ -18,6 +18,6 @@ developerguidedir = $(DESTDIR)$(htmldir)
 
 install-html-developerguide: $(xmlto) lcdproc-dev.docbook
 	$(mkinstalldirs) $(developerguidedir)
-	$(xmlto) html -o $(developerguidedir) lcdproc-dev.docbook
+	$(xmlto) html -o $(developerguidedir) --skip-validation lcdproc-dev.docbook
 
 ## EOF
diff -up lcdproc-0.5.2/docs/lcdproc-user/Makefile.am.novalidate lcdproc-0.5.2/docs/lcdproc-user/Makefile.am
--- lcdproc-0.5.2/docs/lcdproc-user/Makefile.am.novalidate	2009-04-14 15:32:24.000000000 +0200
+++ lcdproc-0.5.2/docs/lcdproc-user/Makefile.am	2009-04-14 15:32:44.000000000 +0200
@@ -21,6 +21,6 @@ userguidedir = $(DESTDIR)$(htmldir)/user
 
 install-html-userguide: $(xmlto) lcdproc-user.docbook
 	$(mkinstalldirs) $(userguidedir)
-	$(xmlto) html -o $(userguidedir) lcdproc-user.docbook
+	$(xmlto) html -o $(userguidedir) --skip-validation lcdproc-user.docbook
 
 ## EOF

lcdproc-0.5.2-initscripts.patch:

Index: lcdproc-0.5.2-initscripts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lcdproc/F-10/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:53:40 -0000	1.2
+++ lcdproc-0.5.2-initscripts.patch	26 Apr 2009 09:10:05 -0000	1.3
@@ -1,140 +1,251 @@
-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-04-14 16:15:46.000000000 +0200
+@@ -1,10 +1,18 @@
+ #! /bin/sh
++#
++# 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
++#
++# 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-Start:     2 3 4 5
++# Default-Start:     
  # 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"
+ # Description:       LSB init script for LCDd, the display
+@@ -12,57 +20,62 @@
+ ### 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
++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
- 
- # 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)
 -	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-04-14 16:16:19.000000000 +0200
+@@ -1,10 +1,19 @@
+ #! /bin/sh
++#
++# 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
++#
++# 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
+-# Default-Start:     2 3 4 5
 +# Should-Start:      LCDd
- # Default-Start:     2 3 4 5
++# Default-Start:     
  # 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"
+ # Description:       LSB init script for lcdproc, the system
+@@ -12,57 +21,60 @@
+ ### 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
 +fi
  
++# check that non-default config file exists.
++ [ -f $configfile ] || exit 6
  
  case "$1" in
    start)
 -	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/F-10/lcdproc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lcdproc.spec	7 Nov 2008 17:53:40 -0000	1.8
+++ lcdproc.spec	26 Apr 2009 09:10:06 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:        LCDproc displays real-time system information on a 20x4 backlit LCD
 Name:           lcdproc
 Version:        0.5.2
-Release:        7%{?dist}
+Release:        11%{?dist}
 License:        GPLv2
 URL:            http://lcdproc.omnipotent.net
 Group:          System Environment/Libraries
@@ -9,15 +9,15 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  doxygen
 BuildRequires:  graphviz
 
 # necessary for imonlcd patch
-BuildRequires:  automake
+BuildRequires:  libtool
 
-BuildRequires:  glibc-headers
 BuildRequires:  libusb-devel
 BuildRequires:  lirc-devel
 BuildRequires:  ncurses-devel
@@ -54,18 +54,20 @@
 
 %prep
 %setup -q
-#patch0 -p1 -b .initscripts
+%patch0 -p1 -b .initscripts
 %patch1 -p1 -b .memset_swp
 %patch2 -p1 -b .imonlcd
+%patch3 -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 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 +79,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
@@ -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,12 +141,28 @@
 %{_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
 
 
 %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.
+  (It needs to be configured first).
+
+* 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
+
 * Fri Nov 07 2008 Jarod Wilson <jarod at redhat.com> - 0.5.2-7
 - Add SoundGraph iMon and Antec Veris LCD device support
 - Replace start_daemon w/daemon in initscripts (#468611)


