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 11d537e..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: lcdproc -# $Id$ -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 -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/lcdproc-0.5.2-scripts.patch b/lcdproc-0.5.2-scripts.patch new file mode 100644 index 0000000..2571467 --- /dev/null +++ b/lcdproc-0.5.2-scripts.patch @@ -0,0 +1,86 @@ +--- lcdproc-0.5.2/scripts/init-LCDd.rpm.in.initscripts 2007-05-20 14:17:36.000000000 +0200 ++++ lcdproc-0.5.2/scripts/init-LCDd.rpm.in 2007-05-20 14:22:24.000000000 +0200 +@@ -19,7 +19,7 @@ + # 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. +@@ -73,6 +73,12 @@ + RETVAL=$? + } + ++reload() { ++ stop ++ start ++ RETVAL=$? ++} ++ + restart() { + stop + start +@@ -94,6 +100,9 @@ + status) + dostatus + ;; ++ reload) ++ restart ++ ;; + restart) + restart + ;; +@@ -101,7 +110,7 @@ + condrestart + ;; + *) +- echo "Usage: $0 {start|stop|status|restart|condrestart}" ++ echo "Usage: $0 {start|stop|status|reload|restart|condrestart}" + exit 1 + esac + +--- lcdproc-0.5.2/scripts/init-lcdproc.rpm.in.initscripts 2007-05-20 14:17:02.000000000 +0200 ++++ lcdproc-0.5.2/scripts/init-lcdproc.rpm.in 2007-05-20 14:21:13.000000000 +0200 +@@ -19,7 +19,7 @@ + # 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. +@@ -73,6 +73,12 @@ + RETVAL=$? + } + ++reload() { ++ stop ++ start ++ RETVAL=$? ++} ++ + restart() { + stop + start +@@ -94,6 +100,9 @@ + status) + dostatus + ;; ++ reload) ++ restart ++ ;; + restart) + restart + ;; +@@ -101,7 +110,7 @@ + condrestart + ;; + *) +- echo "Usage: $0 {start|stop|status|restart|condrestart}" ++ echo "Usage: $0 {start|stop|status|reload|restart|condrestart}" + exit 1 + esac + diff --git a/lcdproc.spec b/lcdproc.spec new file mode 100644 index 0000000..8e3281d --- /dev/null +++ b/lcdproc.spec @@ -0,0 +1,148 @@ +Summary: LCDproc displays real-time system information on a 20x4 backlit LCD +Name: lcdproc +Version: 0.5.2 +Release: 1%{?dist} +License: GPL +Url: http://lcdproc.omnipotent.net +Group: System Environment/Libraries +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: lcdproc-0.5.2-scripts.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: doxygen +BuildRequires: graphviz + +BuildRequires: glibc-headers +BuildRequires: libusb-devel +BuildRequires: lirc-devel +BuildRequires: ncurses-devel +BuildRequires: nfs-utils-lib-devel +BuildRequires: openldap-devel +BuildRequires: pth-devel +BuildRequires: xmlto +BuildRequires: xosd-devel +BuildRequires: libX11-devel +BuildRequires: libXext-devel + +%ifarch %{ix86} x86_64 +BuildRequires: svgalib-devel +%endif + +Requires(post): /sbin/chkconfig +Requires(postun): /sbin/chkconfig + + + +%description +LCDproc is a client/server suite inclduding drivers for all +kinds of nifty LCD displays. The server supports several +serial devices: Matrix Orbital, Crystal Fontz, Bayrad, LB216, +LCDM001 (kernelconcepts.de), Wirz-SLI and PIC-an-LCD; and some +devices connected to the LPT port: HD44780, STV5730, T6963, +SED1520 and SED1330. Various clients are available that display +things like CPU load, system load, memory usage, uptime, and a lot more. +See also http://lcdproc.omnipotent.net. + + +%prep +%setup -q +%patch0 -p1 -b .initscripts +chmod 644 server/drivers/timing.h + + +%build +%configure --libdir=%{_libdir} \ + --enable-libusb \ + --enable-ldap \ + --enable-drivers=all \ + --enable-permissive-menu-goto \ + --enable-lcdproc-menus \ + --enable-stat-nfs \ + --enable-stat-smbfs \ + --with-lcdport=13666 + +sed -i -e 's|-L/usr/lib|-L%{_libdir}|g' Makefile + +make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT __doc +make install DESTDIR=$RPM_BUILD_ROOT +make install-html-guides DESTDIR=$RPM_BUILD_ROOT + +# 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 +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc + +# init +install -d $RPM_BUILD_ROOT%{_initrddir} +install -pm 0755 scripts/init-LCDd.rpm $RPM_BUILD_ROOT%{_initrddir}/LCDd +install -pm 0755 scripts/init-lcdproc.rpm $RPM_BUILD_ROOT%{_initrddir}/lcdproc + + + +%post +if [ $1 -eq 1 ]; then +# Add init script and but don't start it + /sbin/chkconfig --add LCDd + /sbin/chkconfig --add lcdproc ||: +fi + + +%preun +if [ $1 -eq 0 ]; then +# Disable driver on final removal + %{_initrddir}/lcdproc stop &>/dev/null + %{_initrddir}/LCDd stop &>/dev/null + /sbin/chkconfig --del lcdproc + /sbin/chkconfig --del LCDd ||: +fi + + +%clean +rm -rf $RPM_BUILD_ROOT __doc + +%files +%defattr(-,root,root,-) +%doc README* INSTALL COPYING CREDITS TODO ChangeLog +%doc docs/*.txt docs/README.* __doc/* +%{_bindir}/* +%dir %{_libdir}/lcdproc +%{_libdir}/lcdproc/* +%{_sbindir}/* +%{_mandir}/man?/* +%config(noreplace) %{_sysconfdir}/*.conf +%{_initrddir}/LCDd +%{_initrddir}/lcdproc + + +%changelog +* Sat May 19 2007 kwizart < kwizart at gmail.com > 0.5.2-1 +- Update to 0.5.2 +- Add BR +- Install docs + +* Tue Apr 17 2007 kwizart < kwizart at gmail.com > 0.5.1-1 +- Cleaned spec files for Fedora guidelines. + +* Fri Sep 26 2003 TC Wan +- Fixed spec file for RH 9, made metar dependency optional + +* Sun Oct 6 2002 Arnaud de Lorbeau 0.4.3-2mdk +- Add docs + +* Thu Sep 12 2002 Nicolas Chipaux 0.4.3-1mdk +- new release + +* Fri Oct 26 2001 Rex Dieter 0.4.1-1 +- --enable-stat-smbfs +- TODO: make server/client init scripts + +* Mon Oct 22 2001 Rex Dieter -0 +- first try, 0.4.1 +- --enable-stat-nfs + diff --git a/sources b/sources index e69de29..cbf2751 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +860f192d061d87dda6512b11b79daac2 lcdproc-0.5.2.tar.gz