SPECS: aethera.spec - include path fixes. compiles

[glen]

Author: glen                         Date: Sun Nov  5 11:59:30 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- include path fixes. compiles

---- Files affected:
SPECS:
   aethera.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/aethera.spec
diff -u SPECS/aethera.spec:1.4 SPECS/aethera.spec:1.5
--- SPECS/aethera.spec:1.4	Sat Nov  4 16:10:01 2006
+++ SPECS/aethera.spec	Sun Nov  5 12:59:24 2006
@@ -8,9 +8,11 @@
 License:	GPL
 Group:		X11/Applications
 Source0:	%{name}-%{version}.tar.gz
+Patch0:		%{name}-libs.patch
+Patch1:		%{name}-includes.patch
 # Source0-md5:	f3efd064b5e9884bd7adf49bf763e213
 URL:		http://www.thekompany.com/projects/aethera/
-#BuildRequires:	korelib
+BuildRequires:	korelib-devel
 BuildRequires:	qt-devel
 #Requires: thekompany-support
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -26,6 +28,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 export QTDIR=/usr
@@ -33,6 +37,11 @@
 export LD_LIBRARY_PATH=$dir/lib:$LD_LIBRARY_PATH
 dir=$(pwd)
 
+
+mkdir -p include/aethera
+ln -sf ../../aethera/libs/clientskel/clientrmi.h include/aethera
+ln -sf ../../aethera/libs/clientskel/vfsmodule.h include/aethera
+
 # Compile tkcBase
 cd tkcbase
 echo > defines.pri
@@ -46,9 +55,9 @@
 cd ../tkcssl
 echo > defines.pri
 echo "TKCSSL_LIB="$dir/lib >> defines.pri
-echo "TKCSSL_INCLUDE="$dir/include/tkcssl >> defines.pri
-echo "INCLUDEPATH += "$dir/include/tkcbase >> defines.pri
-echo "DEPENDPATH += "$dir/include/tkcbase >> defines.pri
+echo "TKCSSL_INCLUDE="$dir/tkcssl >> defines.pri
+echo "INCLUDEPATH += "$dir/tkcbase >> defines.pri
+echo "DEPENDPATH += "$dir/tkcbase >> defines.pri
 echo "CONFIG += release thread" >> defines.pri
 qmake tkcssl.pro
 %{__make}
@@ -57,7 +66,7 @@
 cd ../webdav
 echo > defines.pri
 echo "WEBDAV_LIB="$dir/lib/ >> defines.pri
-echo "WEBDAV_INCLUDE="$dir/include/tkcbase >> defines.pri
+echo "WEBDAV_INCLUDE="$dir/tkcbase >> defines.pri
 echo "CONFIG += release thread" >> defines.pri
 qmake webdav.pro
 %{__make}
@@ -67,16 +76,16 @@
 echo > defines.pri
 echo "AETHERA_DIR="$dir/lib/theKompany/Aethera >> defines.pri
 echo "AETHERA_BIN="$dir/bin >> defines.pri
-echo "AETHERA_LIB="$dir/lib/ >> defines.pri
+echo "AETHERA_LIB="$dir/tkcbase >> defines.pri
 echo "AETHERA_INCLUDE="$dir/include/aethera/ >> defines.pri
 echo "AETHERA_INCLUDES="$dir/include/aethera/ >> defines.pri
 echo "TINO_LIB="$dir/lib/lib >> defines.pri
 echo "TINO_INCLUDE="$dir/include/tino >> defines.pri
 echo "INCLUDEPATH += "$dir/include >> defines.pri
-echo "INCLUDEPATH += "$dir/include/tkcbase >> defines.pri
-echo "DEPENDPATH += "$dir/include/tkcbase >> defines.pri
-echo "INCLUDEPATH += "$dir/include/tkcssl >> defines.pri
-echo "DEPENDPATH += "$dir/include/tkcssl >> defines.pri
+echo "INCLUDEPATH += "$dir/tkcbase >> defines.pri
+echo "DEPENDPATH += "$dir/tkcbase >> defines.pri
+echo "INCLUDEPATH += "$dir/tkcssl >> defines.pri
+echo "DEPENDPATH += "$dir/tkcssl >> defines.pri
 
 echo "CONFIG += qt warn_on release thread" >> defines.pri
 
@@ -88,18 +97,26 @@
 echo > defines.pri
 echo "AETHERA_DIR="$dir/lib >> defines.pri
 echo "INCLUDEPATH += "$dir/include >> defines.pri
-echo "INCLUDEPATH += "$dir/include/tkcbase >> defines.pri
-echo "DEPENDPATH += "$dir/include/tkcbase >> defines.pri
-echo "INCLUDEPATH += "$dir/include/tkcssl >> defines.pri
-echo "DEPENDPATH += "$dir/include/tkcssl >> defines.pri
-echo "INCLUDEPATH += "$dir/include/aethera >> defines.pri
-echo "DEPENDPATH += "$dir/include/aethera >> defines.pri
+echo "INCLUDEPATH += "$dir/tkcbase >> defines.pri
+echo "DEPENDPATH += "$dir/tkcbase >> defines.pri
+echo "INCLUDEPATH += "$dir/tkcssl >> defines.pri
+echo "DEPENDPATH += "$dir/tkcssl >> defines.pri
+echo "INCLUDEPATH += "$dir/aethera/libs >> defines.pri
+echo "DEPENDPATH += "$dir/aethera/libs >> defines.pri
+echo "INCLUDEPATH += "$dir/aethera/libs/aethera >> defines.pri
+echo "DEPENDPATH += "$dir/aethera/libs/aethera >> defines.pri
+echo "INCLUDEPATH += "$direbdav/webdav >> defines.pri
+echo "DEPENDPATH += "$dir/webdav/webdav >> defines.pri
+echo "INCLUDEPATH += "$dir/aethera/libs/clientskel >> defines.pri
+echo "DEPENDPATH += "$dir/aethera/libs/clientskel >> defines.pri
+
 echo "INCLUDEPATH += "$dir/include/aethera/libs/plugins/kommailplugin >> defines.pri
 echo "DEPENDPATH += "$dir/include/aethera/libs/plugins/kommailplugin >> defines.pri
 echo "INCLUDEPATH += "$dir/include/aethera/libs/plugins/komcontactsplugin >> defines.pri
 echo "DEPENDPATH += "$dir/include/aethera/libs/plugins/komcontactsplugin >> defines.pri
 echo "INCLUDEPATH += "$dir/include/tino >> defines.pri
 echo "DEPENDPATH += "$dir/include/tino >> defines.pri
+
 echo "CONFIG += qt warn_on release thread" >> defines.pri
 echo "DEFINES += AETHERA_KOLAB" >> defines.pri
 
@@ -108,10 +125,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} -C tkcbase install
-%{__make} -C tkcssl install
-%{__make} -C webdav install
-%{__make} -C aethera install
+export QTDIR=/usr
+%{__make} -C tkcbase install \
+	INSTALL_ROOT=$RPM_BUILD_ROOT
+%{__make} -C tkcssl install \
+	INSTALL_ROOT=$RPM_BUILD_ROOT
+%{__make} -C webdav install \
+	INSTALL_ROOT=$RPM_BUILD_ROOT
+%{__make} -C aethera install \
+	INSTALL_ROOT=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -125,6 +147,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/11/05 11:59:24  glen
+- include path fixes. compiles
+
 Revision 1.4  2006/11/04 15:10:01  ankry
 - capitalization dropped in pl (ZIO != PIM)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/aethera.spec?r1=1.4&r2=1.5&f=u