diff options
| -rw-r--r-- | INSTALL | 55 | ||||
| -rw-r--r-- | Makefile.cvs | 10 | ||||
| -rw-r--r-- | README | 5 | ||||
| -rw-r--r-- | conf/Makefile.am.in | 17 | ||||
| -rw-r--r-- | etc/plptools.spec.in | 181 |
5 files changed, 15 insertions, 253 deletions
@@ -52,65 +52,10 @@ Basic Installation this file on some operating systems is vital for functionality of mount/umount, this update can be disabled with the above option. - --enable-kde - - Enable build of KDE related stuff. This needs installed - KDE (>= 2) headers/development-libraries as well as QT (>= 2.2.4) - headers/development-libraries. - - --with-kdedir=/path/to/your/kde - - Specify the KDE directory. I got several reports from SuSE users, - who have KDE1 and KDE2 in those weird pathes /opt/kde and /opt/kde2 - installed and the automatic detection does get confused by that. - So be shure to use this switch. RedHat users can safely use - --prefix=/usr instead. - - --with-qt-dir=/path/to/your/qtdir - - or - - --with-qt-includes=/path/to/your/qt-headers - --with-qt-libraries=/path/to/your/qt-lib - - Same as above. Use these, when automatic detection fails. - - --with-kdeversion=X - - Override the KDE version detection manually. Only needed in - special cases where more than one KDE version is installed and - autodetection fails. X can be either 2 or 3. - By default, the install-prefix is /usr/local, so you probably should add /usr/local/lib to your /etc/ld.so.conf and then run ldconfig after installation. Another option is to run configure with the option --prefix=/usr - NOTE: - Although the subdirectory for KDE stuff is named "kde2", this is only - for historical reason. The package builds on KDE 3 as well as KDE 2. - It tries to figure out the version of KDE automatically. People who have - both versions installed should carefully watch the output of configure. - The KDEDIR as well as KDE's version can be overridden via commandline - (see above). - - KDE STUFF - - The KDE KIOslave library adds support for a new protocol named - "psion:". So in konqueror, just open psion:/ to see your Psion's - drives. You now can copy, move, rename, open ... all those - operations you are used to. Any KDE application which supports - URLs should be able to deal with the files on the Psion. - If you have the toplevel directory displayed in Konqueror, the - Property dialog for the drives (right-click on an icon of a - drive, Properties) comes up in a modified fashion which allows - you to see the drive usage as well as triggering backup, restore - and format. The toplevel Properties (right-click on the view's - background, Properties) brings up a Dialog which displays machine- - related information. (Same info like the "machinfo" command in - plpftp. Currently there are no mime-types for Psion-Files but i - soon will add these. Backup, restore and format is done by a separate - standalone program "KPsion". - Have fun. -Fritz diff --git a/Makefile.cvs b/Makefile.cvs index dbeb33d..c09eec5 100644 --- a/Makefile.cvs +++ b/Makefile.cvs @@ -7,16 +7,15 @@ GETTEXTDEP = conf/Makefile.am.in conf/configure.in.in all: @echo "Use make devel for development, make dist for distribution" - @echo $(KDEVER) strictbuild: devel rm -f config.cache - ./configure --prefix=/usr --mandir=/usr/share/man --enable-debug --enable-kde --enable-strict + ./configure --prefix=/usr --mandir=/usr/share/man --enable-debug --enable-strict ${MAKE} build: devel rm -f config.cache - ./configure --prefix=/usr --mandir=/usr/share/man --enable-debug --enable-kde + ./configure --prefix=/usr --mandir=/usr/share/man --enable-debug ${MAKE} buildnox: devel @@ -31,7 +30,7 @@ devel: $(GETTEXT) $(LIBTOOLFILES) $(AUTOMAKEFILES) dist: $(GETTEXT) $(LIBTOOLFILES) $(AUTOMAKEFILES) autoconf touch include/stamp-h.in - ./configure --enable-kde + ./configure $(MAKE) dist htmldoc: @@ -41,7 +40,7 @@ htmldoc: done $(ACLOCAL): - aclocal -I conf/m4/plptools -I conf/m4/kde $(M4SUB) + aclocal -I conf/m4/plptools $(M4SUB) $(CONFIGHIN): acconfig.h configure.in autoheader @@ -60,4 +59,3 @@ $(GETTEXT): $(GETTEXTDEP) $(AUTOMAKEFILES): $(ACLOCAL) $(CONFIGHIN) automake --add-missing - ${MAKE} -C kde2 -f Makefile.am am_edit @@ -5,6 +5,5 @@ EPOC devices, as well as backing them up, installing software, and setting the clock. See INSTALL for installation instructions and HISTORY for some history. -The programs include KDE 2/3 Psion support, and plpnfsd, which allows -the EPOC device's filesystem to be mounted in an NFS-like way (portmap -is required for this). +The programs plpnfsd, which allows the EPOC device's filesystem to be +mounted in an NFS-like way (portmap is required for this). diff --git a/conf/Makefile.am.in b/conf/Makefile.am.in index a577d0a..b71d2d3 100644 --- a/conf/Makefile.am.in +++ b/conf/Makefile.am.in @@ -1,17 +1,10 @@ # $Id$ # -if BUILD_KDE -KDESUB = kde2 -else -KDESUB = -endif - -SUBDIRS = intl po lib ncpd plpnfsd plpftp plpprint sisinstall \ - $(KDESUB) doc . +SUBDIRS = intl po lib ncpd plpnfsd plpftp plpprint sisinstall doc . EXTRA_DIST = CHANGES COPYING README TODO HISTORY INSTALL ABOUT-NLS include/*.h* \ - etc/*magic etc/*.in etc/*.c etc/psidump* conf/m4/kde/*.m4 \ + etc/*magic etc/*.in etc/*.c etc/psidump* \ conf/m4/plptools/*.m4 conf/[a-l]* conf/missing conf/mkinstalldirs \ debian/* DISTCLEANFILES = etc/psion etc/psion.SuSE etc/psion.SuSE8 @@ -38,16 +31,12 @@ install-data-local: install -m 755 etc/psion $(DESTDIR)$(initdir)/psion || : dist-hook: - $(MAKE) TMPDEST=$(distdir)/ kdoc specfile - $(MAKE) -C $(distdir)/kde2 -f Makefile.am am_edit + $(MAKE) TMPDEST=$(distdir)/ specfile test -f CVS/Root && conf/cvs2cl -W 1800 -S --no-wrap --prune \ --gmt -f $(distdir)/ChangeLog || \ cp -f ChangeLog $(distdir)/ChangeLog rm -rf $(distdir)/debian/CVS -kdoc: - kdoc -d $(TMPDEST)doc/api -n libplp --strip-h-path $(TMPDEST)lib/*.h - specfile: sed -e "s/\@VERSION\@/$(VERSION)/" < $(TMPDEST)etc/plptools.spec.in \ > $(TMPDEST)etc/plptools.spec diff --git a/etc/plptools.spec.in b/etc/plptools.spec.in index 4d78f99..1e725a6 100644 --- a/etc/plptools.spec.in +++ b/etc/plptools.spec.in @@ -24,29 +24,22 @@ %if "%{REL}" >= "8.0" # Bug in SuSE8.0's rpm setup: _initrddir has wrong value %define _initrddir %{_sysconfdir}/init.d -%define _kdedir /opt/kde3 %else %define _initrddir %{_sysconfdir}/init.d -%define _kdedir /opt/kde2 %endif %define distro SuSE%{REL} %endif %if "%{isRH}" > "1" %define REL %(rpm -qf --queryformat '%%{version}' %{rrel}) %define distro RH%{REL} -%define _kdedir /usr # 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} -%define _kdedir /usr %endif -%define _kdebindir %{_kdedir}/bin -%define _kdelibdir %{_kdedir}/lib -%define _kdedatadir %{_kdedir}/share %define realrelease %{myrelease}%{distro} # @@ -68,7 +61,7 @@ URL: http://plptools.sourceforge.net/ Source0: http://download.sourceforge.net/plptools/plptools-%{version}.tar.gz Copyright: GPL Group: Networking/Utilities -Buildrequires: readline-devel newt-devel kdelibs-devel >= 2.1 +Buildrequires: readline-devel newt-devel %if "%{isSUSE}" > "0" %if "%{REL}" >= "8.0" Requires: aaa_base >= 2002.3.27-0 @@ -86,11 +79,6 @@ Summary: Static library and includes for psion series 5 communication. Group: Development/Libraries Requires: %{name} = %{version} -%package kde -Summary: Psion support for KDE. -Group: User Interface/Desktops -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 @@ -108,13 +96,6 @@ disappear. Other programs included are: This package contains the static library and include files for building programs which can communicate with a Psion palmtop. -%description kde -This package provides support for a new protocol prefix "psion:/" for -KDE. Any KDE application which uses KDE-conforming URLs, can access -files on the Psion. Furthermore, a plugin for Konqueror's file-properties -dialog provides access to Psions proprietary file attributes and information -about the Psion's drives as well as generic machine information. - %description -l de Dieses Packet enthält Programme zur Kommunikation mit einem Psion Palmtop. Das Dateisystem des Psion wird beim Anschließen automatisch unter @@ -132,41 +113,10 @@ und erscheint erneuten Anschließen wieder. Weiterhin sind enthalten: Dieses Packet enthält die statische Bibliothek und include-Dateien zur Programm-Entwicklung von Kommunikations-software für den Psion. -%description -l de kde -Dieses Packet stellt Unterstützung für eine neues Protokoll-Präfix "psion:/" -für KDE bereit. Jede KDE Anwendung, die KDE-konforme URLs benutzt, kann -damit auf die Dateien eines Psion zugreifen. Weiterhin, liefert ein Plugin -für Konqueror's Datei-Eigenschaften-Dialog Informationen über proprietäre -Psion-Dateiattribute und stellt Informationen zum Gerät sowie seiner -Laufwerke zur Verfügung. - -%package -n kpsion -Summary: Psion utility for KDE. -Group: User Interface/Desktops -Requires: %{name} = %{version} - -%description -n kpsion -This package contains a KDE utility program for backup, restore and formatting -Psion drives. - -%description -l de -n kpsion -Dieses Packet enthält ein KDE Werkzeug zum Backup, Restore und Formatieren -von Psion Laufwerken. - -%package -n klipsi -Summary: Psion remote clipboard utility for KDE. -Group: User Interface/Desktops -Requires: %{name} = %{version} - -%description -n klipsi -This package contains a KDE utility for using the Psion's remote clipboard -function. - -%description -l de -n klipsi -Dieses Packet enthält ein KDE Werkzeug zum Transfer der Zwischenablage -zwischen Psion und Rechner. - %changelog +* Tue Nov 20 2007 Reuben Thomas <rrt@sc3d.org> +- Butchered out the KDE bits; no testing done afterwards + * Fri May 25 2001 Fritz Elfert <fritz.elfert@to.com> - Added klipsi subpackage @@ -216,21 +166,8 @@ chmod a+x find-requires %if "%{isSUSE}" > "0" # SuSE's libtools are breaking everything %define __libtoolize true -%if "%{REL}" >= "8.0" -%configure --enable-kde --with-initdir=%{_initrddir} --with-kdedir=/opt/kde3 %{_with_debug} -%else -%configure --enable-kde --with-initdir=%{_initrddir} --with-kdedir=/opt/kde2 %{_with_debug} -%endif -%endif -%if "%{isMDK}" > "0" -# Mandrake's libtool builds, but refuses to install kde modules into -# a directory not ending with /usr/lib - kinda strange -# -%define __libtoolize true -%endif -%if "%{isRH}" > "0" -QD=%{_qtdir} -%configure --enable-kde $QD --with-initdir=%{_initrddir} %{_with_debug} +%configure --with-initdir=%{_initrddir} %{_with_debug} +%configure --with-initdir=%{_initrddir} %{_with_debug} %endif make @@ -271,8 +208,6 @@ EOF %if "%{isMDK}" > "0" # Mandrake has a menu configurator mkdir -p $RPM_BUILD_ROOT%{_libdir}/menu -echo '?package(kpsion): needs="kde" kde_filename="kpsion" section="Office/PDA" title="KPsion" icon="psion_desktop.png" command="kpsion" kde_opt="\\nEncoding=UTF-8\\nGenericName=My Psion PDA\\nDocPath=kpsion/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true"' > $RPM_BUILD_ROOT%{_libdir}/menu/kpsion -echo '?package(klipsi): needs="kde" kde_filename="klipsi" section="Office/PDA" title="Klipsi" icon="klipsi.png" command="klipsi" kde_opt="\\nEncoding=UTF-8\\nGenericName=Psion Clipboard Utility\\nDocPath=klipsi/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true"' > $RPM_BUILD_ROOT%{_libdir}/menu/klipsi %endif %clean @@ -315,53 +250,6 @@ cp /etc/rc.config /etc/rc.config.old && mv /etc/rc.config.$$ /etc/rc.config %endif %endif -%if "%{isRH}" > "1" -%triggerin kde -- kdebase, kde-i18n-German -perl %{_datadir}/%{name}/kiodoc-update.pl -a psion -%endif - -%if "%{isMDK}" > "0" -%triggerin kde -- kdebase, kde-i18n-de -perl %{_datadir}/%{name}/kiodoc-update.pl -a psion -%endif - -%if "%{isSUSE}" > "0" -%if "%{REL}" >= "8.0" -%triggerin kde -- kdebase3, kde-i18n-de -export PATH=%{_kdebindir}:$PATH -perl %{_datadir}/%{name}/kiodoc-update.pl -a psion -%else -%triggerin kde -- kdebase, kde-i18n-de -export PATH=%{_kdebindir}:$PATH -perl %{_datadir}/%{name}/kiodoc-update.pl -a psion -%endif -%endif - -%if "%{isMDK}" > "0" -%post -n kpsion -update-menus - -%post -n klipsi -update-menus -%endif - -%post kde -%if "%{isSUSE}" > "0" -export PATH=%{_kdebindir}:$PATH -%endif -KONQRC=`%{_kdebindir}/kde-config --expandvars --install config`/konquerorrc -if test -f $KONQRC && grep -q '\[Notification Messages\]' $KONQRC ; then - cp $KONQRC $KONQRC.$$ - cat $KONQRC.$$ | grep -v "askSaveinode/x-psion-drive=No" | sed \ - -e '/\[Notification Messages\]/a\' \ - -e 'askSaveinode/x-psion-drive=No' > $KONQRC && \ - rm -f $KONQRC.$$ -else -cat>>$KONQRC<<EOF - -[Notification Messages] -askSaveinode/x-psion-drive=No -EOF fi %preun @@ -380,21 +268,6 @@ then %endif fi -%preun kde -%if "%{isSUSE}" > "0" -export PATH=%{_kdebindir}:$PATH -%endif -if [ "$1" = 0 ] -then - /usr/bin/perl %{_datadir}/%{name}/kiodoc-update.pl -r psion - KONQRC=`kde-config --expandvars --install config`/konquerorrc - if test -f $KONQRC ; then - cp $KONQRC $KONQRC.$$ - grep -v 'askSaveinode/x-psion-drive=' $KONQRC.$$ > $KONQRC && \ - rm -f $KONQRC.$$ - fi -fi - %files %doc COPYING INSTALL CHANGES ChangeLog README TODO etc/*magic %{_bindir}/plpftp @@ -420,45 +293,3 @@ fi %{_libdir}/libplp.a %{_libdir}/libplp.so %{_includedir}/%{name}/* - -%files kde -%{_kdelibdir}/kde*/kio_plp.so* -%{_kdelibdir}/kde*/kio_plp.la -%{_kdelibdir}/kde*/libplpprops.so* -%{_kdelibdir}/kde*/libplpprops.la -%{_kdedatadir}/services/* -%{_kdedatadir}/icons/*/*/mimetypes/* -%{_kdedatadir}/icons/*/*/devices/* -%{_kdedatadir}/icons/*/*/apps/psion* -%{_kdedatadir}/locale/*/LC_MESSAGES/libplpprops.mo -%{_kdedatadir}/mimelnk/*/* -%{_kdedatadir}/doc/HTML/*/kioslave/* -%{_datadir}/%{name}/kiodoc-update.pl - -%files -n kpsion -%{_kdebindir}/kpsion -%{_kdelibdir}/libkpsion.so* -%{_kdelibdir}/libkpsion.la -%if "%{isMDK}" > "0" -%{_libdir}/menu/kpsion -%endif -%{_kdedatadir}/applnk/*/kpsion* -%{_kdedatadir}/apps/kpsion/* -%{_kdedatadir}/apps/konqueror/* -%{_kdedatadir}/icons/*/*/apps/kpsion* -%{_kdedatadir}/icons/*/*/actions/psion* -%{_kdedatadir}/locale/*/LC_MESSAGES/kpsion.mo -%{_kdedatadir}/doc/HTML/*/kpsion - -%files -n klipsi -%{_kdebindir}/klipsi -%{_kdelibdir}/klipsi.so* -%{_kdelibdir}/klipsi.la -%if "%{isMDK}" > "0" -%{_libdir}/menu/klipsi -%endif -%{_kdedatadir}/applnk/*/klipsi* -%{_kdedatadir}/apps/klipsi/* -%{_kdedatadir}/icons/*/*/apps/klipsi* -%{_kdedatadir}/icons/*/*/actions/klipsi* -%{_kdedatadir}/locale/*/LC_MESSAGES/klipsi.mo |