SPECS: aethera.spec - build fixes, but can't find kore headers

[glen]

Author: glen                         Date: Sat Nov  4 14:12:32 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build fixes, but can't find kore headers

---- Files affected:
SPECS:
   aethera.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/aethera.spec
diff -u SPECS/aethera.spec:1.1 SPECS/aethera.spec:1.2
--- SPECS/aethera.spec:1.1	Sat Nov  4 14:59:25 2006
+++ SPECS/aethera.spec	Sat Nov  4 15:12:27 2006
@@ -22,6 +22,7 @@
 %setup -q
 
 %build
+export QTDIR=/usr
 # Use the new libraries in building process
 export LD_LIBRARY_PATH=$dir/lib:$LD_LIBRARY_PATH
 dir=$(pwd)
@@ -32,9 +33,7 @@
 echo "TKCBASE_LIB="$dir/lib >> defines.pri
 echo "TKCBASE_INCLUDE="$dir/tkcbase >> defines.pri
 echo "CONFIG += release thread" >> defines.pri
-./qmake.sh
-%{__make}
-./qmake.sh
+qmake desktop.pro
 %{__make}
 
 # Compile tkcSSL
@@ -45,9 +44,7 @@
 echo "INCLUDEPATH += "$dir/include/tkcbase >> defines.pri
 echo "DEPENDPATH += "$dir/include/tkcbase >> defines.pri
 echo "CONFIG += release thread" >> defines.pri
-./qmake.sh
-%{__make}
-./qmake.sh
+qmake tkcssl.pro
 %{__make}
 
 # Compile webdav
@@ -56,9 +53,7 @@
 echo "WEBDAV_LIB="$dir/lib/ >> defines.pri
 echo "WEBDAV_INCLUDE="$dir/include/tkcbase >> defines.pri
 echo "CONFIG += release thread" >> defines.pri
-./qmake.sh
-%{__make}
-./qmake.sh
+qmake webdav.pro
 %{__make}
 
 # Compile Aethera
@@ -79,17 +74,13 @@
 
 echo "CONFIG += qt warn_on release thread" >> defines.pri
 
-./qmake.sh
-%{__make}
-./qmake.sh
+qmake aethera.pro
 %{__make}
 
 # Compile KOrganizer plugin
 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
@@ -103,13 +94,10 @@
 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
 
-./qmake.sh
-%{__make}
-./qmake.sh
+qmake KOPlugin.pro
 %{__make}
 
 %install
@@ -131,7 +119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2006/11/04 14:12:27  glen
+- build fixes, but can't find kore headers
+
 Revision 1.1  2006/11/04 13:59:25  glen
 - based on spec in sources
 - adapterized; manual adapter
-
================================================================

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