Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2016-02-07 09:21:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2016-01-28 17:18:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2016-02-07 09:21:37.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Jan 29 11:40:51 CET 2016 - [email protected] + +- Don't buildrequire graphviz-gnome (bsc#964150) +- Unwanted btrfs subvolumes must be filtered by device (not fsid) + (fixes #54) +- version 15.21.1 (19) + +------------------------------------------------------------------- Old: ---- libzypp-15.21.0.tar.bz2 New: ---- libzypp-15.21.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.SYbNex/_old 2016-02-07 09:21:38.000000000 +0100 +++ /var/tmp/diff_new_pack.SYbNex/_new 2016-02-07 09:21:38.000000000 +0100 @@ -19,7 +19,7 @@ %define force_gcc_46 0 Name: libzypp -Version: 15.21.0 +Version: 15.21.1 Release: 0 Url: git://gitorious.org/opensuse/libzypp.git Summary: Package, Patch, Pattern, and Product Management @@ -63,7 +63,6 @@ %endif BuildRequires: gettext-devel BuildRequires: graphviz -BuildRequires: graphviz-gnome BuildRequires: libxml2-devel %if 0%{?suse_version} != 1110 # No libproxy on SLES ++++++ libzypp-15.21.0.tar.bz2 -> libzypp-15.21.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.21.0/VERSION.cmake new/libzypp-15.21.1/VERSION.cmake --- old/libzypp-15.21.0/VERSION.cmake 2016-01-20 17:18:35.000000000 +0100 +++ new/libzypp-15.21.1/VERSION.cmake 2016-01-29 11:44:45.000000000 +0100 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "15") SET(LIBZYPP_COMPATMINOR "19") SET(LIBZYPP_MINOR "21") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") # -# LAST RELEASED: 15.21.0 (19) +# LAST RELEASED: 15.21.1 (19) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.21.0/libzypp.spec.cmake new/libzypp-15.21.1/libzypp.spec.cmake --- old/libzypp-15.21.0/libzypp.spec.cmake 2016-01-18 10:20:28.000000000 +0100 +++ new/libzypp-15.21.1/libzypp.spec.cmake 2016-01-29 11:40:44.000000000 +0100 @@ -63,7 +63,6 @@ %endif BuildRequires: gettext-devel BuildRequires: graphviz -BuildRequires: graphviz-gnome BuildRequires: libxml2-devel %if 0%{?suse_version} != 1110 # No libproxy on SLES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.21.0/package/libzypp.changes new/libzypp-15.21.1/package/libzypp.changes --- old/libzypp-15.21.0/package/libzypp.changes 2016-01-21 01:18:12.000000000 +0100 +++ new/libzypp-15.21.1/package/libzypp.changes 2016-01-29 11:44:45.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jan 29 11:40:51 CET 2016 - [email protected] + +- Don't buildrequire graphviz-gnome (bsc#964150) +- Unwanted btrfs subvolumes must be filtered by device (not fsid) + (fixes #54) +- version 15.21.1 (19) + +------------------------------------------------------------------- Thu Jan 21 01:13:29 CET 2016 - [email protected] - Update zypp-po.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.21.0/zypp/base/String.cc new/libzypp-15.21.1/zypp/base/String.cc --- old/libzypp-15.21.0/zypp/base/String.cc 2016-01-18 10:20:29.000000000 +0100 +++ new/libzypp-15.21.1/zypp/base/String.cc 2016-01-26 17:56:43.000000000 +0100 @@ -173,11 +173,15 @@ ** FUNCTION TYPE : std::string */ std::string toLower( const std::string & s ) + { return toLower( std::string(s) ); } + + std::string toLower( std::string && s ) { - if ( s.empty() ) - return s; + std::string ret( std::move(s) ); + + if ( ret.empty() ) + return ret; - std::string ret( s ); for ( std::string::size_type i = 0; i < ret.length(); ++i ) { if ( isupper( ret[i] ) ) @@ -192,11 +196,15 @@ ** FUNCTION TYPE : std::string */ std::string toUpper( const std::string & s ) + { return toUpper( std::string(s) ); } + + std::string toUpper( std::string && s ) { - if ( s.empty() ) - return s; + std::string ret( std::move(s) ); + + if ( ret.empty() ) + return ret; - std::string ret( s ); for ( std::string::size_type i = 0; i < ret.length(); ++i ) { if ( islower( ret[i] ) ) @@ -211,29 +219,36 @@ ** FUNCTION TYPE : std::string */ std::string trim( const std::string & s, const Trim trim_r ) + { return trim( std::string(s), trim_r ); } + + std::string trim( std::string && s, const Trim trim_r ) { - if ( s.empty() || trim_r == NO_TRIM ) - return s; + std::string ret( std::move(s) ); - std::string ret( s ); + if ( ret.empty() || trim_r == NO_TRIM ) + return ret; if ( trim_r & L_TRIM ) - { - std::string::size_type p = ret.find_first_not_of( " \t\n" ); - if ( p == std::string::npos ) - return std::string(); - - ret = ret.substr( p ); - } + { + std::string::size_type p = ret.find_first_not_of( " \t\n" ); + if ( p == std::string::npos ) + { + ret.clear(); + return ret; + } + ret.erase( 0, p ); + } if ( trim_r & R_TRIM ) - { - std::string::size_type p = ret.find_last_not_of( " \t\n" ); - if ( p == std::string::npos ) - return std::string(); - - ret = ret.substr( 0, p+1 ); - } + { + std::string::size_type p = ret.find_last_not_of( " \t\n" ); + if ( p == std::string::npos ) + { + ret.clear(); + return ret; + } + ret = ret.erase( p+1 ); + } return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.21.0/zypp/base/String.h new/libzypp-15.21.1/zypp/base/String.h --- old/libzypp-15.21.0/zypp/base/String.h 2016-01-18 10:20:29.000000000 +0100 +++ new/libzypp-15.21.1/zypp/base/String.h 2016-01-26 17:56:43.000000000 +0100 @@ -936,6 +936,7 @@ * \todo improve */ std::string toLower( const std::string & s ); + std::string toLower( std::string && s ); /** \overload */ inline std::string toLower( const char * s ) { return( s ? toLower( std::string(s) ) : std::string() ); } @@ -944,6 +945,7 @@ * \todo improve */ std::string toUpper( const std::string & s ); + std::string toUpper( std::string && s ); /** \overload */ inline std::string toUpper( const char * s ) { return( s ? toUpper( std::string(s) ) : std::string() ); } @@ -980,12 +982,17 @@ }; std::string trim( const std::string & s, const Trim trim_r = TRIM ); + std::string trim( std::string && s, const Trim trim_r = TRIM ); inline std::string ltrim( const std::string & s ) { return trim( s, L_TRIM ); } + inline std::string ltrim( std::string && s ) + { return trim( std::move(s), L_TRIM ); } inline std::string rtrim( const std::string & s ) { return trim( s, R_TRIM ); } + inline std::string rtrim( std::string && s ) + { return trim( std::move(s), R_TRIM ); } //@} std::string stripFirstWord( std::string & line, const bool ltrim_first = true );
