From d4c889ede16205304ba7b819b0b894af27237075 Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Sat, 16 Feb 2008 17:14:33 +0000 Subject: Bump version to 0.21. Remove SuSE init script and plptools.spec, as they're way out of date. Keep generic init script so we have *something* to show; rename it to "plptools". Remove unused PSIONHOSTNAME define from config.h. Change some occurrences of "Psion" to "EPOC" in configure.ac. --- Makefile.am | 8 +- configure.ac | 23 ++--- etc/plptools.in | 98 ++++++++++++++++++++ etc/plptools.spec.in | 247 --------------------------------------------------- etc/psion.SuSE.in | 93 ------------------- etc/psion.in | 98 -------------------- 6 files changed, 110 insertions(+), 457 deletions(-) create mode 100755 etc/plptools.in delete mode 100644 etc/plptools.spec.in delete mode 100755 etc/psion.SuSE.in delete mode 100755 etc/psion.in diff --git a/Makefile.am b/Makefile.am index 7987217..d7a5e1f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,14 +3,14 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = intl po lib ncpd plpfuse plpftp plpprint sisinstall doc EXTRA_DIST = AUTHORS COPYING INSTALL NEWS README TODO HISTORY ABOUT-NLS \ - etc/s5magic etc/s5kdemagic etc/psion.in etc/psion.SuSE.in \ + etc/s5magic etc/s5kdemagic etc/plptools.in \ etc/ttytap.c etc/psidump etc/psidump.1 \ - etc/udev-usbserial-plptools.rules etc/plptools.spec + etc/udev-usbserial-plptools.rules -DISTCLEANFILES = etc/psion etc/psion.SuSE +DISTCLEANFILES = etc/plptools install-exec-local: - install -D $(top_builddir)/etc/psion $(DESTDIR)$(initdir)/psion + install -D $(top_builddir)/etc/plptools $(DESTDIR)$(initdir)/plptools dist-local: kdoc -d doc/api -n libplp --strip-h-path lib/*.h diff --git a/configure.ac b/configure.ac index 5cda2ff..7d47890 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(plptools, 0.20, plptools-developers@lists.sourceforge.net) +AC_INIT(plptools, 0.21, plptools-developers@lists.sourceforge.net) AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE @@ -201,26 +201,26 @@ AC_DEFINE_UNQUOTED(DPORT,$DPORT, AC_SUBST(DPORT) AC_ARG_WITH(drive, - [ --with-drive=DRIVE override default Psion drive [AUTO]], + [ --with-drive=DRIVE override default EPOC drive [AUTO]], [ DDRIVE="$withval" AC_MSG_RESULT(Overriding drive: $DDRIVE) ], [ DDRIVE='AUTO' - AC_MSG_RESULT(Using default Psion drive: $DDRIVE) + AC_MSG_RESULT(Using default EPOC drive: $DDRIVE) ] ) AC_DEFINE_UNQUOTED(DDRIVE,"$DDRIVE", - [Define this to your default drive on your Psion]) + [Define this to your default drive on your EPOC device]) AC_ARG_WITH(basedir, - [ --with-basedir=DIR override default Psion directory [\\\\]], + [ --with-basedir=DIR override default EPOC directory [\\\\]], [ DBASEDIR="$withval" AC_MSG_RESULT(Overriding directory: $DBASEDIR) ], [ DBASEDIR='\\' - AC_MSG_RESULT(Using default Psion directory: $DBASEDIR) + AC_MSG_RESULT(Using default EPOC directory: $DBASEDIR) ] ) AC_DEFINE_UNQUOTED(DBASEDIR,"$DBASEDIR", - [Define this to your default directory on your Psion]) + [Define this to your default directory on your EPOC device]) AC_ARG_WITH(initdir, [ --with-initdir=DIR override default init dir [PREFIX/etc/rc.d/init.d]], @@ -242,11 +242,6 @@ AH_BOTTOM([ /* Define this, if libc provides bind_textdomain_codeset */ #undef HAVE_BIND_TEXTDOMAIN_CODESET -/* Some reasonable defaults */ -#ifndef PSIONHOSTNAME -# define PSIONHOSTNAME "localhost" -#endif - /* Select version of FUSE API */ #define FUSE_USE_VERSION 26 ]) @@ -265,9 +260,7 @@ AC_CONFIG_FILES( sisinstall/Makefile doc/Makefile doc/api/Makefile - etc/psion - etc/psion.SuSE - etc/plptools.spec + etc/plptools doc/ncpd.man doc/plpfuse.man doc/plpftp.man diff --git a/etc/plptools.in b/etc/plptools.in new file mode 100755 index 0000000..d19378c --- /dev/null +++ b/etc/plptools.in @@ -0,0 +1,98 @@ +#!/bin/sh +# +# psion Starts ncpd/plpfuse. +# +# chkconfig: 2345 45 10 +# description: This facility enables connectivity to a Psion series 5. + +# Source function library. +. /etc/rc.d/init.d/functions + +[ -f @prefix@/sbin/ncpd ] || exit 0 +[ -f @prefix@/sbin/plpfuse ] || exit 0 +[ -f @prefix@/sbin/plpprintd ] || exit 0 +[ -f /etc/sysconfig/psion ] || exit 0 +. /etc/sysconfig/psion + +start() { + echo "Starting Psion support ..." + RETVAL=0 + if test "$START_NCPD" = "yes" ; then + echo -n " ncpd: " + daemon @prefix@/sbin/ncpd $NCPD_ARGS + RETVAL=$? + echo + fi + if [ $RETVAL -eq 0 ] ; then + if test "$START_PLPFUSE" = "yes" ; then + echo -n " plpfuse: " + daemon @prefix@/sbin/plpfuse $PLPFUSE_ARGS + RETVAL=$? + echo + fi + fi + if [ $RETVAL -eq 0 ] ; then + if test "$START_PLPPRINTD" = "yes" ; then + echo -n " plpprintd: " + daemon @prefix@/sbin/plpprintd $PLPPRINTD_ARGS + RETVAL=$? + echo + fi + fi + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/psion + return $RETVAL +} + +stop() { + echo "Stopping Psion support ..." + RETVAL=0 + if test "$START_PLPPRINTD" = "yes" ; then + echo -n " plpprintd: " + killproc plpprintd + echo + fi + if test "$START_PLPFUSE" = "yes" ; then + echo -n " plpfuse: " + fusermount -u /mnt/psion + echo + fi + if test "$START_NCPD" = "yes" ; then + echo -n " ncpd: " + killproc ncpd + RETVAL=$? + echo + fi + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/psion + return $RETVAL +} + +restart() { + stop + start +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status ncpd + status plpprintd + ;; + restart|reload) + restart + ;; + condrestart) + test -f /var/lock/subsys/psion && restart || : + ;; + *) + echo "Usage: psion {start|stop|status|restart|reload|condrestart}" + exit 1 +esac + +exit $? + diff --git a/etc/plptools.spec.in b/etc/plptools.spec.in deleted file mode 100644 index 03f204f..0000000 --- a/etc/plptools.spec.in +++ /dev/null @@ -1,247 +0,0 @@ -%define version @VERSION@ -%define myrelease 1 - -%define srel /etc/SuSE-release -%define rrel /etc/redhat-release -%define mrel /etc/mandrake-release -%define isSUSE %(test -f %{srel} && echo 1 || echo 0) -%define isRH %(test -f %{rrel} && echo 2 || echo 0) -%define isMDK %(test -f %{mrel} && echo 1 || echo 0) -%if "%{isMDK}" > "0" -%define isRH 1 -%endif -# -# Running the above, results in: -# -# RedHat: isSUSE=0 isRH=2 isMDK=0 -# Mandrake: isSUSE=0 isRH=1 isMDK=1 -# SuSE: isSUSE=1 isRH=0 isMDK=0 -# - -%define _qtdir "" -%if "%{isSUSE}" > "0" -%define REL %(grep VERSION %{srel} | sed -e 's/VERSION = //') -%define _initrddir %{_sysconfdir}/init.d -%define distro SuSE%{REL} -%endif -%if "%{isRH}" > "1" -%define REL %(rpm -qf --queryformat '%%{version}' %{rrel}) -%define distro RH%{REL} -# Old RH7.2 has QT in qt-2.x.x which is not autodetected in configure -%define _qtdir %(test -n "$QTDIR" && echo \"--with-qt-dir=$QTDIR\" || :) -%endif -%if "%{isMDK}" > "0" -%define REL %(rpm -qf --queryformat '%%{version}' %{mrel}) -%define distro mdk%{REL} -%endif - -%define realrelease %{myrelease}%{distro} - -# -# Conditionals -# -%{?_without_distro: %define realrelease %{myrelease}} -%{?_with_debug: %define __spec_install_post /usr/lib/rpm/brp-compress} -%{?_with_debug: %define _with_debug --enable-debug} -%{?_with_debug: %define optflags -g} -%{!?_with_debug: %define _with_debug --disable-debug} - -Summary: Connectivity for psion series 5. -Name: plptools -Version: %{version} -Release: %{realrelease} -Vendor: The plptools project -Packager: Fritz Elfert -URL: http://plptools.sourceforge.net/ -Source0: http://download.sourceforge.net/plptools/plptools-%{version}.tar.gz -Copyright: GPL -Group: Networking/Utilities -Buildrequires: readline-devel -%if "%{isSUSE}" > "0" -Requires: aaa_base >= 2002.3.27-0 -%endif -%if "%{isRH}" > "0" -Requires: chkconfig >= 0.9 -%endif -BuildRoot: %{_tmppath}/plputils-buildroot - -%package devel -Summary: Static library and includes for psion series 5 communication. -Group: Development/Libraries -Requires: %{name} = %{version} - -%description -This package contains the programs (client and server), necessary to -communicate with a Psion palmtop. The psion's file-system will -be automatically mounted under /mnt/psion at the time it is -connected to your computer. If the psion is shut down or -disconnected, the contents of /mnt/psion will automatically -disappear. Other programs included are: - - plpftp, a program which allows you to transfer files in a ftp-like - manner, view and modifiy processes on your psion. - - plpprintd, a daemon for enabling printing from a Psion Series 5 via any - accessible printer. - - sisinstall, an installer for Psion's SIS software package format. - -%description devel -This package contains the static library and include files for building -programs which can communicate with a Psion palmtop. - -%description -l de -Dieses Packet enthält Programme zur Kommunikation mit einem Psion Palmtop. -Das Dateisystem des Psion wird beim Anschließen automatisch unter -/mnt/psion eingehängt. Wird der Psion ausgeschaltet oder das Kabel -gezogen, so verschwindet der Inhalt dieses Verzeichnisses automatisch -und erscheint erneuten Anschließen wieder. Weiterhin sind enthalten: - - plpftp, ein Programm welches eine FTP-ähnliche Oberfläche für Dateitransfer - bietet und Prozesse auf dem Psion stoppen und starten kann. - - plpprintd, ein Daemon welcher Ausdrucken von einem Psion Serie 5 über - beliebige vefügbare Drucker ermöglicht - - sisinstall, ein Installationsprogramm für das Psion-eigene SIS - packetformat. - -%description -l de devel -Dieses Packet enthält die statische Bibliothek und include-Dateien -zur Programm-Entwicklung von Kommunikations-software für den Psion. - -%changelog -* Tue Nov 20 2007 Reuben Thomas -- Butchered out the KDE bits; no testing done afterwards - -* Fri May 25 2001 Fritz Elfert -- Added klipsi subpackage - -* Thu May 17 2001 Fritz Elfert -- Official release of version 0.8 - -* Thu Mar 1 2001 Fritz Elfert -- Added KDE sub-packages - -* Sat Jan 20 2001 Fritz Elfert -- Updated to latest version -- Using RPM 4 (RH 7.0) - -* Mon Jan 17 2000 Fritz Elfert -- New version 0.5 with lots of bugfixes and additions. - -* Sat Aug 7 1999 Fritz Elfert -- fixed violation of const parameters in rfsv32.cc. -- corrected BLOCKSIZE in mp.h to fix behaviour of "du" program. - -%prep -%setup -q -%if "%{isSUSE}" > "0" -# SuSE's depencies are pretty broken. Example: For the KDE stuff, -# RPM's automatic find-requires generates a depency to libGLcore -# if the build-system has Nvidia drivers installed. Our KDE stuff -# definitively does NOT depend on it! -# Therefore, we filter some unnecessary stuff out: -cat<find-requires -#!/bin/sh -%{__find_requires} "$@" |egrep -v 'libGL|freetype|libfam' -EOF -chmod a+x find-requires -%define __find_requires %{_builddir}/%{buildsubdir}/find-requires -%endif -%if "%{isMDK}" > "0" -# Mandrake's RPM generates similar odd depencies. -cat<find-requires -#!/bin/sh -%{__find_requires} "$@" |egrep -v 'libGL|freetype' -EOF -chmod a+x find-requires -%define __find_requires %{_builddir}/%{buildsubdir}/find-requires -%endif - -%build -%if "%{isSUSE}" > "0" -# SuSE's libtools are breaking everything -%define __libtoolize true -%configure --with-initdir=%{_initrddir} %{_with_debug} -%configure --with-initdir=%{_initrddir} %{_with_debug} -%endif -make - -%install -mkdir -p $RPM_BUILD_ROOT/%{_prefix} $RPM_BUILD_ROOT%{_initrddir} \ -# rpm's makeinstall doesn't work here! -make DESTDIR=$RPM_BUILD_ROOT install -%if "%{isSUSE}" > "0" -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig -cat>$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/psion< "0" -install -m755 etc/psion $RPM_BUILD_ROOT%{_initrddir}/psion -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig -cat>$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/psion< "0" -# Mandrake has a menu configurator -mkdir -p $RPM_BUILD_ROOT%{_libdir}/menu -%endif - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -ldconfig -test ! -d /mnt/psion && mkdir -p /mnt/psion -%if "%{isRH}" > "0" -/sbin/chkconfig --add psion -%endif -%if "%{isSUSE}" > "0" -/sbin/chkconfig --add psion -%endif - -fi - -%preun -if [ "$1" = 0 ] -then - %{_initrddir}/psion stop >/dev/null 2>&1 -%if "%{isSUSE}" > "0" - /sbin/chkconfig --del psion -%endif -%if "%{isRH}" > "0" - /sbin/chkconfig --del psion -%endif -fi - -%files -%doc COPYING INSTALL CHANGES ChangeLog README TODO etc/*magic -%{_bindir}/plpftp -%{_bindir}/sisinstall -%{_sbindir}/* -%{_mandir}/*/* -%{_libdir}/libplp.so.* -%{_libdir}/libplp.la -%{_datadir}/locale/*/LC_MESSAGES/plptools.mo -%{_datadir}/%{name}/* -%{_initrddir}/psion -%if "%{isSUSE}" > "0" -%config %{_sysconfdir}/sysconfig/psion -%endif -%if "%{isRH}" > "0" -%config %{_sysconfdir}/sysconfig/psion -%endif - -%files devel -%doc doc/api etc/*.spec -%{_libdir}/libplp.a -%{_libdir}/libplp.so -%{_includedir}/%{name}/* diff --git a/etc/psion.SuSE.in b/etc/psion.SuSE.in deleted file mode 100755 index b39846e..0000000 --- a/etc/psion.SuSE.in +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -# -### BEGIN INIT INFO -# Provides: psion -# Required-Start: $syslog -# Required-Stop: -# Default-Start: 3 5 -# Default-Stop: 0 1 2 6 -# Description: Start Psion support -### END INIT INFO - -# Source function library. -. /etc/rc.status - -[ -f @prefix@/sbin/ncpd ] || exit 0 -[ -f @prefix@/sbin/plpfuse ] || exit 0 -[ -f @prefix@/sbin/plpprintd ] || exit 0 -[ -f /etc/sysconfig/psion ] || exit 0 -. /etc/sysconfig/psion - -rc_reset - -start() { - echo "Starting Psion support ..." - if [ "$START_NCPD" = "yes" ] ; then - echo -n " ncpd: " - startproc -f @prefix@/sbin/ncpd $NCPD_ARGS - rc_status -v - fi - if test "$START_PLPFUSE" = "yes" ; then - echo -n " plpfuse: " - startproc -f @prefix@/sbin/plpfuse $PLPFUSE_ARGS - rc_status -v - fi - if [ "$START_PLPPRINTD" = "yes" ] ; then - echo -n " plpprintd: " - startproc -f @prefix@/sbin/plpprintd $PLPPRINTD_ARGS - rc_status -v - fi - rc_status && touch /var/lock/subsys/psion -} - -stop() { - echo "Stopping Psion support ..." - if [ "$START_PLPPRINTD" = "yes" ] ; then - echo -n " plpprintd: " - killproc -TERM @prefix@/sbin/plpprintd - rc_status -v - fi - if [ "$START_PLPFUSE" = "yes" ] ; then - echo -n " plpfuse: " - fusermount -u /mnt/psion - rc_status -v - fi - if [ "$START_NCPD" = "yes" ] ; then - echo -n " ncpd: " - killproc -TERM @prefix@/sbin/ncpd - rc_status -v - fi - rc_status && rm -f /var/lock/subsys/psion -} - -restart() { - stop - start -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - echo -n "Checking for service psion: " - checkproc @prefix@/sbin/plpprintd && \ - checkproc @prefix@/sbin/ncpd - rc_status -v - ;; - restart|reload) - restart - ;; - condrestart) - test -f /var/lock/subsys/psion && restart || : - ;; - *) - echo "Usage: psion {start|stop|status|restart|reload|condrestart}" - exit 1 -esac - -rc_exit diff --git a/etc/psion.in b/etc/psion.in deleted file mode 100755 index d19378c..0000000 --- a/etc/psion.in +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh -# -# psion Starts ncpd/plpfuse. -# -# chkconfig: 2345 45 10 -# description: This facility enables connectivity to a Psion series 5. - -# Source function library. -. /etc/rc.d/init.d/functions - -[ -f @prefix@/sbin/ncpd ] || exit 0 -[ -f @prefix@/sbin/plpfuse ] || exit 0 -[ -f @prefix@/sbin/plpprintd ] || exit 0 -[ -f /etc/sysconfig/psion ] || exit 0 -. /etc/sysconfig/psion - -start() { - echo "Starting Psion support ..." - RETVAL=0 - if test "$START_NCPD" = "yes" ; then - echo -n " ncpd: " - daemon @prefix@/sbin/ncpd $NCPD_ARGS - RETVAL=$? - echo - fi - if [ $RETVAL -eq 0 ] ; then - if test "$START_PLPFUSE" = "yes" ; then - echo -n " plpfuse: " - daemon @prefix@/sbin/plpfuse $PLPFUSE_ARGS - RETVAL=$? - echo - fi - fi - if [ $RETVAL -eq 0 ] ; then - if test "$START_PLPPRINTD" = "yes" ; then - echo -n " plpprintd: " - daemon @prefix@/sbin/plpprintd $PLPPRINTD_ARGS - RETVAL=$? - echo - fi - fi - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/psion - return $RETVAL -} - -stop() { - echo "Stopping Psion support ..." - RETVAL=0 - if test "$START_PLPPRINTD" = "yes" ; then - echo -n " plpprintd: " - killproc plpprintd - echo - fi - if test "$START_PLPFUSE" = "yes" ; then - echo -n " plpfuse: " - fusermount -u /mnt/psion - echo - fi - if test "$START_NCPD" = "yes" ; then - echo -n " ncpd: " - killproc ncpd - RETVAL=$? - echo - fi - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/psion - return $RETVAL -} - -restart() { - stop - start -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status ncpd - status plpprintd - ;; - restart|reload) - restart - ;; - condrestart) - test -f /var/lock/subsys/psion && restart || : - ;; - *) - echo "Usage: psion {start|stop|status|restart|reload|condrestart}" - exit 1 -esac - -exit $? - -- cgit v1.2.3