Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2013-11-17 20:19:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage (Old) and /work/SRC/openSUSE:Factory/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage" Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2013-11-08 16:12:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2013-11-17 20:19:48.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 13 15:28:51 CET 2013 - [email protected] + +- use correct binary prefix (bnc#849276) +- version 2.25.3 + +------------------------------------------------------------------- Old: ---- libstorage-2.25.2.tar.bz2 New: ---- libstorage-2.25.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.jr09nJ/_old 2013-11-17 20:19:49.000000000 +0100 +++ /var/tmp/diff_new_pack.jr09nJ/_new 2013-11-17 20:19:49.000000000 +0100 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.25.2 +Version: 2.25.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 ++++++ libstorage-2.25.2.tar.bz2 -> libstorage-2.25.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.2/VERSION new/libstorage-2.25.3/VERSION --- old/libstorage-2.25.2/VERSION 2013-10-30 16:07:20.000000000 +0100 +++ new/libstorage-2.25.3/VERSION 2013-11-13 15:30:59.000000000 +0100 @@ -1 +1 @@ -2.25.2 +2.25.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.2/storage/Device.cc new/libstorage-2.25.3/storage/Device.cc --- old/libstorage-2.25.2/storage/Device.cc 2013-03-14 10:34:31.000000000 +0100 +++ new/libstorage-2.25.3/storage/Device.cc 2013-11-06 18:29:21.000000000 +0100 @@ -157,11 +157,11 @@ } -bool Device::sameDevice( const string& device ) const + bool + Device::sameDevice(const string& device) const { - string d = normalizeDevice(device); - return( d==dev || - find( alt_names.begin(), alt_names.end(), d )!=alt_names.end() ); + string d = normalizeDevice(device); + return d == dev || contains(alt_names, d); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.2/storage/HumanString.cc new/libstorage-2.25.3/storage/HumanString.cc --- old/libstorage-2.25.2/storage/HumanString.cc 2013-09-30 11:28:44.000000000 +0200 +++ new/libstorage-2.25.3/storage/HumanString.cc 2013-11-10 12:42:30.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2004-2010] Novell, Inc. + * Copyright (c) [2004-2013] Novell, Inc. * * All Rights Reserved. * @@ -54,66 +54,66 @@ break; case 1: - /* symbol for "kilo bytes" (best keep untranslated) */ - ret.push_back(_("kB")); + /* symbol for "kibi bytes" (best keep untranslated) */ + ret.push_back(_("KiB")); if (all) - /* symbol for "kibi bytes" (best keep untranslated) */ - ret.push_back(_("KiB")); + /* symbol for "kilo bytes" (best keep untranslated) */ + ret.push_back(_("kB")); if (sloppy) /* symbol for "kilo" (best keep untranslated) */ ret.push_back(_("k")); break; case 2: - /* symbol for "mega bytes" (best keep untranslated) */ - ret.push_back(_("MB")); + /* symbol for "mebi bytes" (best keep untranslated) */ + ret.push_back(_("MiB")); if (all) - /* symbol for "mebi bytes" (best keep untranslated) */ - ret.push_back(_("MiB")); + /* symbol for "mega bytes" (best keep untranslated) */ + ret.push_back(_("MB")); if (sloppy) /* symbol for "mega" (best keep untranslated) */ ret.push_back(_("M")); break; case 3: - /* symbol for "giga bytes" (best keep untranslated) */ - ret.push_back(_("GB")); + /* symbol for "gibi bytes" (best keep untranslated) */ + ret.push_back(_("GiB")); if (all) - /* symbol for "gibi bytes" (best keep untranslated) */ - ret.push_back(_("GiB")); + /* symbol for "giga bytes" (best keep untranslated) */ + ret.push_back(_("GB")); if (sloppy) /* symbol for "giga" (best keep untranslated) */ ret.push_back(_("G")); break; case 4: - /* symbol for "tera bytes" (best keep untranslated) */ - ret.push_back(_("TB")); + /* symbol for "tebi bytes" (best keep untranslated) */ + ret.push_back(_("TiB")); if (all) - /* symbol for "tebi bytes" (best keep untranslated) */ - ret.push_back(_("TiB")); + /* symbol for "tera bytes" (best keep untranslated) */ + ret.push_back(_("TB")); if (sloppy) /* symbol for "tera" (best keep untranslated) */ ret.push_back(_("T")); break; case 5: - /* symbol for "peta bytes" (best keep untranslated) */ - ret.push_back(_("PB")); + /* symbol for "pebi bytes" (best keep untranslated) */ + ret.push_back(_("PiB")); if (all) - /* symbol for "pebi bytes" (best keep untranslated) */ - ret.push_back(_("PiB")); + /* symbol for "peta bytes" (best keep untranslated) */ + ret.push_back(_("PB")); if (sloppy) /* symbol for "peta" (best keep untranslated) */ ret.push_back(_("P")); break; case 6: - /* symbol for "exa bytes" (best keep untranslated) */ - ret.push_back(_("EB")); + /* symbol for "exbi bytes" (best keep untranslated) */ + ret.push_back(_("EiB")); if (all) - /* symbol for "exbi bytes" (best keep untranslated) */ - ret.push_back(_("EiB")); + /* symbol for "exa bytes" (best keep untranslated) */ + ret.push_back(_("EB")); if (sloppy) /* symbol for "exa" (best keep untranslated) */ ret.push_back(_("E")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.2/storage/Storage.cc new/libstorage-2.25.3/storage/Storage.cc --- old/libstorage-2.25.2/storage/Storage.cc 2013-11-05 10:43:07.000000000 +0100 +++ new/libstorage-2.25.3/storage/Storage.cc 2013-11-09 11:35:59.000000000 +0100 @@ -772,9 +772,9 @@ { dlist.clear(); DIR *Dir; - struct dirent *Entry; if( (Dir=opendir(SYSFSDIR))!=NULL ) { + struct dirent* Entry; while( (Entry=readdir( Dir ))!=NULL ) { string dn = Entry->d_name; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.2/storage/SystemInfo.cc new/libstorage-2.25.3/storage/SystemInfo.cc --- old/libstorage-2.25.2/storage/SystemInfo.cc 2012-08-07 11:51:00.000000000 +0200 +++ new/libstorage-2.25.3/storage/SystemInfo.cc 2013-11-06 18:28:20.000000000 +0100 @@ -85,19 +85,17 @@ return( it!=fs.end() ); } -list<string> -CmdBtrfsShow::getUuids() const + + list<string> + CmdBtrfsShow::getUuids() const { - list<string> ret; + list<string> ret; + + for (const_iterator it = fs.begin(); it != fs.end(); ++it) + ret.push_back(it->first); - const_iterator it = fs.begin(); - while( it != fs.end() ) - { - ret.push_back( it->first ); - ++it; - } - y2mil( "ret:" << ret ); - return( ret ); + y2mil("ret:" << ret); + return ret; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.2/storage/gen_md5sum.cc new/libstorage-2.25.3/storage/gen_md5sum.cc --- old/libstorage-2.25.2/storage/gen_md5sum.cc 2013-11-06 14:09:30.000000000 +0100 +++ new/libstorage-2.25.3/storage/gen_md5sum.cc 2013-11-10 12:42:42.000000000 +0100 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "f08edc8cad7f41871ec98002f9655cab" -#define SOURCES_MD5_DATE " Wed 6 Nov 14:09:30 CET 2013 " +#define SOURCES_MD5SUM "dfd7e8326b5a90f2c14c312ad82aa6de" +#define SOURCES_MD5_DATE " Sun 10 Nov 12:42:42 CET 2013 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.2/testsuite/single.out/humanstring1.out new/libstorage-2.25.3/testsuite/single.out/humanstring1.out --- old/libstorage-2.25.2/testsuite/single.out/humanstring1.out 2013-09-27 14:09:14.000000000 +0200 +++ new/libstorage-2.25.3/testsuite/single.out/humanstring1.out 2013-11-10 12:42:16.000000000 +0100 @@ -1,16 +1,16 @@ -- 1 -- 0 B 0 B -1 kB -1.00 kB +1 KiB +1.00 KiB -- 2 -- -117.7376 MB -117,7376 MB +117.7376 MiB +117,7376 MiB -- 3 -- -117.7376 MB -117,7376 Mo +117.7376 MiB +117,7376 MiB -- 4 -- -1,000.00 kB -1.000,00 kB -1'000.00 kB -1 000,00 ko +1,000.00 KiB +1.000,00 KiB +1'000.00 KiB +1 000,00 KiB -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
