Hello community, here is the log from the commit of package libyui for openSUSE:Factory checked in at 2013-05-13 20:22:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui (Old) and /work/SRC/openSUSE:Factory/.libyui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui/libyui.changes 2013-02-04 21:13:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libyui.new/libyui.changes 2013-05-13 20:22:34.000000000 +0200 @@ -1,0 +2,43 @@ +Fri May 10 14:00:00 UTC 2013 - [email protected] + +- checking prefix in -doc pkg is obsolete +- use bootstrap.sh for legacy in -doc pkg here, too + +------------------------------------------------------------------- +Fri May 10 10:40:00 UTC 2013 - [email protected] + +- use a common toplevel CMakeLists.txt +- fix building *-doc pkgs +- Version 3.0.4 + +------------------------------------------------------------------- +Mon May 6 13:30:00 UTC 2013 - [email protected] + +- fix build issues with ncurses and qt +- Version 3.0.3 + +------------------------------------------------------------------- +Mon May 6 11:09:31 UTC 2013 - [email protected] + +- use SONAME from libyui instead of VERSION.cmake if plugin +- bumped up patch-version to 3.0.2 +- disabled auto-gen of docs + INSTALL_DOCS=ON will no longer auto-gen the docs + added a warning to run "make docs" before "make install" +- add DOC_SUBDIR to CMake-Vars + some distributions prefer %{name}-%{version} over + %{name}-%{soname_major} as doc-subdir. + +------------------------------------------------------------------- +Tue Apr 30 09:21:48 CEST 2013 - [email protected] + +- Increased version because of changed function names +- Version 3.0.1 + +------------------------------------------------------------------- +Fri Feb 8 15:22:03 CET 2013 - [email protected] + +- Code clean-up: removed java-like get-prefix +- Version 2.42.7 + +------------------------------------------------------------------- Old: ---- libyui-2.42.6.tar.bz2 New: ---- libyui-3.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-doc.spec ++++++ --- /var/tmp/diff_new_pack.qMS3hM/_old 2013-05-13 20:22:36.000000000 +0200 +++ /var/tmp/diff_new_pack.qMS3hM/_new 2013-05-13 20:22:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libyui (Version 2.42.6) +# spec file for package libyui (Version 3.0.4) # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,7 +16,7 @@ # Name: libyui-doc -Version: 2.42.6 +Version: 3.0.4 Release: 0 License: LGPL-2.1 or LGPL-3.0 Source: libyui-%{version}.tar.bz2 @@ -30,7 +30,7 @@ BuildRequires: texlive-latex BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ -BuildRequires: libyui-devel +BuildRequires: libyui-devel >= 3.0.4 URL: http://github.com/libyui/ @@ -59,6 +59,8 @@ export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +./bootstrap.sh %{_prefix} + mkdir build cd build cmake .. \ @@ -72,7 +74,7 @@ cd build make install DESTDIR="$RPM_BUILD_ROOT" -%fdupes -s $RPM_BUILD_ROOT/%_docdir/libyui4 +%fdupes -s $RPM_BUILD_ROOT/%_docdir/libyui5 %clean @@ -81,6 +83,6 @@ %files %defattr(-,root,root) -%doc %{_docdir}/libyui4 +%doc %{_docdir}/libyui5 %changelog ++++++ libyui.spec ++++++ --- /var/tmp/diff_new_pack.qMS3hM/_old 2013-05-13 20:22:36.000000000 +0200 +++ /var/tmp/diff_new_pack.qMS3hM/_new 2013-05-13 20:22:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libyui (Version 2.42.6) +# spec file for package libyui (Version 3.0.4) # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ # norootforbuild Name: libyui -Version: 2.42.6 +Version: 3.0.4 Release: 0 License: LGPL-2.1 or LGPL-3.0 Source: libyui-%{version}.tar.bz2 @@ -43,7 +43,7 @@ YaST for generic (C++) applications. This package has very few dependencies. -%package -n libyui4 +%package -n libyui5 Group: System/Libraries @@ -53,7 +53,7 @@ URL: http://github.com/libyui/ Summary: Libyui - GUI-abstraction library -%description -n libyui4 +%description -n libyui5 This is the user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses). @@ -67,7 +67,7 @@ Group: Development/Languages/C and C++ -Requires: libyui4 = %{version} +Requires: libyui5 = %{version} Requires: glibc-devel Requires: libstdc++-devel Requires: boost-devel @@ -94,6 +94,8 @@ %build +./bootstrap.sh + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" @@ -120,33 +122,33 @@ %install cd build make install DESTDIR="$RPM_BUILD_ROOT" -install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/libyui4/ +install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/libyui5/ install -m0755 -d $RPM_BUILD_ROOT/%{_libdir}/yui -install -m0644 ../COPYING* $RPM_BUILD_ROOT/%{_docdir}/libyui4/ +install -m0644 ../COPYING* $RPM_BUILD_ROOT/%{_docdir}/libyui5/ %clean rm -rf "$RPM_BUILD_ROOT" -%post -n libyui4 -p /sbin/ldconfig +%post -n libyui5 -p /sbin/ldconfig -%postun -n libyui4 -p /sbin/ldconfig +%postun -n libyui5 -p /sbin/ldconfig -%files -n libyui4 +%files -n libyui5 %defattr(-,root,root) %dir %{_libdir}/yui %dir %{_datadir}/libyui %{_libdir}/lib*.so.* -%doc %dir %{_docdir}/libyui4 -%doc %{_docdir}/libyui4/COPYING* +%doc %dir %{_docdir}/libyui5 +%doc %{_docdir}/libyui5/COPYING* %files devel %defattr(-,root,root) -%dir %{_docdir}/libyui4 +%dir %{_docdir}/libyui5 %{_libdir}/lib*.so %{_prefix}/include/yui %{_libdir}/pkgconfig/libyui.pc %{_libdir}/cmake/libyui %{_datadir}/libyui/buildtools -%doc %{_docdir}/libyui4/examples +%doc %{_docdir}/libyui5/examples %changelog ++++++ libyui-2.42.6.tar.bz2 -> libyui-3.0.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.6/.gitignore new/libyui-3.0.4/.gitignore --- old/libyui-2.42.6/.gitignore 2013-02-04 16:15:57.000000000 +0100 +++ new/libyui-3.0.4/.gitignore 2013-05-10 16:52:55.000000000 +0200 @@ -39,6 +39,7 @@ # CMake CMakeCache.txt CMakeFiles +CMakeLists.txt Makefile cmake_install.cmake install_manifest.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.6/CMakeLists.txt new/libyui-3.0.4/CMakeLists.txt --- old/libyui-2.42.6/CMakeLists.txt 2013-02-04 16:15:57.000000000 +0100 +++ new/libyui-3.0.4/CMakeLists.txt 2013-05-13 20:22:36.000000000 +0200 @@ -1,68 +1 @@ -CMAKE_MINIMUM_REQUIRED( VERSION 2.8 ) - -INCLUDE( "${CMAKE_SOURCE_DIR}/PROJECTINFO.cmake" ) - -SET( BUILDTOOLS_DIR "buildtools/" ) - -IF( NOT PREFIX ) - SET( PREFIX "/usr" ) -ENDIF( NOT PREFIX ) - -IF( PLUGINNAME ) - SET( BUILDTOOLS_DIR "${PREFIX}/share/lib${BASELIB}/${BUILDTOOLS_DIR}" ) -ELSE( PLUGINNAME ) - SET( BUILDTOOLS_DIR "${CMAKE_SOURCE_DIR}/${BUILDTOOLS_DIR}" ) -ENDIF( PLUGINNAME ) - -SET( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules" "${BUILDTOOLS_DIR}" "${CMAKE_MODULE_PATH}" ) - -INCLUDE( LibyuiCommon ) - -#if you need to get a git versioned package you can use cmake -DGIT_VERSION=on -if (GIT_VERSION) - FIND_PACKAGE(Git) - if(GIT_FOUND) - exec_program( - "${GIT_EXECUTABLE}" - ${CMAKE_CURRENT_SOURCE_DIR} - ARGS "describe" - OUTPUT_VARIABLE GIT_VERSION ) - - string( REGEX MATCH "-g[0-9|a-f]+$" VERSION_SHA1 ${GIT_VERSION} ) - string( REGEX REPLACE "[g]" "" VERSION_SHA1 ${VERSION_SHA1} ) - set (GIT_SHA1_VERSION "${VERSION_SHA1}") - else() - message (STATUS "GIT_VERSION option needs git installed") - set (GIT_SHA1_VERSION "") - endif() -else() - set (GIT_SHA1_VERSION "") -endif() - -INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/VERSION.cmake" ) - -INITIALIZE() - -PROJECT( "${PROJECTNAME}" ) -ADD_DEFINITIONS(-DVERSION="${VERSION}") - -INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/SOURCECONF.cmake" ) - -SET_OPTIONS() -SET_ENVIRONMENT() -SET_BUILD_FLAGS() -SET_AUTODOCS() - -IF( NOT DOCS_ONLY ) - FIND_LIB_DEPENDENCIES() - FIND_LINKER_LIBS() - CHECK_PREFIX() - SET_SUBDIRS() - GEN_EXPORTS() - GEN_FILES() - PREP_SPEC_FILES() - SET_INSTALL_TARGET() - PREP_OBS_TARBALL() -ENDIF( NOT DOCS_ONLY ) - -SUMMARY() +symbolic link to ./buildtools/CMakeLists.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.6/ChangeLog new/libyui-3.0.4/ChangeLog --- old/libyui-2.42.6/ChangeLog 2013-02-04 16:15:57.000000000 +0100 +++ new/libyui-3.0.4/ChangeLog 2013-05-10 16:52:55.000000000 +0200 @@ -1,4 +1,47 @@ ------------------------------------------------------------------- +Fri May 10 14:00:00 UTC 2013 - [email protected] + +- checking prefix in -doc pkg is obsolete +- use bootstrap.sh for legacy in -doc pkg here, too + +------------------------------------------------------------------- +Fri May 10 10:40:00 UTC 2013 - [email protected] + +- use a common toplevel CMakeLists.txt +- fix building *-doc pkgs +- Version 3.0.4 + +------------------------------------------------------------------- +Mon May 6 13:30:00 UTC 2013 - [email protected] + +- fix build issues with ncurses and qt +- Version 3.0.3 + +------------------------------------------------------------------- +Mon May 6 11:09:31 UTC 2013 - [email protected] + +- use SONAME from libyui instead of VERSION.cmake if plugin +- bumped up patch-version to 3.0.2 +- disabled auto-gen of docs + INSTALL_DOCS=ON will no longer auto-gen the docs + added a warning to run "make docs" before "make install" +- add DOC_SUBDIR to CMake-Vars + some distributions prefer %{name}-%{version} over + %{name}-%{soname_major} as doc-subdir. + +------------------------------------------------------------------- +Tue Apr 30 09:21:48 CEST 2013 - [email protected] + +- Increased version because of changed function names +- Version 3.0.1 + +------------------------------------------------------------------- +Fri Feb 8 15:22:03 CET 2013 - [email protected] + +- Code clean-up: removed java-like get-prefix +- Version 2.42.7 + +------------------------------------------------------------------- Mon Feb 4 15:46:13 CET 2013 - [email protected] - Added setLocaleDir(), getLocaleDir() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.6/Makefile.cvs new/libyui-3.0.4/Makefile.cvs --- old/libyui-2.42.6/Makefile.cvs 2013-02-04 16:15:57.000000000 +0100 +++ new/libyui-3.0.4/Makefile.cvs 2013-05-10 16:52:55.000000000 +0200 @@ -5,9 +5,11 @@ all: configure configure: clean + ./bootstrap.sh ; \ mkdir build ; \ cd build ; \ - cmake -DCMAKE_BUILD_TYPE=RELEASE .. + cmake .. \ + -DCMAKE_BUILD_TYPE=RELEASE install: configure cd build ; \ @@ -18,4 +20,5 @@ cmake rebuild_cache clean: - rm -rf build + rm -rf build \ + CMakeLists.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.6/VERSION.cmake new/libyui-3.0.4/VERSION.cmake --- old/libyui-2.42.6/VERSION.cmake 2013-02-04 16:15:57.000000000 +0100 +++ new/libyui-3.0.4/VERSION.cmake 2013-05-10 16:52:55.000000000 +0200 @@ -1,11 +1,11 @@ -SET( VERSION_MAJOR "2" ) -SET( VERSION_MINOR "42" ) -SET( VERSION_PATCH "6" ) +SET( VERSION_MAJOR "3") +SET( VERSION_MINOR "0" ) +SET( VERSION_PATCH "4" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is need for the libyui core, ONLY. ##### These will be overridden from exports in LibyuiConfig.cmake -SET( SONAME_MAJOR "4" ) -SET( SONAME_MINOR "1" ) +SET( SONAME_MAJOR "5" ) +SET( SONAME_MINOR "0" ) SET( SONAME_PATCH "0" ) SET( SONAME "${SONAME_MAJOR}.${SONAME_MINOR}.${SONAME_PATCH}" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.6/boost.1.53.patch new/libyui-3.0.4/boost.1.53.patch --- old/libyui-2.42.6/boost.1.53.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-3.0.4/boost.1.53.patch 2013-05-10 16:52:55.000000000 +0200 @@ -0,0 +1,36 @@ +diff --git a/src/ImplPtr.h b/src/ImplPtr.h +index be1cea9..9df2e54 100644 +--- a/src/ImplPtr.h ++++ b/src/ImplPtr.h +@@ -24,6 +24,9 @@ + + #ifndef ImplPtr_h + #define ImplPtr_h ++//#include <boost/config/compiler/gcc.hpp> ++//#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS ++ + + #include <boost/noncopyable.hpp> + #include <boost/scoped_ptr.hpp> +@@ -41,7 +44,9 @@ + template<class _Impl> + class ImplPtr : private boost::noncopyable + { ++#if defined( BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS ) || defined( BOOST_NO_CXX11_NULLPTR ) + typedef typename boost::scoped_ptr<_Impl>::unspecified_bool_type unspecified_bool_type; ++#endif + + public: + typedef _Impl element_type; +@@ -55,7 +60,11 @@ public: + void swap( ImplPtr rhs ) { _impl.swap( rhs._impl ); } + + public: ++#if defined( BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS ) || defined( BOOST_NO_CXX11_NULLPTR ) + operator unspecified_bool_type() const { return _impl; } ++#else ++ explicit operator bool () const { return _impl.get() != 0; } ++#endif + + const _Impl & operator*() const { return *_impl; } + const _Impl * operator->() const { return _impl.get(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.6/bootstrap.sh new/libyui-3.0.4/bootstrap.sh --- old/libyui-2.42.6/bootstrap.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-3.0.4/bootstrap.sh 2013-05-10 16:52:55.000000000 +0200 @@ -0,0 +1,9 @@ +#!/bin/sh +set -e + +cmake_common="./buildtools/CMakeLists.common" +cmake_target="./CMakeLists.txt" + +ln -fs "$cmake_common" "$cmake_target" + +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.6/buildtools/CMakeLists.common new/libyui-3.0.4/buildtools/CMakeLists.common --- old/libyui-2.42.6/buildtools/CMakeLists.common 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-3.0.4/buildtools/CMakeLists.common 2013-05-10 16:52:55.000000000 +0200 @@ -0,0 +1,63 @@ +CMAKE_MINIMUM_REQUIRED( VERSION 2.8 ) + +INCLUDE( "${CMAKE_SOURCE_DIR}/PROJECTINFO.cmake" ) + +SET( BUILDTOOLS_DIR "buildtools/" ) + +IF( NOT PREFIX ) + SET( PREFIX "/usr" ) +ENDIF( NOT PREFIX ) + +IF( PLUGINNAME ) + SET( BUILDTOOLS_DIR "${PREFIX}/share/lib${BASELIB}/${BUILDTOOLS_DIR}" ) +ELSE( PLUGINNAME ) + SET( BUILDTOOLS_DIR "${CMAKE_SOURCE_DIR}/${BUILDTOOLS_DIR}" ) +ENDIF( PLUGINNAME ) + +SET( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules" "${BUILDTOOLS_DIR}" "${CMAKE_MODULE_PATH}" ) + +INCLUDE( LibyuiCommon ) + +#if you need to get a git versioned package you can use cmake -DGIT_VERSION=on +SET( GIT_SHA1_VERSION "") + +IF( GIT_VERSION ) + SET_GITVERSION() +ENDIF( GIT_VERSION ) + +INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/VERSION.cmake" ) + +INITIALIZE() + +PROJECT( "${PROJECTNAME}" ) + +ADD_DEFINITIONS(-DVERSION="${VERSION}") + +INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/SOURCECONF.cmake" ) + +SET_OPTIONS() +SET_LIBDIR() + +IF( NOT DOCS_ONLY ) + FIND_LIB_DEPENDENCIES() + FIND_LINKER_LIBS() + CHECK_PREFIX() +ELSE( NOT DOCS_ONLY ) + FIND_PACKAGE( Libyui REQUIRED ) + SET_SONAME() +ENDIF( NOT DOCS_ONLY ) + +SET_ENVIRONMENT() +SET_BUILD_FLAGS() +SET_AUTODOCS() + +IF( NOT DOCS_ONLY ) + SET_SUBDIRS() + GEN_EXPORTS() + GEN_FILES() + PREP_SPEC_FILES() + SET_INSTALL_TARGET() + PREP_OBS_TARBALL() +ENDIF( NOT DOCS_ONLY ) + +SUMMARY() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.6/buildtools/LibyuiCommon.cmake new/libyui-3.0.4/buildtools/LibyuiCommon.cmake --- old/libyui-2.42.6/buildtools/LibyuiCommon.cmake 2013-02-04 16:15:57.000000000 +0100 +++ new/libyui-3.0.4/buildtools/LibyuiCommon.cmake 2013-05-10 16:52:55.000000000 +0200 @@ -3,6 +3,26 @@ ### special. Put in a seperate file ### and include it in CMakeLists.txt +MACRO( SET_GITVERSION ) + + FIND_PACKAGE( Git ) + IF( GIT_FOUND ) + EXEC_PROGRAM( + "${GIT_EXECUTABLE}" + ${CMAKE_CURRENT_SOURCE_DIR} + ARGS "describe" + OUTPUT_VARIABLE GIT_VERSION ) + + STRING( REGEX MATCH "-g[0-9|a-f]+$" VERSION_SHA1 ${GIT_VERSION} ) + STRING( REGEX REPLACE "[g]" "" VERSION_SHA1 ${VERSION_SHA1} ) + SET(GIT_SHA1_VERSION "${VERSION_SHA1}") + ELSE( GIT_FOUND ) + MESSAGE ( STATUS "GIT_VERSION option needs git installed" ) + SET( GIT_SHA1_VERSION "" ) + ENDIF( GIT_FOUND ) + +ENDMACRO ( SET_GITVERSION ) + MACRO( INITIALIZE ) # compute internal library-deps and lib-type SET( PROGSUBDIR_UC "${PROGSUBDIR}" ) @@ -96,7 +116,7 @@ ENDMACRO( SET_BUILD_FLAGS ) -MACRO( SET_ENVIRONMENT ) # setup the environment vars +MACRO( SET_LIBDIR ) IF( NOT LIB_DIR ) IF (CMAKE_SIZEOF_VOID_P MATCHES "8") @@ -108,6 +128,12 @@ STRING( REPLACE "${PREFIX}/" "" LIB_DIR "${LIB_DIR}" ) ENDIF( NOT LIB_DIR ) + SET( CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PREFIX}/${LIB_DIR}" "${PREFIX}/${LIB_DIR}/${BASELIB}" ) + +ENDMACRO( SET_LIBDIR ) + +MACRO( SET_ENVIRONMENT ) # setup the environment vars + IF( NOT INCLUDE_DIR ) SET( INCLUDE_DIR "include") ELSE( NOT INCLUDE_DIR ) @@ -116,7 +142,6 @@ SET( CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH}" "${PREFIX}" ) SET( CMAKE_INSTALL_PREFIX "${PREFIX}" ) - SET( CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PREFIX}/${LIB_DIR}" "${PREFIX}/${LIB_DIR}/${BASELIB}" ) SET( CMAKE_INCLUDE_PATH ${EXTRA_INCLUDES} ${CMAKE_INCLUDE_PATH} ) SET( INSTALL_CMAKE_DIR ${LIB_DIR}/cmake/${PROJECTNAME} CACHE PATH "Installation directory for CMake files" ) SET( INSTALL_PKGCONFIG_DIR ${LIB_DIR}/pkgconfig CACHE PATH "Installation directory for pkgconfig files" ) @@ -143,12 +168,17 @@ SET( THEME_DIR "${FULL_DATA_DIR}/theme" ) IF( NOT DEFINED DOC_DIR ) - SET( DOC_DIR "${DATAROOTDIR}/doc/${PROJECTNAME}${SONAME_MAJOR}" ) + SET( DOC_DIR "${DATAROOTDIR}/doc" ) ELSE( NOT DEFINED DOC_DIR ) STRING( REPLACE "${PREFIX}/" "" DOC_DIR "${DOC_DIR}" ) - SET( DOC_DIR "${DOC_DIR}/${PROJECTNAME}${SONAME_MAJOR}" ) ENDIF( NOT DEFINED DOC_DIR ) + IF( NOT DEFINED DOC_SUBDIR ) + SET( DOC_DIR "${DOC_DIR}/${PROJECTNAME}${SONAME_MAJOR}" ) + ELSE( NOT DEFINED DOC_SUBDIR ) + SET( DOC_DIR "${DOC_DIR}/${DOC_SUBDIR}" ) + ENDIF( NOT DEFINED DOC_SUBDIR ) + SET( INSTALL_DOC_DIR "${DOC_DIR}" ) FOREACH( p "DOC" LIB INCLUDE CMAKE PKGCONFIG BUILDTOOLS ) @@ -160,6 +190,17 @@ ENDMACRO( SET_ENVIRONMENT ) +MACRO( SET_SONAME ) + + IF( PLUGINNAME ) + FOREACH( p "" _MAJOR _MINOR _PATCH ) + STRING(TOUPPER ${BASELIB} baselibUPPER) + SET( SONAME${p} "${LIB${baselibUPPER}_SONAME${p}}") + ENDFOREACH() + ENDIF( PLUGINNAME ) + +ENDMACRO( SET_SONAME ) + MACRO( FIND_LIB_DEPENDENCIES ) # try to find all libs from ${LIB_DEPS} SET( LIB_DEPS "${LIB_DEPS}" "${INTERNAL_DEPS}" ) @@ -171,16 +212,12 @@ ENDFOREACH() - IF( PLUGINNAME ) - FOREACH( p "" _MAJOR _MINOR _PATCH ) - STRING(TOUPPER ${BASELIB} baselibUPPER) - SET( SONAME${p} "${LIB${baselibUPPER}_SONAME${p}}") - ENDFOREACH() - ENDIF( PLUGINNAME ) + SET_SONAME() IF( QT_FOUND ) SET( CMAKE_INCLUDE_PATH ${QT_INCLUDES} ${CMAKE_INCLUDE_PATH} ) - + SET(Y2QT_ICONDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/theme/current) + ADD_DEFINITIONS(-DICONDIR="${Y2QT_ICONDIR}") ENDIF( QT_FOUND ) ENDMACRO( FIND_LIB_DEPENDENCIES ) @@ -490,6 +527,11 @@ MESSAGE( STATUS " Build a static library, too: ${ENABLE_STATIC}" ) MESSAGE( STATUS " Build the examples, too: ${ENABLE_EXAMPLES}" ) MESSAGE( STATUS "" ) + IF( INSTALL_DOCS AND DOXYGEN_FOUND ) + MESSAGE( STATUS "RUN `make docs` BEFORE `make install` !!!" ) + MESSAGE( STATUS "OTHERWISE INSTALL WILL FAIL !!!" ) + MESSAGE( STATUS "" ) + ENDIF( INSTALL_DOCS AND DOXYGEN_FOUND ) MESSAGE( STATUS "********************************************************************************" ) MESSAGE( STATUS "" ) @@ -615,9 +657,9 @@ ENDIF( ENABLE_STATIC AND NOT DISABLE_SHARED ) - IF( INSTALL_DOCS AND DOXYGEN_FOUND ) - ADD_DEPENDENCIES( ${TARGETLIB} docs ) - ENDIF( INSTALL_DOCS AND DOXYGEN_FOUND ) +# IF( INSTALL_DOCS AND DOXYGEN_FOUND ) +# ADD_DEPENDENCIES( ${TARGETLIB} docs ) +# ENDIF( INSTALL_DOCS AND DOXYGEN_FOUND ) ENDMACRO( PROCESS_SOURCES ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.6/buildtools/template-doc.spec.in new/libyui-3.0.4/buildtools/template-doc.spec.in --- old/libyui-2.42.6/buildtools/template-doc.spec.in 2013-02-04 16:15:57.000000000 +0100 +++ new/libyui-3.0.4/buildtools/template-doc.spec.in 2013-05-10 16:52:55.000000000 +0200 @@ -30,7 +30,7 @@ BuildRequires: texlive-latex BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ -BuildRequires: libyui-devel +BuildRequires: libyui-devel >= 3.0.4 @BuildRequires@ URL: @URL@ @@ -53,6 +53,8 @@ export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +./bootstrap.sh %{_prefix} + mkdir build cd build cmake .. \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.6/libyui.spec.in new/libyui-3.0.4/libyui.spec.in --- old/libyui-2.42.6/libyui.spec.in 2013-02-04 16:15:57.000000000 +0100 +++ new/libyui-3.0.4/libyui.spec.in 2013-05-10 16:52:55.000000000 +0200 @@ -76,6 +76,8 @@ %build +./bootstrap.sh + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.6/src/ImplPtr.h new/libyui-3.0.4/src/ImplPtr.h --- old/libyui-2.42.6/src/ImplPtr.h 2013-02-04 16:15:57.000000000 +0100 +++ new/libyui-3.0.4/src/ImplPtr.h 2013-05-10 16:52:55.000000000 +0200 @@ -41,7 +41,9 @@ template<class _Impl> class ImplPtr : private boost::noncopyable { +#if defined( BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS ) || defined( BOOST_NO_CXX11_NULLPTR ) typedef typename boost::scoped_ptr<_Impl>::unspecified_bool_type unspecified_bool_type; +#endif public: typedef _Impl element_type; @@ -55,7 +57,11 @@ void swap( ImplPtr rhs ) { _impl.swap( rhs._impl ); } public: +#if defined( BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS ) || defined( BOOST_NO_CXX11_NULLPTR ) operator unspecified_bool_type() const { return _impl; } +#else + explicit operator bool () const { return _impl.get() != 0; } +#endif const _Impl & operator*() const { return *_impl; } const _Impl * operator->() const { return _impl.get(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.6/src/YPath.cc new/libyui-3.0.4/src/YPath.cc --- old/libyui-2.42.6/src/YPath.cc 2013-02-04 16:15:57.000000000 +0100 +++ new/libyui-3.0.4/src/YPath.cc 2013-05-10 16:52:55.000000000 +0200 @@ -49,7 +49,7 @@ yuiMilestone () << "Given filename: " << filename << std::endl; bool isThemeDir = ! directory.compare ( THEMEDIR ); - std::string progSubDir = YSettings::getProgSubDir (); + std::string progSubDir = YSettings::progDir (); std::string fullname = ""; std::string themeSubDir = "/current"; size_t splitPos = fullPath.rfind( "/" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.6/src/YSettings.cc new/libyui-3.0.4/src/YSettings.cc --- old/libyui-2.42.6/src/YSettings.cc 2013-02-04 16:15:57.000000000 +0100 +++ new/libyui-3.0.4/src/YSettings.cc 2013-05-10 16:52:55.000000000 +0200 @@ -39,10 +39,10 @@ using std::endl; -std::string YSettings::progSubDir = ""; -std::string YSettings::progIconDir = ""; -std::string YSettings::progThemeDir = ""; -std::string YSettings::progLocaleDir = ""; +std::string YSettings::_progDir = ""; +std::string YSettings::_iconDir = ""; +std::string YSettings::_themeDir = ""; +std::string YSettings::_localeDir = ""; YSettings::YSettings() { @@ -52,86 +52,86 @@ { } -void YSettings::setProgSubDir( std::string directory ) +void YSettings::setProgDir( std::string directory ) { - if ( progSubDir.empty() ) + if ( _progDir.empty() ) { - progSubDir = directory; - yuiMilestone () << "Set progSubDir to \"" << directory << "\"" << endl; - yuiMilestone () << "progSubDir is now locked." << endl; + _progDir = directory; + yuiMilestone () << "Set progDir to \"" << directory << "\"" << endl; + yuiMilestone () << "progDir is now locked." << endl; } else { - yuiMilestone () << "Can't set progSubDir to \"" << directory << "\"" << endl; - yuiMilestone () << "It is locked to: \"" << progSubDir << "\"" << endl; - YUI_THROW ( YUIException ( "progSubDir is locked to: \"" + progSubDir + "\"" ) ); + yuiMilestone () << "Can't set progDir to \"" << directory << "\"" << endl; + yuiMilestone () << "It is locked to: \"" << _progDir << "\"" << endl; + YUI_THROW ( YUIException ( "progSubDir is locked to: \"" + _progDir + "\"" ) ); } } -std::string YSettings::getProgSubDir () +std::string YSettings::progDir () { - yuiMilestone () << "progSubDir: \"" << progSubDir << "\"" << endl; + yuiMilestone () << "progDir: \"" << _progDir << "\"" << endl; - return progSubDir; + return _progDir; } -void YSettings::setIconsDir( std::string directory ) +void YSettings::setIconDir( std::string directory ) { - if ( progIconDir.empty() ) + if ( _iconDir.empty() ) { - progIconDir = directory; - yuiMilestone () << "Set progIconDir to \"" << directory << "\"" << endl; - yuiMilestone () << "progIconDir is now locked." << endl; + _iconDir = directory; + yuiMilestone () << "Set iconDir to \"" << directory << "\"" << endl; + yuiMilestone () << "iconDir is now locked." << endl; } else { - yuiMilestone () << "Can't set progIconDir to \"" << directory << "\"" << endl; - yuiMilestone () << "It is locked to: \"" << progIconDir << "\"" << endl; - YUI_THROW ( YUIException ( "progIconDir is locked to: \"" + progIconDir + "\"" ) ); + yuiMilestone () << "Can't set iconDir to \"" << directory << "\"" << endl; + yuiMilestone () << "It is locked to: \"" << _iconDir << "\"" << endl; + YUI_THROW ( YUIException ( "progIconDir is locked to: \"" + _iconDir + "\"" ) ); } } -std::string YSettings::getIconsDir () +std::string YSettings::iconDir () { - if (progIconDir.size()) + if (_iconDir.size()) { - yuiMilestone () << "progIconDir: \"" << progIconDir << "\"" << endl; - return progIconDir; + yuiMilestone () << "iconDir: \"" << _iconDir << "\"" << endl; + return _iconDir; } - else if (progSubDir.size()) - return progSubDir + "/icons/"; + else if (_progDir.size()) + return _progDir + "/icons/"; return THEMEDIR "/icons/"; } void YSettings::setThemeDir( std::string directory ) { - if ( progThemeDir.empty() ) + if ( _themeDir.empty() ) { - progThemeDir = directory; - yuiMilestone () << "Set progThemeDir to \"" << directory << "\"" << endl; - yuiMilestone () << "progThemeDir is now locked." << endl; + _themeDir = directory; + yuiMilestone () << "Set themeDir to \"" << directory << "\"" << endl; + yuiMilestone () << "themeDir is now locked." << endl; } else { - yuiMilestone () << "Can't set progThemeDir to \"" << directory << "\"" << endl; - yuiMilestone () << "It is locked to: \"" << progThemeDir << "\"" << endl; - YUI_THROW ( YUIException ( "progThemeDir is locked to: \"" + progThemeDir + "\"" ) ); + yuiMilestone () << "Can't set themeDir to \"" << directory << "\"" << endl; + yuiMilestone () << "It is locked to: \"" << _themeDir << "\"" << endl; + YUI_THROW ( YUIException ( "themeDir is locked to: \"" + _themeDir + "\"" ) ); } } -std::string YSettings::getThemeDir () +std::string YSettings::themeDir () { - if (progThemeDir.size()) + if ( _themeDir.size() ) { - yuiMilestone () << "progThemeDir: \"" << progThemeDir << "\"" << endl; - return progThemeDir; + yuiMilestone () << "themeDir: \"" << _themeDir << "\"" << endl; + return _themeDir; } - else if (progSubDir.size()) + else if ( _progDir.size() ) { //back compatibility if setProgSubDir is set to "/usr/share/YaST2" - return progSubDir + "/theme/current/wizard/"; + return _progDir + "/theme/current/wizard/"; } return THEMEDIR "/current/wizard/"; @@ -140,31 +140,31 @@ void YSettings::setLocaleDir( std::string directory ) { - if ( progLocaleDir.empty() ) + if ( _localeDir.empty() ) { - progLocaleDir = directory; - yuiMilestone () << "Set progLocaleDir to \"" << directory << "\"" << endl; - yuiMilestone () << "progLocaleDir is now locked." << endl; + _localeDir = directory; + yuiMilestone () << "Set localeDir to \"" << directory << "\"" << endl; + yuiMilestone () << "localeDir is now locked." << endl; } else { - yuiMilestone () << "Can't set progLocaleDir to \"" << directory << "\"" << endl; - yuiMilestone () << "It is locked to: \"" << progLocaleDir << "\"" << endl; - YUI_THROW ( YUIException ( "progLocaleDir is locked to: \"" + progLocaleDir + "\"" ) ); + yuiMilestone () << "Can't set localeDir to \"" << directory << "\"" << endl; + yuiMilestone () << "It is locked to: \"" << _localeDir << "\"" << endl; + YUI_THROW ( YUIException ( "localeDir is locked to: \"" + _localeDir + "\"" ) ); } } -std::string YSettings::getLocaleDir () +std::string YSettings::localeDir () { - if (progLocaleDir.size()) + if ( _localeDir.size() ) { - yuiMilestone () << "progLocaleDir: \"" << progLocaleDir << "\"" << endl; - return progLocaleDir; + yuiMilestone () << "localeDir: \"" << _localeDir << "\"" << endl; + return _localeDir; } - else if (progSubDir.size()) + else if ( _progDir.size() ) { - //back compatibility if setProgSubDir is set to "/usr/share/YaST2" - return progSubDir + "/locale/"; + //back compatibility if ProgDir is set to "/usr/share/YaST2" + return _progDir + "/locale/"; } return "/usr/share/locale/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.6/src/YSettings.h new/libyui-3.0.4/src/YSettings.h --- old/libyui-2.42.6/src/YSettings.h 2013-02-04 16:15:57.000000000 +0100 +++ new/libyui-3.0.4/src/YSettings.h 2013-05-10 16:52:55.000000000 +0200 @@ -50,11 +50,11 @@ * Once this is set, it can't be altered. If you do so although an * exception will be thrown. **/ - static void setProgSubDir ( std::string directory ); + static void setProgDir ( std::string directory ); /** * Returns the value of your program's subdir. **/ - static std::string getProgSubDir (); + static std::string progDir (); /** * This can be used to set a subdir ICONDIR, @@ -63,11 +63,11 @@ * Once this is set, it can't be altered. If you do so although an * exception will be thrown. **/ - static void setIconsDir ( std::string directory ); + static void setIconDir ( std::string directory ); /** * Returns the value of your program's icons subdir. **/ - static std::string getIconsDir (); + static std::string iconDir (); /** * This can be used to set a subdir THEMEDIR, @@ -80,7 +80,7 @@ /** * Returns the value of your program's theme subdir. **/ - static std::string getThemeDir (); + static std::string themeDir (); /** * This can be used to set a subdir LOCALEDIR, @@ -93,13 +93,13 @@ /** * Returns the value of your program's locale subdir. **/ - static std::string getLocaleDir (); + static std::string localeDir (); private: - static std::string progSubDir; - static std::string progIconDir; - static std::string progThemeDir; - static std::string progLocaleDir; + static std::string _progDir; + static std::string _iconDir; + static std::string _themeDir; + static std::string _localeDir; YSettings (); YSettings ( const YSettings& ); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
