Hello community, here is the log from the commit of package libyui-gtk for openSUSE:Factory checked in at 2013-05-13 20:22:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-gtk (Old) and /work/SRC/openSUSE:Factory/.libyui-gtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-gtk" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-gtk/libyui-gtk.changes 2013-04-26 13:32:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui-gtk.new/libyui-gtk.changes 2013-05-13 20:22:41.000000000 +0200 @@ -1,0 +2,32 @@ +Fri May 10 10:40:00 UTC 2013 - [email protected] + +- 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 +- 2.43.2 + +------------------------------------------------------------------- +Mon May 6 11:34:38 UTC 2013 - [email protected] + +- increased version +- use SONAME from libyui instead of VERSION.cmake + +------------------------------------------------------------------- +Mon Apr 29 08:38:47 CEST 2013 - [email protected] + +- Adapted call for theme dir and locale dir +- 2.42.5 + +------------------------------------------------------------------- +Fri Apr 26 12:49:33 CEST 2013 - [email protected] + +- fix for bnc #801311: Translation is missing +- 2.42.5 + +------------------------------------------------------------------- Old: ---- libyui-gtk-2.42.4.tar.bz2 New: ---- libyui-gtk-2.43.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-gtk-doc.spec ++++++ --- /var/tmp/diff_new_pack.XL76Az/_old 2013-05-13 20:22:43.000000000 +0200 +++ /var/tmp/diff_new_pack.XL76Az/_new 2013-05-13 20:22:43.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libyui-gtk (Version 2.42.4) +# spec file for package libyui-gtk (Version 2.43.3) # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,7 +16,7 @@ # Name: libyui-gtk-doc -Version: 2.42.4 +Version: 2.43.3 Release: 0 License: LGPL-2.1 or LGPL-3.0 Source: libyui-gtk-%{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-gtk4 +%fdupes -s $RPM_BUILD_ROOT/%_docdir/libyui-gtk5 %clean @@ -77,6 +79,6 @@ %files %defattr(-,root,root) -%doc %{_docdir}/libyui-gtk4 +%doc %{_docdir}/libyui-gtk5 %changelog ++++++ libyui-gtk.spec ++++++ --- /var/tmp/diff_new_pack.XL76Az/_old 2013-05-13 20:22:43.000000000 +0200 +++ /var/tmp/diff_new_pack.XL76Az/_new 2013-05-13 20:22:43.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libyui-gtk (Version 2.42.4) +# spec file for package libyui-gtk (Version 2.43.3) # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,7 +17,7 @@ # norootforbuild Name: libyui-gtk -Version: 2.42.4 +Version: 2.43.3 Release: 0 License: LGPL-2.1 or LGPL-3.0 Source: libyui-gtk-%{version}.tar.bz2 @@ -27,7 +27,7 @@ BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkg-config -BuildRequires: libyui-devel +BuildRequires: libyui-devel >= 3.0.4 BuildRequires: gtk3-devel Provides: yui_backend @@ -40,19 +40,19 @@ component for libYUI. -%package -n libyui-gtk4 +%package -n libyui-gtk5 Group: System/Libraries -Requires: libyui4 -Provides: libyui-ncurses = %{version} +Requires: libyui5 +Provides: libyui-gtk = %{version} Provides: yast2-gtk = %{version} Obsoletes: yast2-gtk < %{version} URL: http://github.com/libyui/ Summary: Libyui - Gtk User Interface -%description -n libyui-gtk4 +%description -n libyui-gtk5 This package contains the Gtk user interface component for libYUI. @@ -62,7 +62,7 @@ Group: Development/Languages/C and C++ -Requires: libyui-gtk4 = %{version} +Requires: libyui-gtk5 = %{version} Requires: glibc-devel Requires: libstdc++-devel Requires: boost-devel @@ -88,6 +88,8 @@ export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +./bootstrap.sh %{_prefix} + mkdir build cd build @@ -111,27 +113,27 @@ %install cd build make install DESTDIR="$RPM_BUILD_ROOT" -install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/libyui-gtk4/ +install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/libyui-gtk5/ install -m0755 -d $RPM_BUILD_ROOT/%{_libdir}/yui -install -m0644 ../COPYING* $RPM_BUILD_ROOT/%{_docdir}/libyui-gtk4/ +install -m0644 ../COPYING* $RPM_BUILD_ROOT/%{_docdir}/libyui-gtk5/ %clean rm -rf "$RPM_BUILD_ROOT" -%post -n libyui-gtk4 -p /sbin/ldconfig +%post -n libyui-gtk5 -p /sbin/ldconfig -%postun -n libyui-gtk4 -p /sbin/ldconfig +%postun -n libyui-gtk5 -p /sbin/ldconfig -%files -n libyui-gtk4 +%files -n libyui-gtk5 %defattr(-,root,root) %dir %{_libdir}/yui %{_libdir}/yui/lib*.so.* -%doc %dir %{_docdir}/libyui-gtk4 -%doc %{_docdir}/libyui-gtk4/COPYING* +%doc %dir %{_docdir}/libyui-gtk5 +%doc %{_docdir}/libyui-gtk5/COPYING* %files devel %defattr(-,root,root) -%dir %{_docdir}/libyui-gtk4 +%dir %{_docdir}/libyui-gtk5 %{_libdir}/yui/lib*.so %{_prefix}/include/yui %{_libdir}/pkgconfig/libyui-gtk.pc ++++++ libyui-gtk-2.42.4.tar.bz2 -> libyui-gtk-2.43.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.42.4/.gitignore new/libyui-gtk-2.43.3/.gitignore --- old/libyui-gtk-2.42.4/.gitignore 2013-04-24 15:07:31.000000000 +0200 +++ new/libyui-gtk-2.43.3/.gitignore 2013-05-10 15:32:26.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-gtk-2.42.4/CMakeLists.txt new/libyui-gtk-2.43.3/CMakeLists.txt --- old/libyui-gtk-2.42.4/CMakeLists.txt 2013-04-24 15:07:31.000000000 +0200 +++ new/libyui-gtk-2.43.3/CMakeLists.txt 2013-05-13 20:22:43.000000000 +0200 @@ -1,67 +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}" ) - -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-gtk-2.42.4/ChangeLog new/libyui-gtk-2.43.3/ChangeLog --- old/libyui-gtk-2.42.4/ChangeLog 2013-04-24 15:07:31.000000000 +0200 +++ new/libyui-gtk-2.43.3/ChangeLog 2013-05-10 15:32:26.000000000 +0200 @@ -1,4 +1,36 @@ ------------------------------------------------------------------- +Fri May 10 10:40:00 UTC 2013 - [email protected] + +- 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 +- 2.43.2 + +------------------------------------------------------------------- +Mon May 6 11:34:38 UTC 2013 - [email protected] + +- increased version +- use SONAME from libyui instead of VERSION.cmake + +------------------------------------------------------------------- +Mon Apr 29 08:38:47 CEST 2013 - [email protected] + +- Adapted call for theme dir and locale dir +- 2.42.5 + +------------------------------------------------------------------- +Fri Apr 26 12:49:33 CEST 2013 - [email protected] + +- fix for bnc #801311: Translation is missing +- 2.42.5 + +------------------------------------------------------------------- Wed Apr 24 09:14:01 CEST 2013 - [email protected] - GTK compilation fix diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.42.4/Makefile.cvs new/libyui-gtk-2.43.3/Makefile.cvs --- old/libyui-gtk-2.42.4/Makefile.cvs 2013-04-24 15:07:31.000000000 +0200 +++ new/libyui-gtk-2.43.3/Makefile.cvs 2013-05-10 15:32:26.000000000 +0200 @@ -5,6 +5,7 @@ all: configure configure: clean + ./bootstrap.sh ; \ mkdir build ; \ cd build ; \ cmake .. \ @@ -20,4 +21,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-gtk-2.42.4/VERSION.cmake new/libyui-gtk-2.43.3/VERSION.cmake --- old/libyui-gtk-2.42.4/VERSION.cmake 2013-04-24 15:07:31.000000000 +0200 +++ new/libyui-gtk-2.43.3/VERSION.cmake 2013-05-10 15:32:26.000000000 +0200 @@ -1,11 +1,11 @@ SET( VERSION_MAJOR "2" ) -SET( VERSION_MINOR "42" ) -SET( VERSION_PATCH "4" ) +SET( VERSION_MINOR "43" ) +SET( VERSION_PATCH "3" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SHA1}" ) ##### 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-gtk-2.42.4/bootstrap.sh new/libyui-gtk-2.43.3/bootstrap.sh --- old/libyui-gtk-2.42.4/bootstrap.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-gtk-2.43.3/bootstrap.sh 2013-05-10 15:32:26.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-gtk-2.42.4/libyui-gtk.spec.in new/libyui-gtk-2.43.3/libyui-gtk.spec.in --- old/libyui-gtk-2.42.4/libyui-gtk.spec.in 2013-04-24 15:07:31.000000000 +0200 +++ new/libyui-gtk-2.43.3/libyui-gtk.spec.in 2013-05-10 15:32:26.000000000 +0200 @@ -27,7 +27,7 @@ BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkg-config -BuildRequires: libyui-devel +BuildRequires: libyui-devel >= 3.0.4 BuildRequires: gtk3-devel Provides: yui_backend @@ -43,7 +43,7 @@ Group: System/Libraries Requires: lib@BASELIB@@SONAME_MAJOR@ -Provides: lib@BASELIB@-ncurses = %{version} +Provides: lib@BASELIB@-gtk = %{version} Provides: yast2-gtk = %{version} Obsoletes: yast2-gtk < %{version} @@ -82,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-gtk-2.42.4/src/YGUI.cc new/libyui-gtk-2.43.3/src/YGUI.cc --- old/libyui-gtk-2.42.4/src/YGUI.cc 2013-04-24 15:07:31.000000000 +0200 +++ new/libyui-gtk-2.43.3/src/YGUI.cc 2013-05-10 15:32:26.000000000 +0200 @@ -60,7 +60,7 @@ void YGUI::setTextdomain( const char * domain ) { - bindtextdomain( domain, LOCALEDIR ); + bindtextdomain( domain, YSettings::localeDir().c_str() ); bind_textdomain_codeset( domain, "utf8" ); textdomain( domain ); @@ -147,7 +147,7 @@ g_log_set_always_fatal (GLogLevelFlags (G_LOG_LEVEL_ERROR|G_LOG_LEVEL_CRITICAL| G_LOG_LEVEL_WARNING| G_LOG_LEVEL_MESSAGE|G_LOG_LEVEL_INFO|G_LOG_LEVEL_DEBUG)); #endif - std::string themeSubDir = YSettings::getThemeDir(); + std::string themeSubDir = YSettings::themeDir(); char* st = getenv("Y2STYLE"); std::string style = st ? st : ""; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
