Author: tgoettlicher Date: Tue May 15 16:00:19 2012 New Revision: 68160 URL: http://svn.opensuse.org/viewcvs/yast?rev=68160&view=rev Log: renamed package Added: trunk/qt/libyui-qt.spec.in - copied, changed from r68159, trunk/qt/yast2-qt.spec.in Removed: trunk/qt/yast2-qt.spec.in Modified: trunk/qt/CMakeLists.txt trunk/qt/src/CMakeLists.txt Modified: trunk/qt/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/CMakeLists.txt?rev=68160&r1=68159&r2=68160&view=diff ============================================================================== --- trunk/qt/CMakeLists.txt (original) +++ trunk/qt/CMakeLists.txt Tue May 15 16:00:19 2012 @@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.4) PROJECT(yast2-qt) +SET( CMAKE_INSTALL_PREFIX "/usr" ) +SET( LIBYUI_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/yui" ) SET( CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/share/cmake/Modules" ${CMAKE_MODULE_PATH} ) SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Woverloaded-virtual -Wno-deprecated" ) @@ -13,7 +15,6 @@ FIND_PACKAGE(Qt4 REQUIRED) FIND_PACKAGE(Libyui REQUIRED) SET(CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/share/YaST2/data/devtools/cmake/modules" ${CMAKE_MODULE_PATH}) -INCLUDE(YastCommon) SET(YAST_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/YaST2) SET(Y2QT_ICONDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/theme/current) Copied: trunk/qt/libyui-qt.spec.in (from r68159, trunk/qt/yast2-qt.spec.in) URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/libyui-qt.spec.in?p2=trunk/qt/libyui-qt.spec.in&p1=trunk/qt/yast2-qt.spec.in&r1=68159&r2=68160&rev=68160&view=diff ============================================================================== --- trunk/qt/yast2-qt.spec.in (original) +++ trunk/qt/libyui-qt.spec.in Tue May 15 16:00:19 2012 @@ -2,7 +2,7 @@ @HEADER@ -Group: System/YaST +Group: System/Libraries License: GPL-2.0 BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen @@ -22,8 +22,8 @@ Summary: YaST2 - Graphical User Interface BuildRequires: yast2-devtools >= 2.16.3 #YIconLoader -BuildRequires: yast2-libyui-devel >= 2.21.1 -Requires: yast2-libyui >= 2.21.1 +BuildRequires: libyui-devel >= 2.21.4 +Requires: libyui >= 2.21.4 Requires: yast2_theme >= 2.16.1 Requires: yast2-branding Requires: yast2-qt-branding @@ -34,17 +34,17 @@ Recommends: xorg-x11-fonts %description -One of several user interfaces available for YaST2, based on Qt and the +One of several user interfaces available for YUI, based on Qt and the X Window System. %package devel -Summary: Development package for graphical YaST2 user interfaces +Summary: Development package for graphical YUI user interfaces Group: Development/Libraries/YaST -Requires: yast2-qt = %{version} -Requires: yast2-libyui-devel +Requires: libyui-qt = %{version} +Requires: libyui-devel %description devel -Shared libs for the YaST2 Qt user interface. +Shared libs for the YUI Qt user interface. This is not necessary for developing YaST2 scripts (YCP) -- the YaST2 main program (y2bignfat) will load those components on demand as @@ -82,8 +82,8 @@ %files %defattr (-, root, root) %dir %_libdir/YaST2 -%_libdir/YaST2/plugin/ -%_prefix/share/YaST2/data/lang_fonts +%_libdir/yui/plugin/ +%_prefix/share/yui/data/lang_fonts %doc COPYING.GPL2 %files devel Modified: trunk/qt/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/CMakeLists.txt?rev=68160&r1=68159&r2=68160&view=diff ============================================================================== --- trunk/qt/src/CMakeLists.txt (original) +++ trunk/qt/src/CMakeLists.txt Tue May 15 16:00:19 2012 @@ -145,7 +145,7 @@ QY2StyleEditor.h ) -INSTALL( FILES ${yast_qt_HEADERS} DESTINATION "${LIBYUI_INCLUDE_DIR}/../yast2-qt" ) +INSTALL( FILES ${yast_qt_HEADERS} DESTINATION "${LIBYUI_INCLUDE_DIR}/../yui-qt" ) QT4_AUTOMOC(${qt_yast_plugin_SRCS}) @@ -166,7 +166,7 @@ INSTALL(TARGETS py2qt LIBRARY DESTINATION ${UI_PLUGIN_DIR} ) -INSTALL(FILES lang_fonts DESTINATION ${CMAKE_INSTALL_PREFIX}/share/YaST2/data ) +INSTALL(FILES lang_fonts DESTINATION ${CMAKE_INSTALL_PREFIX}/share/yui/data ) #SET_TARGET_PROPERTIES( y2lang_qt PROPERTIES PREFIX "" ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org