From add6fcded9d1fac095cec7e5eedfb784d8b07172 Mon Sep 17 00:00:00 2001 From: Fritz Elfert Date: Fri, 19 Jul 2002 11:13:51 +0000 Subject: - specfile: Added --without distro and some minor tweaks - README: Mention the need of NFS support in kernel for plpnfsd --- README | 13 +++++++------ etc/plptools.spec.in | 10 ++++++---- po/de.po | 18 ++++++++++-------- po/sv.po | 18 ++++++++++-------- 4 files changed, 33 insertions(+), 26 deletions(-) diff --git a/README b/README index aea3d44..9bad6ca 100644 --- a/README +++ b/README @@ -163,12 +163,13 @@ PLPNFSD plpnfsd is a daemon, which provides NFS-like access to your Psion. It automatically makes the psion's filesystems available below - an NFS-mounted directory (default /mnt/psion). - By default, plpnfsd is installed suid-root, so any normal user - can start it and get's the mounted directory owned by himself. - As this program is usually used on single-user machines, this - does not hurt security. Like the others, this program - auto-reconnects after a link-failure, so you can keep the + an NFS-mounted directory (default /mnt/psion). Of course you + must have NFS support enabled in the kernel and the portmapper + must be running for this. By default, plpnfsd is installed + suid-root, so any normal user can start it and get's the mounted + directory owned by himself. As this program is usually used on + single-user machines, this does not hurt security. Like the others, + this program auto-reconnects after a link-failure, so you can keep the psion mounted all the time, even when it is not connected. Due to Rudol Koenig's clever error-handling, you don't need to worry about blocked io-processes if the psion isn't available. diff --git a/etc/plptools.spec.in b/etc/plptools.spec.in index 6d12d9f..6c995c1 100644 --- a/etc/plptools.spec.in +++ b/etc/plptools.spec.in @@ -10,7 +10,6 @@ %if "%{isMDK}" > "0" %define isRH 1 %endif -%define distro "" # # Running the above, results in: # @@ -19,6 +18,7 @@ # SuSE: isSUSE=1 isRH=0 isMDK=0 # +%define _qtdir "" %if "%{isSUSE}" > "0" %define REL %(grep VERSION %{srel} | sed -e 's/VERSION = //') %if "%{REL}" >= "8.0" @@ -31,12 +31,12 @@ %endif %define distro SuSE%{REL} %endif -%define _qtdir "" %if "%{isRH}" > "1" %define REL %(rpm -qf --queryformat '%%{version}' %{rrel}) %define distro RH%{REL} %define _kdedir /usr -%define _qtdir %(test -n "$QTDIR" && echo \"--with-qt-dir=$QTDIR\" || echo '""') +# 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}) @@ -48,6 +48,7 @@ %define _kdelibdir %{_kdedir}/lib %define _kdedatadir %{_kdedir}/share %define realrelease %{myrelease}%{distro} +%{?_without_distro: %define realrelease %{myrelease}} Summary: Connectivity for psion series 5. Name: plptools @@ -201,7 +202,8 @@ zwischen Psion und Rechner. %define __libtoolize true %endif %if "%{isRH}" > "0" -%configure --enable-kde %{_qtdir} --with-initdir=%{_initrddir} +QD=%{_qtdir} +%configure --enable-kde $QD --with-initdir=%{_initrddir} %endif make diff --git a/po/de.po b/po/de.po index 2cfaae0..a83f3ba 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: plptools 0.11\n" -"POT-Creation-Date: 2002-07-17 14:35+0200\n" +"POT-Creation-Date: 2002-07-17 19:55+0200\n" "PO-Revision-Date: 2002-07-16 21:39 CET\n" "Last-Translator: Fritz Elfert \n" "Language-Team: Deutsch \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 0.9.6\n" -#: lib/rfsv.cc:33 lib/rpcsfactory.cc:43 lib/rfsvfactory.cc:45 +#: lib/rfsv.cc:33 lib/rfsvfactory.cc:45 lib/rpcsfactory.cc:43 msgid "no error" msgstr "kein Fehler" @@ -467,11 +467,13 @@ msgid "New Zealand" msgstr "Neuseeländisch" # FIXME: not shure about ISO code +#. FIXME: not shure about ISO code #: lib/rpcs.cc:90 msgid "International French" msgstr "Internationales Französisch" # FIXME: not shure about ISO code +#. FIXME: not shure about ISO code #: lib/rpcs.cc:91 msgid "Czech" msgstr "Tschechisch" @@ -528,23 +530,23 @@ msgstr " Sekunden" msgid " second" msgstr " Sekunde" -#: lib/rpcsfactory.cc:44 lib/rfsvfactory.cc:46 +#: lib/rfsvfactory.cc:46 lib/rpcsfactory.cc:44 msgid "could not send version request" msgstr "Konnte Versions-Anforderung nicht versenden" -#: lib/rpcsfactory.cc:45 lib/rfsvfactory.cc:47 +#: lib/rfsvfactory.cc:47 lib/rpcsfactory.cc:45 msgid "try again" msgstr "Erneut versuchen" -#: lib/rpcsfactory.cc:46 lib/rfsvfactory.cc:48 +#: lib/rfsvfactory.cc:48 lib/rpcsfactory.cc:46 msgid "no psion connected" msgstr "Kein Psion angeschlossen" -#: lib/rpcsfactory.cc:47 lib/rfsvfactory.cc:49 +#: lib/rfsvfactory.cc:49 lib/rpcsfactory.cc:47 msgid "wrong protocol version" msgstr "Falsche Protokoll-Version" -#: lib/rpcsfactory.cc:48 lib/rfsvfactory.cc:50 +#: lib/rfsvfactory.cc:50 lib/rpcsfactory.cc:48 msgid "no response from ncpd" msgstr "Keine Antwort vom ncpd" @@ -1034,7 +1036,7 @@ msgstr "Behalte ursprünglichen Ordner \"" msgid "Transfer complete, (" msgstr "Ãœbertragung abgeschlossen, (" -#: plpftp/ftp.cc:578 plpftp/ftp.cc:669 plpbackup/plpbackup.cc:1202 +#: plpbackup/plpbackup.cc:1202 plpftp/ftp.cc:578 plpftp/ftp.cc:669 msgid " bytes in " msgstr " Bytes in " diff --git a/po/sv.po b/po/sv.po index 78a91ee..7f73414 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: plptools 0.11\n" -"POT-Creation-Date: 2002-07-17 14:35+0200\n" +"POT-Creation-Date: 2002-07-17 19:55+0200\n" "PO-Revision-Date: 2002-07-11 09:10+0200\n" "Last-Translator: Daniel Brahneborg \n" "Language-Team: SWEDISH \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: lib/rfsv.cc:33 lib/rpcsfactory.cc:43 lib/rfsvfactory.cc:45 +#: lib/rfsv.cc:33 lib/rfsvfactory.cc:45 lib/rpcsfactory.cc:43 msgid "no error" msgstr "inget fel" @@ -466,11 +466,13 @@ msgid "New Zealand" msgstr "Nya Zeeländska" # FIXME: not shure about ISO code +#. FIXME: not shure about ISO code #: lib/rpcs.cc:90 msgid "International French" msgstr "Internationell Franska" # FIXME: not shure about ISO code +#. FIXME: not shure about ISO code #: lib/rpcs.cc:91 msgid "Czech" msgstr "Tjeckoslovakiska" @@ -527,23 +529,23 @@ msgstr " sekunder" msgid " second" msgstr " sekund" -#: lib/rpcsfactory.cc:44 lib/rfsvfactory.cc:46 +#: lib/rfsvfactory.cc:46 lib/rpcsfactory.cc:44 msgid "could not send version request" msgstr "kunde inte skicka versionsfråga" -#: lib/rpcsfactory.cc:45 lib/rfsvfactory.cc:47 +#: lib/rfsvfactory.cc:47 lib/rpcsfactory.cc:45 msgid "try again" msgstr "försök igen" -#: lib/rpcsfactory.cc:46 lib/rfsvfactory.cc:48 +#: lib/rfsvfactory.cc:48 lib/rpcsfactory.cc:46 msgid "no psion connected" msgstr "ingen psion ikopplad" -#: lib/rpcsfactory.cc:47 lib/rfsvfactory.cc:49 +#: lib/rfsvfactory.cc:49 lib/rpcsfactory.cc:47 msgid "wrong protocol version" msgstr "fel protokollversion" -#: lib/rpcsfactory.cc:48 lib/rfsvfactory.cc:50 +#: lib/rfsvfactory.cc:50 lib/rpcsfactory.cc:48 msgid "no response from ncpd" msgstr "inget svar från ncpd" @@ -1035,7 +1037,7 @@ msgstr "Beh msgid "Transfer complete, (" msgstr "Överfringen klar, (" -#: plpftp/ftp.cc:578 plpftp/ftp.cc:669 plpbackup/plpbackup.cc:1202 +#: plpbackup/plpbackup.cc:1202 plpftp/ftp.cc:578 plpftp/ftp.cc:669 msgid " bytes in " msgstr " bytes på " -- cgit v1.2.3