Author: tgoettlicher Date: Wed May 16 11:00:10 2012 New Revision: 68168 URL: http://svn.opensuse.org/viewcvs/yast?rev=68168&view=rev Log: merged Björn Esser's changes Modified: trunk/libyui/cmake/FindLibyui.cmake trunk/libyui/libyui.pc.in trunk/libyui/libyui.spec.in Modified: trunk/libyui/cmake/FindLibyui.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/cmake/FindLibyui.cmake?rev=68168&r1=68167&r2=68168&view=diff ============================================================================== --- trunk/libyui/cmake/FindLibyui.cmake (original) +++ trunk/libyui/cmake/FindLibyui.cmake Wed May 16 11:00:10 2012 @@ -17,10 +17,10 @@ IF ( DEFINED LIB ) SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB}" ) ELSE ( DEFINED LIB ) - 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" ) +# 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}" ) ENDIF ( DEFINED LIB ) MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" ) Modified: trunk/libyui/libyui.pc.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/libyui.pc.in?rev=68168&r1=68167&r2=68168&view=diff ============================================================================== --- trunk/libyui/libyui.pc.in (original) +++ trunk/libyui/libyui.pc.in Wed May 16 11:00:10 2012 @@ -14,9 +14,8 @@ infodir=@infodir@ mandir=@mandir@ -yast2dir=@yast2dir@ -ybindir=@ybindir@ - Name: @RPMNAME@ Version: @VERSION@ -Description: YaST2 package "@RPMNAME@" +Description: @RPMNAME@ - GUI-abstraction library +Libs: -lyui +Cflags: -I${includedir} Modified: trunk/libyui/libyui.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/libyui.spec.in?rev=68168&r1=68167&r2=68168&view=diff ============================================================================== --- trunk/libyui/libyui.spec.in (original) +++ trunk/libyui/libyui.spec.in Wed May 16 11:00:10 2012 @@ -1,14 +1,17 @@ -@HEADER-COMMENT@ - - -@HEADER@ -Group: System/Libraries -License: GPL-2.0 -Source1: libyui-rpmlintrc +# +# spec file for package libyui (Version @VERSION@) +# +# norootforbuild + +Name: libyui +Version: @VERSION@ +Release: 0 +License: GPL v2 +Group: System/Libraries +Source: libyui-%{version}.tar.bz2 +Source1: libyui-rpmlintrc BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: yast2-devtools # autodocs + docbook docs BuildRequires: doxygen @@ -19,60 +22,77 @@ # libyui ImplPtr BuildRequires: boost-devel -Summary: YUI - User Interface Engine -Provides: %{_libdir}/libyui.so.4.0.0 +Provides: yast2-libyui = %{version} +Obsoletes: yast2-libyui < %{version} + +Summary: YaST2 - User Interface Engine %description -This is the YUI user interface engine that provides the abstraction -from graphical user interfaces (Qt, Gtk) and text based user interfaces +This is the 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 YUI for generic (C++) applications. -This package has very few dependencies. - -@HEADER-DEVEL@ -Summary: YUI - User Interface Engine +Originally developed for YaST, it can now be used independently of +YaST for generic (C++) applications. This package has very few +dependencies. + +%package devel +Summary: YaST2 - User Interface Engine header filews +Group: Development/Languages/C and C++ Requires: glibc-devel Requires: libstdc++-devel Requires: boost-devel %description devel -This is the development package for the YUI user interface engine +This is the development package for libyui 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 YaST for generic (C++) applications. This package has very few dependencies. -@PREP@ +%prep +%setup -n %{name}-%{version} -@BUILD@ +%build -@INSTALL@ -mkdir -p "$RPM_BUILD_ROOT"@logdir@ +export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + +./bootstrap.sh +%{?suse_update_config:%{suse_update_config -f}} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} +make %{?jobs:-j%jobs} + +%install +make install DESTDIR="$RPM_BUILD_ROOT" + +mkdir -p "$RPM_BUILD_ROOT"%{_vardir}/log/YaST2 %perl_process_packlist -@CLEAN@ +%clean +rm -rf "$RPM_BUILD_ROOT" -%post -%run_ldconfig +%post -p /sbin/ldconfig -%postun -%run_ldconfig +%postun -p /sbin/ldconfig %files %defattr(-,root,root) %{_libdir}/lib*.so.* +%dir %doc %{_prefix}/share/doc/packages/libyui/ %files devel %defattr(-,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la -${prefix}/include -@pkgconfigdir@/@RPMNAME@.pc +%{_prefix}/include/yui +%{_libdir}/pkgconfig/libyui.pc %dir %{_datadir}/cmake %dir %{_datadir}/cmake/Modules %{_datadir}/cmake/Modules/* -%doc @docdir@ +%doc %{_prefix}/share/doc/packages/libyui/examples + +%changelog -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org