desktop package build changes

2 files changed, 8 insertions, 6 deletions

diff --git a/desktop/Makefile b/desktop/Makefile
index 0057a85..edd1f09 100644
--- a/desktop/Makefile
+++ b/desktop/Makefile
@@ -1,29 +1,29 @@
 export KDEPIMDIR = $(shell pwd)
 
 export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < ../version)
-export KDEDIR=/kde_dev/kde
-export KDE_DEV_DIR=/kde_dev/kde32/build/kdepim33_proko2_new/
+export KDEDIR=/opt/kde3
+export KDE_DEV_DIR=/kde_dev/kdecvs/head/kdepim
 all: 
 	cd ../kde2file/caldump;qmake;make
 	cd ../kde2file/abdump;qmake;make
 
 install:	
 	mkdir -p /opt/kdepimpi
 	mkdir -p /opt/kde3/share/applnk/PIM-pi
 	rm -rf /opt/kdepimpi/*
 	rm -f /usr/lib/libmicro*
 	rm -fr /opt/kde3/share/applnk/PIM-pi/*
 	cp -r ../bin/* /opt/kdepimpi/
 	cp --no-dereference ../bin/libmicro* /usr/lib/
 	rm -rf /opt/kdepimpi/libmicro*
 	rm -rf /usr/lib/libmicrokabc_*
 	cp --no-dereference ../bin/libmicrokabc_* /opt/kdepimpi/
 	cd /opt/kdepimpi; rm -dfR CVS
 	cd /opt/kdepimpi/kdepim; rm -dfR CVS
 	cd /opt/kdepimpi/kdepim/pwmanager; rm -dfR CVS
 	cd /opt/kdepimpi/kdepim/pwmanager/icons22; rm -dfR CVS
 	cd /opt/kdepimpi/kdepim/pwmanager/icons16; rm -dfR CVS
 	cd /opt/kdepimpi/kdepim/korganizer; rm -dfR CVS
 	cd /opt/kdepimpi/kdepim/korganizer/icons16; rm -dfR CVS
 	cd /opt/kdepimpi/kdepim/korganizer/iconsmini; rm -dfR CVS
 	cd /opt/kdepimpi/kdepim/korganizer/icons16; rm -dfR .xvpics
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm
index 6bafcb9..9d1b1b8 100644
--- a/desktop/rpm/kdepim_rpm
+++ b/desktop/rpm/kdepim_rpm
@@ -1,82 +1,84 @@
 Summary: A collection of PIM programs
 Name: KDE-Pim-Pi
-Version: 1.9.13
-Release: SuSE_9.1
+Version: 1.9.14
+Release: SuSE_9.2
 Copyright:GPL
 Group: Productivity/Pim
 Source:http://sourceforge.net/projects/kdepimpi/
 URL:http://sourceforge.net/projects/kdepimpi/
 Packager: zautrix
 
 %description
 This package contains the platform-independent PIM programs from
-www.pi-sync.net, compiled for SuSE 9.1:
+www.pi-sync.net, compiled for SuSE 9.2:
 KTimeTacker/Pi
 KPhone/Pi
 KAddressbook/Pi
 KOrganizer/Pi
 PasswordManager/Pi
 KOPieMail/Pi
 
 These applications do not need anything from the KDE-desktop
 at all to run on Linux. However, there is a dependency from
 two KDE libs, because a small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 
 These applications are independent from the KDE-desktop
 environment. That means, nothing of your existing
 KDE-desktop setup will be changed, or any data 
 (calendar-addressbook) used by the KDE-desktop
 applications will be changed or accessed.
 These applications stores their data and config in
 $HOME/kdepim/
 However, because the same file format is used,
 an easy exchange of data with the KDE-desktop
 is possible.
 A small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 You do not need to call this program from the commandline,
 it is called from the KDE-Pim/Pi apps when you choose there:
 Sync with KDE_Desktop.
 If something is going wrong, please start the
 KDE-Pim/Pi program itself from the console to get detailed output.
 
 After installation, you should have a 
 PIM-pi
 folder in your KDE start menu, where you can
 start the applications from.
 
 These programs makes it possible to sync your Zaurus easily
 (with the KDE-Pim/Pi programs running on the Zaurus)
 with the KDE-desktop calendar/addressbook data.
 If you want to use that, you have to update your 
 KDE-desktop to version 3.3.0 or higher.
+SuSE 9.2 contains KDE 3.3.0 such that no update is needed.
 Actually - after the (non difficult) configuration is set up -
 with two mouseklicks on the Zaurus,
 the Zaurus syncs with the corresponding  KDE-Pim/Pi 
 program on the Linux Desktop which syncs automatically
 with the KDE-desktop data.
 
 If you want to use the KDE-desktop calendar/addressbook applications,
 just install these apps in this package and use them as a syncing tool for the
 Zaurus <-> KDE-desktop sync.
 The sync requires a network connection from your Zaurus to
 the PC. A detailed Sync HowTo is available in the
 Help menu of the applications.
 
 These applications makes it also possible, that you can sync
 (or just export the data to) your mobile phone with your 
 data of the KDE-desktop calendar/addressbook applications.
 This is tested and working for Nokia mobile phones,
 it may work with others as well.
 (More info about that: -> Sync HowTo)
 
 NOTE:
-You have to make an online update in SuSE 9.1 to make it
+When using SuSE 9.1 you have to update your KDE to 3.3.x
+and you have to make an online update in SuSE 9.1 to make it
 possible to get the infrared connection working, such that
 you can sync your (Nokia) mobile phone via infrared.
 
 %files
 /opt/kde3/share/applnk/PIM-pi/
 /opt/kdepimpi/
 /usr/lib/libmicro*