Author: tgoettlicher Date: Tue May 15 15:34:35 2012 New Revision: 68157 URL: http://svn.opensuse.org/viewcvs/yast?rev=68157&view=rev Log: remove yast dependency Added: trunk/libyui/libyui.pc.in - copied unchanged from r68155, trunk/libyui/yast2-libyui.pc.in trunk/libyui/libyui.spec.in - copied, changed from r68156, trunk/libyui/yast2-libyui.spec.in Removed: trunk/libyui/yast2-libyui.pc.in trunk/libyui/yast2-libyui.spec.in Modified: trunk/libyui/Makefile.cvs trunk/libyui/cmake/FindLibyui.cmake Modified: trunk/libyui/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/Makefile.cvs?rev=68157&r1=68156&r2=68157&view=diff ============================================================================== --- trunk/libyui/Makefile.cvs (original) +++ trunk/libyui/Makefile.cvs Tue May 15 15:34:35 2012 @@ -2,12 +2,10 @@ # Makefile.cvs # -LIB = $(shell y2tool get-lib) - PREFIX = /usr configure: all - ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) + ./configure --prefix=$(PREFIX) all: y2tool y2autoconf Modified: trunk/libyui/cmake/FindLibyui.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/cmake/FindLibyui.cmake?rev=68157&r1=68156&r2=68157&view=diff ============================================================================== --- trunk/libyui/cmake/FindLibyui.cmake (original) +++ trunk/libyui/cmake/FindLibyui.cmake Tue May 15 15:34:35 2012 @@ -20,22 +20,22 @@ IF (CMAKE_SIZEOF_VOID_P MATCHES "8") SET( LIB_SUFFIX "64" ) ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8") - SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" ) + SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" ) ENDIF ( DEFINED LIB ) MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" ) -SET(UI_PLUGIN_DIR ${LIB_INSTALL_DIR}/YaST2/plugin) +SET(UI_PLUGIN_DIR ${LIB_INSTALL_DIR}/yui) FIND_PATH(LIBYUI_INCLUDE_DIR YWidget.h - ${CMAKE_INSTALL_PREFIX}/include/YaST2/yui - /usr/include/YaST2/yui - /usr/local/include/YaST2/yui + ${CMAKE_INSTALL_PREFIX}/include/yui + /usr/include/yui + /usr/local/include/yui ) FIND_LIBRARY(LIBYUI_LIBRARY NAMES yui PATHS ${LIB_INSTALL_DIR} - /usr/local/lib + /usr/lib ) if(LIBYUI_INCLUDE_DIR AND LIBYUI_LIBRARY AND UI_PLUGIN_DIR) Copied: trunk/libyui/libyui.spec.in (from r68156, trunk/libyui/yast2-libyui.spec.in) URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/libyui.spec.in?p2=trunk/libyui/libyui.spec.in&p1=trunk/libyui/yast2-libyui.spec.in&r1=68156&r2=68157&rev=68157&view=diff ============================================================================== --- trunk/libyui/yast2-libyui.spec.in (original) +++ trunk/libyui/libyui.spec.in Tue May 15 15:34:35 2012 @@ -2,9 +2,9 @@ @HEADER@ -Group: System/YaST -License: GPL-2.0+ -Source1: yast2-libyui-rpmlintrc +Group: System/Libraries +License: GPL-2.0 +Source1: libyui-rpmlintrc BuildRequires: gcc-c++ BuildRequires: libtool @@ -19,26 +19,26 @@ # libyui ImplPtr BuildRequires: boost-devel -Summary: YaST2 - User Interface Engine +Summary: YUI - User Interface Engine Provides: %{_libdir}/libyui.so.4.0.0 %description -This is the YaST2 user interface engine that provides the abstraction +This is the YUI user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses). -This can be used independently of YaST2 for generic (C++) applications. +This can be used independently of YUI for generic (C++) applications. This package has very few dependencies. @HEADER-DEVEL@ -Summary: YaST2 - User Interface Engine +Summary: YUI - User Interface Engine Requires: glibc-devel Requires: libstdc++-devel Requires: boost-devel %description devel -This is the development package for the YaST2 user interface engine +This is the development package for the YUI user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses). -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org