Author: coolo Date: Wed Feb 27 11:02:33 2008 New Revision: 45063 URL: http://svn.opensuse.org/viewcvs/yast?rev=45063&view=rev Log: next morning, next package Modified: trunk/qt-pkg/CMakeLists.txt trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/CMakeLists.txt trunk/qt-pkg/yast2-qt-pkg.spec.in Modified: trunk/qt-pkg/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/CMakeLists.txt?rev=45063&r1=45062&r2=45063&view=diff ============================================================================== --- trunk/qt-pkg/CMakeLists.txt (original) +++ trunk/qt-pkg/CMakeLists.txt Wed Feb 27 11:02:33 2008 @@ -8,7 +8,9 @@ SET( RPMNAME "yast2-qt-pkg" ) FIND_PACKAGE(Qt4 REQUIRED) -FIND_PACKAGE(Yast REQUIRED) +FIND_PACKAGE(Yast) +FIND_PACKAGE(Libyui REQUIRED) +FIND_PACKAGE(Zypp REQUIRED) INCLUDE(YastCommon) SET(Y2QT_ICONDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/theme/current) Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.changes?rev=45063&r1=45062&r2=45063&view=diff ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Wed Feb 27 11:02:33 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 27 11:02:40 CET 2008 - coolo@suse.de + +- fix build without ycp + +------------------------------------------------------------------- Mon Feb 25 16:05:06 CET 2008 - sh@suse.de - Added copy of GPL licensing terms (COPYING) (bnc #362646) Modified: trunk/qt-pkg/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/CMakeLists.txt?rev=45063&r1=45062&r2=45063&view=diff ============================================================================== --- trunk/qt-pkg/src/CMakeLists.txt (original) +++ trunk/qt-pkg/src/CMakeLists.txt Wed Feb 27 11:02:33 2008 @@ -2,10 +2,6 @@ # package selector ################################################################ -FIND_PACKAGE(Zypp REQUIRED) - -INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${YAST_INCLUDE_DIR}/yast2-qt ${ZYPP_INCLUDE_DIR}) - ADD_DEFINITIONS( -DY2LOG=\\\"QT4\\\" ${QT_DEFINITIONS} -DICONDIR=\\"${Y2QT_ICONDIR}\\" @@ -60,21 +56,19 @@ QT4_AUTOMOC(${qt_yast_pkg_plugin_SRCS}) INCLUDE_DIRECTORIES( ${QT_INCLUDES} ) -INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR} ) -INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR}/yui ) +INCLUDE_DIRECTORIES( ${LIBYUI_INCLUDE_DIR} ) +INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ) +INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) +INCLUDE_DIRECTORIES( ${CMAKE_INSTALL_PREFIX}/include/YaST2/yast2-qt ) +INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} ) ADD_LIBRARY( py2qt_pkg SHARED ${qt_yast_pkg_plugin_SRCS}) -TARGET_LINK_LIBRARIES( py2qt_pkg py2qt ) -TARGET_LINK_LIBRARIES( py2qt_pkg ${YAST_LIBRARY} ) -TARGET_LINK_LIBRARIES( py2qt_pkg ${YAST_YCP_LIBRARY} ) -TARGET_LINK_LIBRARIES( py2qt_pkg ${YAST_YUI_LIBRARY} ) -TARGET_LINK_LIBRARIES( py2qt_pkg ${YAST_PLUGIN_WFM_LIBRARY} ) +TARGET_LINK_LIBRARIES( py2qt_pkg ${UI_PLUGIN_DIR}/libpy2qt.so ) +TARGET_LINK_LIBRARIES( py2qt_pkg ${LIBYUI_LIBRARY} ) +TARGET_LINK_LIBRARIES( py2qt_pkg ${ZYPP_LIBRARY} ) TARGET_LINK_LIBRARIES( py2qt_pkg ${QT_QTCORE_LIBRARY} ) TARGET_LINK_LIBRARIES( py2qt_pkg ${QT_QTGUI_LIBRARY} ) -TARGET_LINK_LIBRARIES( py2qt_pkg ${YAST_PLUGIN_UI_LIBRARY} ) -TARGET_LINK_LIBRARIES( py2qt_pkg py2qt ) -TARGET_LINK_LIBRARIES( py2qt_pkg ${ZYPP_LIBRARY} ) SET_TARGET_PROPERTIES( py2qt_pkg PROPERTIES SOVERSION 2 ) -SET_TARGET_PROPERTIES( py2qt_pkg PROPERTIES LINK_FLAGS "-Wl,--no-undefined -Wl,-rpath -Wl,${YAST_PLUGIN_DIR}" ) +SET_TARGET_PROPERTIES( py2qt_pkg PROPERTIES LINK_FLAGS "-Wl,--no-undefined -Wl,-rpath -Wl,${UI_PLUGIN_DIR}" ) -INSTALL(TARGETS py2qt_pkg LIBRARY DESTINATION ${YAST_PLUGIN_DIR} ) +INSTALL(TARGETS py2qt_pkg LIBRARY DESTINATION ${UI_PLUGIN_DIR} ) Modified: trunk/qt-pkg/yast2-qt-pkg.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/yast2-qt-pkg.spec.in?rev=45063&r1=45062&r2=45063&view=diff ============================================================================== --- trunk/qt-pkg/yast2-qt-pkg.spec.in (original) +++ trunk/qt-pkg/yast2-qt-pkg.spec.in Wed Feb 27 11:02:33 2008 @@ -7,6 +7,7 @@ Summary: - BuildRequires: yast2-devtools >= 2.16.3 +BuildRequires: yast2-libyui-devel Requires: yast2-qt >= 2.16.25 BuildRequires: yast2-qt-devel >= 2.16.25 BuildRequires: libzypp-devel >= 4.2.4 @@ -45,6 +46,7 @@ %files %defattr (-, root, root) +%doc COPYING %_libdir/YaST2/plugin/libpy2qt_pkg.so.* %_libdir/YaST2/plugin/libpy2qt_pkg.so -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org