Hello community, here is the log from the commit of package libyui-qt for openSUSE:Factory checked in at 2013-05-13 20:23:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-qt (Old) and /work/SRC/openSUSE:Factory/.libyui-qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-qt" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-qt/libyui-qt.changes 2013-02-04 21:15:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-qt.new/libyui-qt.changes 2013-05-13 20:23:07.000000000 +0200 @@ -2 +2 @@ -Mon Jan 4 15:48:13 CET 2014 - [email protected] +Fri May 10 10:40:00 UTC 2013 - [email protected] @@ -4,2 +4,16 @@ -- fixed bnc #801311: read locale directory from YSettings -- Version 2.42.5 +- use a common toplevel CMakeLists.txt +- fix building *-doc pkgs +- introduce bootstrap.sh +- Version 2.43.3 + +------------------------------------------------------------------- +Mon May 6 13:30:00 UTC 2013 - [email protected] + +- fix build issues +- Version 2.43.2 + +------------------------------------------------------------------- +Mon May 6 11:52:13 UTC 2013 - [email protected] + +- use SONAME from libyui instead of VERSION.cmake +- Version 2.43.1 @@ -10,0 +25,6 @@ + +------------------------------------------------------------------- +Mon Jan 4 15:48:13 CET 2013 - [email protected] + +- fixed bnc #801311: read locale directory from YSettings +- Version 2.42.5 Old: ---- libyui-qt-2.42.5.tar.bz2 New: ---- libyui-qt-2.43.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-doc.spec ++++++ --- /var/tmp/diff_new_pack.YdwjV1/_old 2013-05-13 20:23:08.000000000 +0200 +++ /var/tmp/diff_new_pack.YdwjV1/_new 2013-05-13 20:23:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libyui-qt (Version 2.42.5) +# spec file for package libyui-qt (Version 2.43.3) # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,7 +16,7 @@ # Name: libyui-qt-doc -Version: 2.42.5 +Version: 2.43.3 Release: 0 License: LGPL-2.1 or LGPL-3.0 Source: libyui-qt-%{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/ @@ -55,6 +55,8 @@ export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +./bootstrap.sh %{_prefix} + mkdir build cd build cmake .. \ @@ -68,7 +70,7 @@ cd build make install DESTDIR="$RPM_BUILD_ROOT" -%fdupes -s $RPM_BUILD_ROOT/%_docdir/libyui-qt4 +%fdupes -s $RPM_BUILD_ROOT/%_docdir/libyui-qt5 %clean @@ -77,6 +79,6 @@ %files %defattr(-,root,root) -%doc %{_docdir}/libyui-qt4 +%doc %{_docdir}/libyui-qt5 %changelog ++++++ libyui-qt.spec ++++++ --- /var/tmp/diff_new_pack.YdwjV1/_old 2013-05-13 20:23:08.000000000 +0200 +++ /var/tmp/diff_new_pack.YdwjV1/_new 2013-05-13 20:23:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libyui-qt (Version 2.42.5) +# spec file for package libyui-qt (Version 2.43.3) # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ # norootforbuild Name: libyui-qt -Version: 2.42.5 +Version: 2.43.3 Release: 0 License: LGPL-2.1 or LGPL-3.0 Source: libyui-qt-%{version}.tar.bz2 @@ -29,7 +29,7 @@ BuildRequires: gcc-c++ BuildRequires: pkg-config -%define libyui_devel_version libyui-devel >= 2.42.6 +%define libyui_devel_version libyui-devel >= 3.0.4 BuildRequires: %{libyui_devel_version} BuildRequires: libqt4-devel Provides: yui_backend @@ -42,18 +42,19 @@ component for libYUI. -%package -n libyui-qt4 +%package -n libyui-qt5 Group: System/Libraries -Requires: libyui4 -Provides: yast2-qt = 2.42.0 +Requires: libyui5 +Provides: libyui-qt = %{version} +Provides: yast2-qt = %{version} Obsoletes: yast2-qt < 2.42.0 URL: http://github.com/libyui/ Summary: Libyui - Qt User Interface -%description -n libyui-qt4 +%description -n libyui-qt5 This package contains the Qt user interface component for libYUI. @@ -63,7 +64,7 @@ Group: Development/Languages/C and C++ -Requires: libyui-qt4 = %{version} +Requires: libyui-qt5 = %{version} Requires: %{libyui_devel_version} URL: http://github.com/libyui/ @@ -87,6 +88,8 @@ export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +./bootstrap.sh %{_prefix} + mkdir build cd build @@ -110,27 +113,27 @@ %install cd build make install DESTDIR="$RPM_BUILD_ROOT" -install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/libyui-qt4/ +install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/libyui-qt5/ install -m0755 -d $RPM_BUILD_ROOT/%{_libdir}/yui -install -m0644 ../COPYING* $RPM_BUILD_ROOT/%{_docdir}/libyui-qt4/ +install -m0644 ../COPYING* $RPM_BUILD_ROOT/%{_docdir}/libyui-qt5/ %clean rm -rf "$RPM_BUILD_ROOT" -%post -n libyui-qt4 -p /sbin/ldconfig +%post -n libyui-qt5 -p /sbin/ldconfig -%postun -n libyui-qt4 -p /sbin/ldconfig +%postun -n libyui-qt5 -p /sbin/ldconfig -%files -n libyui-qt4 +%files -n libyui-qt5 %defattr(-,root,root) %dir %{_libdir}/yui %{_libdir}/yui/lib*.so.* -%doc %dir %{_docdir}/libyui-qt4 -%doc %{_docdir}/libyui-qt4/COPYING* +%doc %dir %{_docdir}/libyui-qt5 +%doc %{_docdir}/libyui-qt5/COPYING* %files devel %defattr(-,root,root) -%dir %{_docdir}/libyui-qt4 +%dir %{_docdir}/libyui-qt5 %{_libdir}/yui/lib*.so %{_prefix}/include/yui %{_libdir}/pkgconfig/libyui-qt.pc ++++++ libyui-qt-2.42.5.tar.bz2 -> libyui-qt-2.43.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.42.5/.gitignore new/libyui-qt-2.43.3/.gitignore --- old/libyui-qt-2.42.5/.gitignore 2013-02-04 16:23:09.000000000 +0100 +++ new/libyui-qt-2.43.3/.gitignore 2013-05-10 15:31:18.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-qt-2.42.5/CMakeLists.txt new/libyui-qt-2.43.3/CMakeLists.txt --- old/libyui-qt-2.42.5/CMakeLists.txt 2013-02-04 16:23:09.000000000 +0100 +++ new/libyui-qt-2.43.3/CMakeLists.txt 2013-05-13 20:23:08.000000000 +0200 @@ -1,71 +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 --tags" - 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}" ) - -SET(Y2QT_ICONDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/theme/current) -ADD_DEFINITIONS(-DICONDIR="${Y2QT_ICONDIR}") -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 /usr/share/libyui/buildtools/CMakeLists.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.42.5/ChangeLog new/libyui-qt-2.43.3/ChangeLog --- old/libyui-qt-2.42.5/ChangeLog 2013-02-04 16:23:09.000000000 +0100 +++ new/libyui-qt-2.43.3/ChangeLog 2013-05-10 15:31:18.000000000 +0200 @@ -1,8 +1,22 @@ ------------------------------------------------------------------- -Mon Jan 4 15:48:13 CET 2014 - [email protected] +Fri May 10 10:40:00 UTC 2013 - [email protected] -- fixed bnc #801311: read locale directory from YSettings -- Version 2.42.5 +- use a common toplevel CMakeLists.txt +- fix building *-doc pkgs +- introduce bootstrap.sh +- Version 2.43.3 + +------------------------------------------------------------------- +Mon May 6 13:30:00 UTC 2013 - [email protected] + +- fix build issues +- Version 2.43.2 + +------------------------------------------------------------------- +Mon May 6 11:52:13 UTC 2013 - [email protected] + +- use SONAME from libyui instead of VERSION.cmake +- Version 2.43.1 ------------------------------------------------------------------- Fri Jan 18 15:19:26 CET 2013 - [email protected] @@ -10,6 +24,12 @@ - fixed to use new YSettings, theme path can be set by program ------------------------------------------------------------------- +Mon Jan 4 15:48:13 CET 2013 - [email protected] + +- fixed bnc #801311: read locale directory from YSettings +- Version 2.42.5 + +------------------------------------------------------------------- Mon Dec 17 11:51:33 CET 2012 - [email protected] - fixed bnc #793893: storage graph in yast missing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.42.5/Makefile.cvs new/libyui-qt-2.43.3/Makefile.cvs --- old/libyui-qt-2.42.5/Makefile.cvs 2013-02-04 16:23:09.000000000 +0100 +++ new/libyui-qt-2.43.3/Makefile.cvs 2013-05-10 15:31:18.000000000 +0200 @@ -5,6 +5,7 @@ all: configure configure: clean + ./bootstrap.sh ; \ mkdir build ; \ cd build ; \ cmake -DCMAKE_BUILD_TYPE=RELEASE .. @@ -18,4 +19,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-qt-2.42.5/VERSION.cmake new/libyui-qt-2.43.3/VERSION.cmake --- old/libyui-qt-2.42.5/VERSION.cmake 2013-02-04 16:23:09.000000000 +0100 +++ new/libyui-qt-2.43.3/VERSION.cmake 2013-05-10 15:31:18.000000000 +0200 @@ -1,11 +1,11 @@ SET(VERSION_MAJOR "2") -SET(VERSION_MINOR "42") -SET(VERSION_PATCH "5") +SET(VERSION_MINOR "43") +SET(VERSION_PATCH "3") 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_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-qt-2.42.5/bootstrap.sh new/libyui-qt-2.43.3/bootstrap.sh --- old/libyui-qt-2.42.5/bootstrap.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-2.43.3/bootstrap.sh 2013-05-10 15:31:18.000000000 +0200 @@ -0,0 +1,26 @@ +#!/bin/sh +set -e + +prefix="/usr" + +if [ ! -z $1 ] +then + prefix="$1" +fi + +cmake_common="$prefix/share/libyui/buildtools/CMakeLists.common" +cmake_target="./CMakeLists.txt" + +echo "checking for $cmake_common..." + +if [ -f "$cmake_common" ] +then + ln -fs "$cmake_common" "$cmake_target" + echo "OK: linked to `pwd`/$cmake_target." +else + echo " Use must have libyui(-devel) >= 3.0.4 installed" + echo " in \"$prefix\" first !!!" + exit 1 +fi + +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.42.5/libyui-qt.spec.in new/libyui-qt-2.43.3/libyui-qt.spec.in --- old/libyui-qt-2.42.5/libyui-qt.spec.in 2013-02-04 16:23:09.000000000 +0100 +++ new/libyui-qt-2.43.3/libyui-qt.spec.in 2013-05-10 15:31:18.000000000 +0200 @@ -29,7 +29,7 @@ BuildRequires: gcc-c++ BuildRequires: pkg-config -%define libyui_devel_version libyui-devel >= 2.42.6 +%define libyui_devel_version libyui-devel >= 3.0.4 BuildRequires: %{libyui_devel_version} BuildRequires: libqt4-devel Provides: yui_backend @@ -45,7 +45,8 @@ Group: System/Libraries Requires: lib@BASELIB@@SONAME_MAJOR@ -Provides: yast2-qt = 2.42.0 +Provides: lib@BASELIB@-qt = %{version} +Provides: yast2-qt = %{version} Obsoletes: yast2-qt < 2.42.0 URL: @URL@ @@ -81,6 +82,8 @@ export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +./bootstrap.sh %{_prefix} + mkdir build cd build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.42.5/src/QY2Styler.cc new/libyui-qt-2.43.3/src/QY2Styler.cc --- old/libyui-qt-2.42.5/src/QY2Styler.cc 2013-02-04 16:23:09.000000000 +0100 +++ new/libyui-qt-2.43.3/src/QY2Styler.cc 2013-05-10 15:31:18.000000000 +0200 @@ -176,7 +176,7 @@ QString QY2Styler::themeDir() const { - return QString(YSettings::getThemeDir().c_str()); + return QString(YSettings::themeDir().c_str()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.42.5/src/YQUI.cc new/libyui-qt-2.43.3/src/YQUI.cc --- old/libyui-qt-2.42.5/src/YQUI.cc 2013-02-04 16:23:09.000000000 +0100 +++ new/libyui-qt-2.43.3/src/YQUI.cc 2013-05-10 15:31:18.000000000 +0200 @@ -495,7 +495,7 @@ void YQUI::setTextdomain( const char * domain ) { - bindtextdomain( domain, YSettings::getLocaleDir().c_str() ); + bindtextdomain( domain, YSettings::localeDir().c_str() ); bind_textdomain_codeset( domain, "utf8" ); textdomain( domain ); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
