- include path fixes. compiles

Changed files:
    aethera.spec -> 1.5

diff --git a/aethera.spec b/aethera.spec
index dfb23f66c36f7c88b10dc460fca175e8602ebd47..7131347c18f99c3db80e2837ba21dc5dcd133648 100644 (file)
--- a/aethera.spec
+++ b/aethera.spec
@@ -7,9 +7,11 @@ Release:       050331.%{_rel}
 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)
@@ -25,6 +27,8 @@ zadania, sprawy do za
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 export QTDIR=/usr
@@ -32,6 +36,11 @@ export QTDIR=/usr
 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
@@ -45,9 +54,9 @@ qmake desktop.pro
 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}
@@ -56,7 +65,7 @@ qmake tkcssl.pro
 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}
@@ -66,16 +75,16 @@ cd ../aethera
 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
 
@@ -87,18 +96,26 @@ cd ../koplugin
 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
 
@@ -107,10 +124,15 @@ qmake KOPlugin.pro
 
 %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