packages: kde4-kdevelop/kde4-kdevelop.spec, kde4-kdevelop/kde4-kdevelop-okt...

pluto pluto at pld-linux.org
Sat Jan 21 23:02:17 CET 2012


Author: pluto                        Date: Sat Jan 21 22:02:16 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix okteta plugins build, release 3.

---- Files affected:
packages/kde4-kdevelop:
   kde4-kdevelop.spec (1.44 -> 1.45) , kde4-kdevelop-okteta.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kde4-kdevelop/kde4-kdevelop.spec
diff -u packages/kde4-kdevelop/kde4-kdevelop.spec:1.44 packages/kde4-kdevelop/kde4-kdevelop.spec:1.45
--- packages/kde4-kdevelop/kde4-kdevelop.spec:1.44	Sat Jan 21 09:58:37 2012
+++ packages/kde4-kdevelop/kde4-kdevelop.spec	Sat Jan 21 23:02:11 2012
@@ -3,8 +3,8 @@
 # Conditional build:
 #
 %define		_state		stable
-%define		kdever		4.6.4
-%define		qtver		4.7.3
+%define		kdever		4.8.0
+%define		qtver		4.8.0
 %define		orgname		kdevelop
 %define		kdevplatform	1.2.3
 
@@ -15,11 +15,12 @@
 Summary(zh_CN.UTF-8):	KDE C/C++集成开发环境
 Name:		kde4-kdevelop
 Version:	4.2.3
-Release:	2
+Release:	3
 License:	GPL
 Group:		X11/Development/Tools
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/kdevelop/%{version}/src/%{orgname}-%{version}.tar.bz2
 # Source0-md5:	8b6e59764612314e6776edb3386c0930
+Patch0:		%{name}-okteta.patch
 URL:		http://www.kdevelop.org/
 BuildRequires:	QtHelp-devel >= %{qtver}
 BuildRequires:	QtNetwork-devel >= %{qtver}
@@ -113,6 +114,7 @@
 
 %prep
 %setup -q -n %{orgname}-%{version}
+%patch0 -p1
 
 %build
 install -d build
@@ -159,7 +161,7 @@
 %attr(755,root,root) %{_libdir}/kde4/kdevcustommakemanager.so
 %attr(755,root,root) %{_libdir}/kde4/kdevgdb.so
 %attr(755,root,root) %{_libdir}/kde4/kdevindent.so
-#%attr(755,root,root) %{_libdir}/kde4/kdevokteta.so
+%attr(755,root,root) %{_libdir}/kde4/kdevokteta.so
 %attr(755,root,root) %{_libdir}/kde4/kdevmakebuilder.so
 %attr(755,root,root) %{_libdir}/kde4/kdevmanpage.so
 %attr(755,root,root) %{_libdir}/kde4/kdevqthelp.so
@@ -181,7 +183,7 @@
 %{_datadir}/apps/kdevgdb/printers/qt4.py
 %{_datadir}/apps/kdevgdb/printers/kde4.py
 %{_datadir}/apps/kdevgdb/printers/libstdcxx.py
-#%{_datadir}/apps/kdevokteta
+%{_datadir}/apps/kdevokteta
 %{_datadir}/config/kdeveloprc
 %dir %{_datadir}/apps/kdevcppsupport
 %{_datadir}/apps/kdevcppsupport/kdevcppsupport.rc
@@ -197,7 +199,7 @@
 %{_datadir}/kde4/services/kdevindent.desktop
 %{_datadir}/kde4/services/kdevmakebuilder.desktop
 %{_datadir}/kde4/services/kdevmanpage.desktop
-#%{_datadir}/kde4/services/kdevokteta.desktop
+%{_datadir}/kde4/services/kdevokteta.desktop
 %{_datadir}/kde4/services/kdevqthelp.desktop
 %{_datadir}/kde4/services/kdevqthelp_config.desktop
 %{_datadir}/kde4/services/kdevkdeprovider.desktop
@@ -217,6 +219,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2012/01/21 22:02:11  pluto
+- fix okteta plugins build, release 3.
+
 Revision 1.44  2012/01/21 08:58:37  lmasko
 - Some files were missing. I've commented them out to have the package built.
 

================================================================
Index: packages/kde4-kdevelop/kde4-kdevelop-okteta.patch
diff -u /dev/null packages/kde4-kdevelop/kde4-kdevelop-okteta.patch:1.1
--- /dev/null	Sat Jan 21 23:02:17 2012
+++ packages/kde4-kdevelop/kde4-kdevelop-okteta.patch	Sat Jan 21 23:02:11 2012
@@ -0,0 +1,963 @@
+diff -Nur kdevelop-4.2.3/cmake/modules/FindLibKasten.cmake kdevelop-4.2.3-okteta08/cmake/modules/FindLibKasten.cmake
+--- kdevelop-4.2.3/cmake/modules/FindLibKasten.cmake	2011-06-24 21:04:01.000000000 +0200
++++ kdevelop-4.2.3-okteta08/cmake/modules/FindLibKasten.cmake	2011-12-24 01:07:30.000000000 +0100
+@@ -1,73 +1,162 @@
+-# - Find Kasten library
++# - Find Kasten libraries, v0 or v1
+ #
+ # This module defines
+ #  LIBKASTEN_FOUND - whether the libkasten libraries were found
++#  LIBKASTEN_VERSION - version of the libkasten libraries found
+ #  LIBKASTEN_LIBRARIES - the libkasten libraries
+-#  LIBKASTEN_INCLUDE_DIR - the include path of the libkasten libraries
++#  LIBKASTEN_INCLUDE_DIRS - the include paths of the libkasten libraries
+ 
+ 
+-if( LIBKASTEN_INCLUDE_DIR AND LIBKASTEN_LIBRARIES )
++if( LIBKASTEN_INCLUDE_DIR AND LIBKASTEN_LIBRARIES AND LIBKASTEN_VERSION )
+     # Already in cache, be silent
+     set( Kasten_FIND_QUIETLY TRUE )
+-endif( LIBKASTEN_INCLUDE_DIR AND LIBKASTEN_LIBRARIES )
++endif( LIBKASTEN_INCLUDE_DIR AND LIBKASTEN_LIBRARIES AND LIBKASTEN_VERSION )
+ 
+-
+-find_library( LIBKASTENCORE_LIBRARY
+-  NAMES
+-  kastencore
+-  HINTS
+-  ${LIB_INSTALL_DIR}
+-  ${KDE4_LIB_DIR}
+-)
+-
+-find_library( LIBKASTENGUI_LIBRARY
+-  NAMES
+-  kastengui
+-  HINTS
+-  ${LIB_INSTALL_DIR}
+-  ${KDE4_LIB_DIR}
+-)
+-
+-find_library( LIBKASTENCONTROLLERS_LIBRARY
+-  NAMES
+-  kastencontrollers
+-  HINTS
+-  ${LIB_INSTALL_DIR}
+-  ${KDE4_LIB_DIR}
+-)
+-
+-set( LIBKASTEN_LIBRARIES
+-  ${LIBKASTENCORE_LIBRARY}
+-  ${LIBKASTENGUI_LIBRARY}
+-  ${LIBKASTENCONTROLLERS_LIBRARY}
+-)
+-
+-
+-find_path( LIBKASTEN_INCLUDE_DIR
+-  NAMES
+-  abstractmodel.h
+-  PATH_SUFFIXES
+-  kasten
+-  HINTS
+-  ${INCLUDE_INSTALL_DIR}
+-  ${KDE4_INCLUDE_DIR}
+-)
+-
+-if( LIBKASTEN_INCLUDE_DIR AND LIBKASTEN_LIBRARIES )
+-   set( LIBKASTEN_FOUND  TRUE )
+-else( LIBKASTEN_INCLUDE_DIR AND LIBKASTEN_LIBRARIES )
+-   set( LIBKASTEN_FOUND  FALSE )
+-endif( LIBKASTEN_INCLUDE_DIR AND LIBKASTEN_LIBRARIES )
++if( LIBKASTEN_FIND_VERSION EQUAL 1 )
++    find_library( KASTEN1_CORE_LIB
++        NAMES
++        kasten1core
++        HINTS
++        ${LIB_INSTALL_DIR}
++        ${KDE4_LIB_DIR}
++    )
++
++    find_library( KASTEN1_GUI_LIB
++        NAMES
++        kasten1gui
++        HINTS
++        ${LIB_INSTALL_DIR}
++        ${KDE4_LIB_DIR}
++    )
++
++    find_library( KASTEN1_CONTROLLERS_LIB
++        NAMES
++        kasten1controllers
++        HINTS
++        ${LIB_INSTALL_DIR}
++        ${KDE4_LIB_DIR}
++    )
++
++    find_path( KASTEN1_NORMAL_INCLUDE_DIR
++        NAMES
++        abstractmodel.h
++        PATH_SUFFIXES
++        kasten1
++        HINTS
++        ${INCLUDE_INSTALL_DIR}
++        ${KDE4_INCLUDE_DIR}
++    )
++
++    find_path( KASTEN1_CAMELCASE_INCLUDE_DIR
++        NAMES
++        Kasten1/AbstractModel
++        PATH_SUFFIXES
++        KDE
++        HINTS
++        ${INCLUDE_INSTALL_DIR}
++        ${KDE4_INCLUDE_DIR}
++    )
++
++
++    if( KASTEN1_NORMAL_INCLUDE_DIR AND KASTEN1_CAMELCASE_INCLUDE_DIR AND
++        KASTEN1_CORE_LIB AND KASTEN1_GUI_LIB AND KASTEN1_CONTROLLERS_LIB )
++        set( LIBKASTEN_FOUND TRUE )
++    endif( KASTEN1_NORMAL_INCLUDE_DIR AND KASTEN1_CAMELCASE_INCLUDE_DIR AND
++        KASTEN1_CORE_LIB AND KASTEN1_GUI_LIB AND KASTEN1_CONTROLLERS_LIB )
++
++    if( LIBKASTEN_FOUND )
++        set( LIBKASTEN_VERSION 1 )
++        set( LIBKASTEN_INCLUDE_DIRS
++            ${KASTEN1_NORMAL_INCLUDE_DIR}
++            ${KASTEN1_CAMELCASE_INCLUDE_DIR}
++        )
++        set( LIBKASTEN_LIBRARIES
++            ${KASTEN1_CORE_LIB}
++            ${KASTEN1_GUI_LIB}
++            ${KASTEN1_CONTROLLERS_LIB}
++        )
++    endif( LIBKASTEN_FOUND )
++endif( LIBKASTEN_FIND_VERSION EQUAL 1 )
++
++if( LIBKASTEN_FIND_VERSION EQUAL 0 )
++    find_library( LIBKASTENCORE0_LIBRARY
++        NAMES
++        kastencore
++        HINTS
++        ${LIB_INSTALL_DIR}
++        ${KDE4_LIB_DIR}
++    )
++
++    find_library( LIBKASTENGUI0_LIBRARY
++        NAMES
++        kastengui
++        HINTS
++        ${LIB_INSTALL_DIR}
++        ${KDE4_LIB_DIR}
++    )
++
++    find_library( LIBKASTENCONTROLLERS0_LIBRARY
++        NAMES
++        kastencontrollers
++        HINTS
++        ${LIB_INSTALL_DIR}
++        ${KDE4_LIB_DIR}
++    )
++
++
++    find_path( LIBKASTEN0_NORMAL_INCLUDE_DIR
++        NAMES
++        abstractmodel.h
++        PATH_SUFFIXES
++        kasten
++        HINTS
++        ${INCLUDE_INSTALL_DIR}
++        ${KDE4_INCLUDE_DIR}
++    )
++
++    find_path( LIBKASTEN0_CAMELCASE_INCLUDE_DIR
++        NAMES
++        Kasten/AbstractModel
++        PATH_SUFFIXES
++        KDE
++        HINTS
++        ${INCLUDE_INSTALL_DIR}
++        ${KDE4_INCLUDE_DIR}
++    )
++
++    if( LIBKASTEN0_NORMAL_INCLUDE_DIR AND LIBKASTEN0_CAMELCASE_INCLUDE_DIR AND
++        LIBKASTENCORE0_LIBRARY AND LIBKASTENGUI0_LIBRARY AND LIBKASTENCONTROLLERS0_LIBRARY )
++        set( LIBKASTEN_FOUND TRUE )
++    endif( LIBKASTEN0_NORMAL_INCLUDE_DIR AND LIBKASTEN0_CAMELCASE_INCLUDE_DIR AND
++           LIBKASTENCORE0_LIBRARY AND LIBKASTENGUI0_LIBRARY AND LIBKASTENCONTROLLERS0_LIBRARY )
++
++    if( LIBKASTEN_FOUND )
++        set( LIBKASTEN_VERSION 0 )
++        set( LIBKASTEN_INCLUDE_DIRS
++            ${LIBKASTEN0_NORMAL_INCLUDE_DIR}
++            ${LIBKASTEN0_CAMELCASE_INCLUDE_DIR}
++        )
++        set( LIBKASTEN_LIBRARIES
++            ${LIBKASTENCORE0_LIBRARY}
++            ${LIBKASTENGUI0_LIBRARY}
++            ${LIBKASTENCONTROLLERS0_LIBRARY}
++        )
++    endif( LIBKASTEN_FOUND )
++endif( LIBKASTEN_FIND_VERSION EQUAL 0 )
+ 
+ 
+ if( LIBKASTEN_FOUND )
+-   if( NOT Kasten_FIND_QUIETLY )
+-      message( STATUS "Found Kasten libraries: ${LIBKASTEN_LIBRARIES}" )
+-   endif( NOT Kasten_FIND_QUIETLY )
++    if( NOT Kasten_FIND_QUIETLY )
++        message( STATUS "Found Kasten libraries v${LIBKASTEN_VERSION}: ${LIBKASTEN_LIBRARIES}" )
++    endif( NOT Kasten_FIND_QUIETLY )
+ else( LIBKASTEN_FOUND )
+-   if( LibKasten_FIND_REQUIRED )
+-      message( FATAL_ERROR "Could not find Kasten libraries" )
+-   endif( LibKasten_FIND_REQUIRED )
++    if( LibKasten_FIND_REQUIRED )
++        message( FATAL_ERROR "Could not find Kasten libraries." )
++    endif( LibKasten_FIND_REQUIRED )
+ endif( LIBKASTEN_FOUND )
+ 
+-mark_as_advanced( LIBKASTEN_INCLUDE_DIR LIBKASTEN_LIBRARIES )
++mark_as_advanced(
++    LIBKASTEN_INCLUDE_DIRS
++    LIBKASTEN_LIBRARIES
++    LIBKASTEN_VERSION
++)
+diff -Nur kdevelop-4.2.3/cmake/modules/FindLibOkteta.cmake kdevelop-4.2.3-okteta08/cmake/modules/FindLibOkteta.cmake
+--- kdevelop-4.2.3/cmake/modules/FindLibOkteta.cmake	2011-06-24 21:04:01.000000000 +0200
++++ kdevelop-4.2.3-okteta08/cmake/modules/FindLibOkteta.cmake	2011-12-24 01:07:55.000000000 +0100
+@@ -1,64 +1,146 @@
+-# - Find Okteta library
++# - Find Okteta libraries, v0 or v1
+ #
+ # This module defines
+ #  LIBOKTETA_FOUND - whether the libokteta libraries were found
++#  LIBOKTETA_VERSION - version of the libokteta libraries found
+ #  LIBOKTETA_LIBRARIES - the libokteta libraries
+-#  LIBOKTETA_INCLUDE_DIR - the include path of the libokteta libraries
++#  LIBOKTETA_INCLUDE_DIRS - the include paths of the libokteta libraries
+ 
+ 
+-if( LIBOKTETA_INCLUDE_DIR AND LIBOKTETA_LIBRARIES )
++if( LIBOKTETA_INCLUDE_DIRS AND LIBOKTETA_LIBRARIES AND LIBOKTETA_VERSION )
+     # Already in cache, be silent
+     set( Okteta_FIND_QUIETLY TRUE )
+-endif( LIBOKTETA_INCLUDE_DIR AND LIBOKTETA_LIBRARIES )
++endif( LIBOKTETA_INCLUDE_DIRS AND LIBOKTETA_LIBRARIES AND LIBOKTETA_VERSION )
+ 
+-
+-find_library( LIBOKTETACORE_LIBRARY
+-  NAMES
+-  oktetacore
+-  HINTS
+-  ${LIB_INSTALL_DIR}
+-  ${KDE4_LIB_DIR}
+-)
+-
+-find_library( LIBOKTETAGUI_LIBRARY
+-  NAMES
+-  oktetagui
+-  HINTS
+-  ${LIB_INSTALL_DIR}
+-  ${KDE4_LIB_DIR}
+-)
+-
+-set( LIBOKTETA_LIBRARIES
+-  ${LIBOKTETACORE_LIBRARY}
+-  ${LIBOKTETAGUI_LIBRARY}
+-)
+-
+-
+-find_path( LIBOKTETA_INCLUDE_DIR
+-  NAMES
+-  abstractbytearraymodel.h
+-  PATH_SUFFIXES
+-  okteta
+-  HINTS
+-  ${INCLUDE_INSTALL_DIR}
+-  ${KDE4_INCLUDE_DIR}
+-)
+-
+-if( LIBOKTETA_INCLUDE_DIR AND LIBOKTETA_LIBRARIES )
+-   set( LIBOKTETA_FOUND  TRUE )
+-else( LIBOKTETA_INCLUDE_DIR AND LIBOKTETA_LIBRARIES )
+-   set( LIBOKTETA_FOUND  FALSE )
+-endif( LIBOKTETA_INCLUDE_DIR AND LIBOKTETA_LIBRARIES )
++if( LIBOKTETA_FIND_VERSION EQUAL 1 )
++    find_library( LIBOKTETACORE1_LIBRARY
++        NAMES
++        okteta1core
++        HINTS
++        ${LIB_INSTALL_DIR}
++        ${KDE4_LIB_DIR}
++    )
++
++    find_library( LIBOKTETAGUI1_LIBRARY
++        NAMES
++        okteta1gui
++        HINTS
++        ${LIB_INSTALL_DIR}
++        ${KDE4_LIB_DIR}
++    )
++
++
++    find_path( LIBOKTETA1_NORMAL_INCLUDE_DIR
++        NAMES
++        abstractbytearraymodel.h
++        PATH_SUFFIXES
++        okteta1
++        HINTS
++        ${INCLUDE_INSTALL_DIR}
++        ${KDE4_INCLUDE_DIR}
++    )
++
++    find_path( LIBOKTETA1_CAMELCASE_INCLUDE_DIR
++        NAMES
++        Okteta1/AbstractByteArrayModel
++        PATH_SUFFIXES
++        KDE
++        HINTS
++        ${INCLUDE_INSTALL_DIR}
++        ${KDE4_INCLUDE_DIR}
++    )
++
++
++    if( LIBOKTETA1_NORMAL_INCLUDE_DIR AND LIBOKTETA1_CAMELCASE_INCLUDE_DIR AND
++        LIBOKTETACORE1_LIBRARY AND LIBOKTETAGUI1_LIBRARY )
++        set( LIBOKTETA_FOUND TRUE )
++    endif( LIBOKTETA1_NORMAL_INCLUDE_DIR AND LIBOKTETA1_CAMELCASE_INCLUDE_DIR AND
++        LIBOKTETACORE1_LIBRARY AND LIBOKTETAGUI1_LIBRARY )
++
++    if( LIBOKTETA_FOUND )
++        set( LIBOKTETA_VERSION 1 )
++        set( LIBOKTETA_INCLUDE_DIRS
++            ${LIBOKTETA1_NORMAL_INCLUDE_DIR}
++            ${LIBOKTETA1_CAMELCASE_INCLUDE_DIR}
++        )
++        set( LIBOKTETA_LIBRARIES
++            ${LIBOKTETACORE1_LIBRARY}
++            ${LIBOKTETAGUI1_LIBRARY}
++        )
++    endif( LIBOKTETA_FOUND )
++
++endif( LIBOKTETA_FIND_VERSION EQUAL 1 )
++
++if( LIBOKTETA_FIND_VERSION EQUAL 0 )
++    find_library( LIBOKTETACORE0_LIBRARY
++        NAMES
++        oktetacore
++        HINTS
++        ${LIB_INSTALL_DIR}
++        ${KDE4_LIB_DIR}
++    )
++
++    find_library( LIBOKTETAGUI0_LIBRARY
++        NAMES
++        oktetagui
++        HINTS
++        ${LIB_INSTALL_DIR}
++        ${KDE4_LIB_DIR}
++    )
++
++    find_path( LIBOKTETA0_NORMAL_INCLUDE_DIR
++        NAMES
++        abstractbytearraymodel.h
++        PATH_SUFFIXES
++        okteta
++        HINTS
++        ${INCLUDE_INSTALL_DIR}
++        ${KDE4_INCLUDE_DIR}
++    )
++
++    find_path( LIBOKTETA0_CAMELCASE_INCLUDE_DIR
++        NAMES
++        Okteta/AbstractByteArrayModel
++        PATH_SUFFIXES
++        KDE
++        HINTS
++        ${INCLUDE_INSTALL_DIR}
++        ${KDE4_INCLUDE_DIR}
++    )
++
++
++    if( LIBOKTETA0_NORMAL_INCLUDE_DIR AND LIBOKTETA0_CAMELCASE_INCLUDE_DIR AND
++        LIBOKTETACORE0_LIBRARY AND LIBOKTETAGUI0_LIBRARY )
++        set( LIBOKTETA_FOUND TRUE )
++    endif( LIBOKTETA0_NORMAL_INCLUDE_DIR AND LIBOKTETA0_CAMELCASE_INCLUDE_DIR AND
++           LIBOKTETACORE0_LIBRARY AND LIBOKTETAGUI0_LIBRARY )
++
++    if( LIBOKTETA_FOUND )
++        set( LIBOKTETA_VERSION 0 )
++        set( LIBOKTETA_INCLUDE_DIRS
++            ${LIBOKTETA0_NORMAL_INCLUDE_DIR}
++            ${LIBOKTETA0_CAMELCASE_INCLUDE_DIR}
++        )
++        set( LIBOKTETA_LIBRARIES
++            ${LIBOKTETACORE0_LIBRARY}
++            ${LIBOKTETAGUI0_LIBRARY}
++        )
++    endif( LIBOKTETA_FOUND )
++endif( LIBOKTETA_FIND_VERSION EQUAL 0 )
+ 
+ 
+ if( LIBOKTETA_FOUND )
+-   if( NOT Okteta_FIND_QUIETLY )
+-      message( STATUS "Found Okteta libraries: ${LIBOKTETA_LIBRARIES}" )
+-   endif( NOT Okteta_FIND_QUIETLY )
++    if( NOT Okteta_FIND_QUIETLY )
++        message( STATUS "Found Okteta libraries v${LIBOKTETA_VERSION}: ${LIBOKTETA_LIBRARIES}" )
++    endif( NOT Okteta_FIND_QUIETLY )
+ else( LIBOKTETA_FOUND )
+-   if( LibOkteta_FIND_REQUIRED )
+-      message( FATAL_ERROR "Could not find Okteta libraries" )
+-   endif( LibOkteta_FIND_REQUIRED )
++    if( LibOkteta_FIND_REQUIRED )
++        message( FATAL_ERROR "Could not find Okteta libraries" )
++    endif( LibOkteta_FIND_REQUIRED )
+ endif( LIBOKTETA_FOUND )
+ 
+-mark_as_advanced( LIBOKTETA_INCLUDE_DIR LIBOKTETA_LIBRARIES )
++mark_as_advanced(
++    LIBOKTETA_INCLUDE_DIRS
++    LIBOKTETA_LIBRARIES
++    LIBOKTETA_VERSION
++)
+diff -Nur kdevelop-4.2.3/cmake/modules/FindLibOktetaKasten.cmake kdevelop-4.2.3-okteta08/cmake/modules/FindLibOktetaKasten.cmake
+--- kdevelop-4.2.3/cmake/modules/FindLibOktetaKasten.cmake	2011-06-24 21:04:01.000000000 +0200
++++ kdevelop-4.2.3-okteta08/cmake/modules/FindLibOktetaKasten.cmake	2011-12-24 01:04:52.000000000 +0100
+@@ -1,73 +1,141 @@
+-# - Find Kasten library
++# - Find Okteta Kasten libraries, v0 or v1
+ #
+ # This module defines
+-#  LIBOKTETAKASTEN_FOUND - whether the libkasten libraries were found
+-#  LIBOKTETAKASTEN_LIBRARIES - the libkasten libraries
+-#  LIBOKTETAKASTEN_INCLUDE_DIR - the include path of the libkasten libraries
++#  LIBOKTETAKASTEN_FOUND - whether the Okteta Kasten libraries were found
++#  LIBOKTETAKASTEN_VERSION - version of the Okteta Kasten libraries found
++#  LIBOKTETAKASTEN_LIBRARIES - the Okteta Kasten libraries
++#  LIBOKTETAKASTEN_INCLUDE_DIRS - the include paths of the Okteta Kasten libraries
+ 
+ 
+-if( LIBOKTETAKASTEN_INCLUDE_DIR AND LIBOKTETAKASTEN_LIBRARIES )
++if( LIBOKTETAKASTEN_INCLUDE_DIRS AND LIBOKTETAKASTEN_LIBRARIES AND LIBOKTETAKASTEN_VERSION )
+     # Already in cache, be silent
+     set( OktetaKasten_FIND_QUIETLY TRUE )
+-endif( LIBOKTETAKASTEN_INCLUDE_DIR AND LIBOKTETAKASTEN_LIBRARIES )
++endif( LIBOKTETAKASTEN_INCLUDE_DIRS AND LIBOKTETAKASTEN_LIBRARIES AND LIBOKTETAKASTEN_VERSION )
+ 
+ 
+-find_library( LIBOKTETAKASTENCORE_LIBRARY
+-  NAMES
+-  oktetakastencore
+-  HINTS
+-  ${LIB_INSTALL_DIR}
+-  ${KDE4_LIB_DIR}
++# First search version 1
++find_library( LIBOKTETA1KASTEN1CORE_LIBRARY
++    NAMES
++    kasten1okteta1core
++    HINTS
++    ${LIB_INSTALL_DIR}
++    ${KDE4_LIB_DIR}
+ )
+ 
+-find_library( LIBOKTETAKASTENGUI_LIBRARY
+-  NAMES
+-  oktetakastengui
+-  HINTS
+-  ${LIB_INSTALL_DIR}
+-  ${KDE4_LIB_DIR}
++find_library( LIBOKTETA1KASTEN1GUI_LIBRARY
++    NAMES
++    kasten1okteta1gui
++    HINTS
++    ${LIB_INSTALL_DIR}
++    ${KDE4_LIB_DIR}
+ )
+ 
+-find_library( LIBOKTETAKASTENCONTROLLERS_LIBRARY
+-  NAMES
+-  oktetakastencontrollers
+-  HINTS
+-  ${LIB_INSTALL_DIR}
+-  ${KDE4_LIB_DIR}
+-)
+-
+-set( LIBOKTETAKASTEN_LIBRARIES
+-  ${LIBOKTETAKASTENCORE_LIBRARY}
+-  ${LIBOKTETAKASTENGUI_LIBRARY}
+-  ${LIBOKTETAKASTENCONTROLLERS_LIBRARY}
++find_library( LIBOKTETA1KASTEN1CONTROLLERS_LIBRARY
++    NAMES
++    kasten1okteta1controllers
++    HINTS
++    ${LIB_INSTALL_DIR}
++    ${KDE4_LIB_DIR}
+ )
+ 
+ 
+ find_path( LIBOKTETAKASTEN_INCLUDE_DIR
+-  NAMES
+-  bytearraydocument.h
+-  PATH_SUFFIXES
+-  kasten
+-  HINTS
+-  ${INCLUDE_INSTALL_DIR}
+-  ${KDE4_INCLUDE_DIR}
++    NAMES
++    bytearraydocument.h
++    PATH_SUFFIXES
++    kasten1/okteta1
++    HINTS
++    ${INCLUDE_INSTALL_DIR}
++    ${KDE4_INCLUDE_DIR}
+ )
+ 
+-if( LIBOKTETAKASTEN_INCLUDE_DIR AND LIBOKTETAKASTEN_LIBRARIES )
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdevelop/kde4-kdevelop.spec?r1=1.44&r2=1.45&f=u



More information about the pld-cvs-commit mailing list