Hello community,
here is the log from the commit of package libstorage for openSUSE:13.1 checked
in at 2013-10-09 08:50:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/libstorage (Old)
and /work/SRC/openSUSE:13.1/.libstorage.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage"
Changes:
--------
--- /work/SRC/openSUSE:13.1/libstorage/libstorage.changes 2013-10-08
13:56:44.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.libstorage.new/libstorage.changes 2013-10-09
08:50:28.000000000 +0200
@@ -2,5 +1,0 @@
-Tue Oct 8 11:54:26 UTC 2013 - tchva...@suse.com
-
-- Revert to 2.24.5 as 2.25 was ment only for factory.
-
--------------------------------------------------------------------
@@ -10 +5 @@
-- version 2.25.0
+- version 2.24.6
Old:
----
libstorage-2.24.5.tar.bz2
New:
----
libstorage-2.24.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage.spec ++++++
--- /var/tmp/diff_new_pack.AIxomy/_old 2013-10-09 08:50:28.000000000 +0200
+++ /var/tmp/diff_new_pack.AIxomy/_new 2013-10-09 08:50:28.000000000 +0200
@@ -17,27 +17,19 @@
Name: libstorage
-Version: 2.24.5
+Version: 2.24.6
Release: 0
+License: GPL-2.0
+Group: System/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: libstorage-%{version}.tar.bz2
Prefix: /usr
-BuildRequires: boost-devel
-BuildRequires: dejagnu
-BuildRequires: doxygen
-BuildRequires: gcc-c++
-BuildRequires: libtool
-BuildRequires: libxml2-devel
-BuildRequires: python-devel
-BuildRequires: ruby
-BuildRequires: ruby-devel
-BuildRequires: swig
+BuildRequires: boost-devel dejagnu doxygen gcc-c++ libtool libxml2-devel
python-devel swig
+BuildRequires: ruby ruby-devel
Summary: Library for storage management
-License: GPL-2.0
-Group: System/Libraries
Url: http://en.opensuse.org/Portal:Libstorage
%description
@@ -51,6 +43,7 @@
%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} ||
0%{?fedora} || 0%{?rhel}
%{!?ruby_sitelib: %global ruby_sitelib %(ruby -r rbconfig -e 'vd =
Config::CONFIG["vendorlibdir"]; print(vd ? vd : Config::CONFIG["sitelibdir"])')}
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -r rbconfig -e 'vad =
Config::CONFIG["vendorarchdir"]; print(vad ? vad :
Config::CONFIG["sitearchdir"])')}
+%{!?ruby_vendor: %global ruby_vendor %(ruby -r rbconfig -e 'vad =
Config::CONFIG["vendor"]; print(vad ? vad : Config::CONFIG["vendor"])')}
%endif
%endif
@@ -115,18 +108,8 @@
%package -n libstorage4
-Requires: coreutils
-Requires: cryptsetup
-Requires: device-mapper
-Requires: dmraid
-Requires: grep
-Requires: lsscsi
-Requires: lvm2
-Requires: mdadm
-Requires: multipath-tools
-Requires: parted >= 2.2
-Requires: udev
-Requires: util-linux >= 2.16
+Requires: parted >= 2.2 mdadm device-mapper lvm2 dmraid multipath-tools
cryptsetup
+Requires: coreutils udev util-linux >= 2.16 grep lsscsi
%ifarch s390 s390x
Requires: s390-tools
%endif
@@ -169,10 +152,8 @@
%package -n libstorage-devel
-Requires: gcc-c++
-Requires: libstdc++-devel
Requires: libstorage4 = %version
-Requires: libxml2-devel
+Requires: gcc-c++ libstdc++-devel libxml2-devel
Summary: Header files and documentation for libstorage
Group: Development/Languages/C and C++
@@ -234,6 +215,7 @@
%else
%{rb_vendorarch}/storage.so
%endif
+%{rb_vendordir}/storage_utf8.rb
%endif
%if 0%{?mandriva_version}
%{ruby_sitearchdir}/storage.so
++++++ libstorage-2.24.5.tar.bz2 -> libstorage-2.24.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/Makefile.in
new/libstorage-2.24.6/Makefile.in
--- old/libstorage-2.24.5/Makefile.in 2013-09-26 11:20:08.000000000 +0200
+++ new/libstorage-2.24.6/Makefile.in 2013-10-08 14:03:49.000000000 +0200
@@ -246,8 +246,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
@@ -681,7 +683,7 @@
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod u+w $(distdir)
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/VERSION
new/libstorage-2.24.6/VERSION
--- old/libstorage-2.24.5/VERSION 2013-09-25 17:06:50.000000000 +0200
+++ new/libstorage-2.24.6/VERSION 2013-10-08 14:03:08.000000000 +0200
@@ -1 +1 @@
-2.24.5
+2.24.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/bindings/Makefile.in
new/libstorage-2.24.6/bindings/Makefile.in
--- old/libstorage-2.24.5/bindings/Makefile.in 2013-09-26 11:20:08.000000000
+0200
+++ new/libstorage-2.24.6/bindings/Makefile.in 2013-10-08 14:03:49.000000000
+0200
@@ -193,8 +193,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/bindings/python/Makefile.in
new/libstorage-2.24.6/bindings/python/Makefile.in
--- old/libstorage-2.24.5/bindings/python/Makefile.in 2013-09-26
11:20:08.000000000 +0200
+++ new/libstorage-2.24.6/bindings/python/Makefile.in 2013-10-08
14:03:49.000000000 +0200
@@ -257,8 +257,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-2.24.5/bindings/python/examples/Makefile.in
new/libstorage-2.24.6/bindings/python/examples/Makefile.in
--- old/libstorage-2.24.5/bindings/python/examples/Makefile.in 2013-09-26
11:20:08.000000000 +0200
+++ new/libstorage-2.24.6/bindings/python/examples/Makefile.in 2013-10-08
14:03:49.000000000 +0200
@@ -183,8 +183,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/bindings/python/libstorage.py
new/libstorage-2.24.6/bindings/python/libstorage.py
--- old/libstorage-2.24.5/bindings/python/libstorage.py 2013-09-26
11:32:28.000000000 +0200
+++ new/libstorage-2.24.6/bindings/python/libstorage.py 2013-09-30
17:13:08.000000000 +0200
@@ -1,5 +1,5 @@
# This file was automatically generated by SWIG (http://www.swig.org).
-# Version 2.0.7
+# Version 2.0.9
#
# Do not make changes to this file unless you know what you are doing--modify
# the SWIG interface file instead.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/bindings/ruby/Makefile.am
new/libstorage-2.24.6/bindings/ruby/Makefile.am
--- old/libstorage-2.24.5/bindings/ruby/Makefile.am 2013-01-22
11:28:07.000000000 +0100
+++ new/libstorage-2.24.6/bindings/ruby/Makefile.am 2013-09-30
17:10:18.000000000 +0200
@@ -4,7 +4,7 @@
SUBDIRS = examples
-EXTRA_DIST = storage.i enum_ref.i
+EXTRA_DIST = storage.i enum_ref.i storage_utf8.rb
MAINTAINERCLEANFILES = storage_wrap.cxx
@@ -35,4 +35,7 @@
storage_wrap.cxx: storage.i $(DEPENDENCIES)
swig -o storage_wrap.cxx -c++ -ruby ${INCLUDES} storage.i
+install-data-hook:
+ $(INSTALL) storage_utf8.rb $(DESTDIR)/$(RUBY_VENDOR_DIR)
+
CLEANFILES = storage.so storage_wrap.cxx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/bindings/ruby/Makefile.in
new/libstorage-2.24.6/bindings/ruby/Makefile.in
--- old/libstorage-2.24.5/bindings/ruby/Makefile.in 2013-09-26
11:20:08.000000000 +0200
+++ new/libstorage-2.24.6/bindings/ruby/Makefile.in 2013-10-08
14:03:49.000000000 +0200
@@ -252,8 +252,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
@@ -319,7 +321,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = examples
-EXTRA_DIST = storage.i enum_ref.i
+EXTRA_DIST = storage.i enum_ref.i storage_utf8.rb
MAINTAINERCLEANFILES = storage_wrap.cxx
BUILT_SOURCES = storage_wrap.cxx
rubyextensiondirdir = $(RUBY_EXTENSION_DIR)
@@ -724,7 +726,8 @@
info-am:
install-data-am: install-rubyextensiondirLTLIBRARIES
-
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
install-dvi: install-dvi-recursive
install-dvi-am:
@@ -773,7 +776,7 @@
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
cscopelist-recursive ctags-recursive install install-am \
- install-strip tags-recursive
+ install-data-am install-strip tags-recursive
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic clean-libtool \
@@ -781,21 +784,24 @@
cscopelist-recursive ctags ctags-recursive distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-rubyextensiondirLTLIBRARIES install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
- uninstall-rubyextensiondirLTLIBRARIES
+ install install-am install-data install-data-am \
+ install-data-hook install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-rubyextensiondirLTLIBRARIES \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-rubyextensiondirLTLIBRARIES
storage_wrap.cxx: storage.i $(DEPENDENCIES)
swig -o storage_wrap.cxx -c++ -ruby ${INCLUDES} storage.i
+install-data-hook:
+ $(INSTALL) storage_utf8.rb $(DESTDIR)/$(RUBY_VENDOR_DIR)
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/bindings/ruby/examples/Makefile.in
new/libstorage-2.24.6/bindings/ruby/examples/Makefile.in
--- old/libstorage-2.24.5/bindings/ruby/examples/Makefile.in 2013-09-26
11:20:08.000000000 +0200
+++ new/libstorage-2.24.6/bindings/ruby/examples/Makefile.in 2013-10-08
14:03:49.000000000 +0200
@@ -183,8 +183,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/bindings/ruby/storage_utf8.rb
new/libstorage-2.24.6/bindings/ruby/storage_utf8.rb
--- old/libstorage-2.24.5/bindings/ruby/storage_utf8.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/libstorage-2.24.6/bindings/ruby/storage_utf8.rb 2013-09-30
17:10:18.000000000 +0200
@@ -0,0 +1,33 @@
+require "storage"
+
+module Storage
+ class << self
+ def convert_encoding value
+ case value
+ when String
+ value.force_encoding("UTF-8")
+ when Hash
+ value.keys.each do |key|
+ old_val = value.delete[key]
+ value[convert_encoding(key)] = convert_encoding(old_val)
+ end
+ value
+ when Array
+ value.map { |e| convert_encoding(e) }
+ else
+ value
+ end
+ end
+
+ public_instance_methods.each do |method|
+ # skip convert method
+ next if method == :convert_encoding
+ # skip common ruby object methods
+ next if Object.methods.include? method
+ alias_method (method.to_s + "_unconverted").to_sym, method
+ define_method(method) do |*args|
+ convert_encoding send((method.to_s + "_unconverted").to_sym, *args)
+ end
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/configure
new/libstorage-2.24.6/configure
--- old/libstorage-2.24.5/configure 2013-09-26 11:20:06.000000000 +0200
+++ new/libstorage-2.24.6/configure 2013-10-08 14:03:48.000000000 +0200
@@ -637,7 +637,9 @@
RUBY_ARCH_NAME
RUBY_SHARED_LIB
RUBY_SO_NAME
+RUBY_VENDOR_DIR
RUBY_EXTENSION_DIR
+RUBY_LIB_DIR
RUBY_INCLUDE_DIR
RUBY_BIN_DIR
RUBY_VERSION
@@ -15235,6 +15237,8 @@
RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts Config::CONFIG["vendorarchdir"]'`
+RUBY_VENDOR_DIR=`$RUBY -rrbconfig -e 'puts Config::CONFIG["vendordir"]'`
+
RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts Config::CONFIG["RUBY_SO_NAME"]'`
RUBY_SHARED_LIB=`$RUBY -rrbconfig -e 'puts Config::CONFIG["LIBRUBY"]'`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/configure.in
new/libstorage-2.24.6/configure.in
--- old/libstorage-2.24.5/configure.in 2013-01-22 11:28:07.000000000 +0100
+++ new/libstorage-2.24.6/configure.in 2013-09-30 17:10:18.000000000 +0200
@@ -59,9 +59,11 @@
fi
AC_SUBST(RUBY_INCLUDE_DIR)
RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["libdir"]]'`
-AC_SUBST(RUBY_EXTENSION_DIR)
+AC_SUBST(RUBY_LIB_DIR)
RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts
Config::CONFIG[["vendorarchdir"]]'`
AC_SUBST(RUBY_EXTENSION_DIR)
+RUBY_VENDOR_DIR=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["vendordir"]]'`
+AC_SUBST(RUBY_VENDOR_DIR)
RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["RUBY_SO_NAME"]]'`
AC_SUBST(RUBY_SO_NAME)
RUBY_SHARED_LIB=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["LIBRUBY"]]'`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/data/Makefile.in
new/libstorage-2.24.6/data/Makefile.in
--- old/libstorage-2.24.5/data/Makefile.in 2013-09-26 11:20:08.000000000
+0200
+++ new/libstorage-2.24.6/data/Makefile.in 2013-10-08 14:03:49.000000000
+0200
@@ -183,8 +183,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/doc/Makefile.in
new/libstorage-2.24.6/doc/Makefile.in
--- old/libstorage-2.24.5/doc/Makefile.in 2013-09-26 11:20:08.000000000
+0200
+++ new/libstorage-2.24.6/doc/Makefile.in 2013-10-08 14:03:49.000000000
+0200
@@ -193,8 +193,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/doc/autodocs/Makefile.in
new/libstorage-2.24.6/doc/autodocs/Makefile.in
--- old/libstorage-2.24.5/doc/autodocs/Makefile.in 2013-09-26
11:20:08.000000000 +0200
+++ new/libstorage-2.24.6/doc/autodocs/Makefile.in 2013-10-08
14:03:49.000000000 +0200
@@ -183,8 +183,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/examples/Makefile.in
new/libstorage-2.24.6/examples/Makefile.in
--- old/libstorage-2.24.5/examples/Makefile.in 2013-09-26 11:20:09.000000000
+0200
+++ new/libstorage-2.24.6/examples/Makefile.in 2013-10-08 14:03:49.000000000
+0200
@@ -283,8 +283,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/libstorage.spec.in
new/libstorage-2.24.6/libstorage.spec.in
--- old/libstorage-2.24.5/libstorage.spec.in 2013-02-21 16:06:32.000000000
+0100
+++ new/libstorage-2.24.6/libstorage.spec.in 2013-10-07 10:01:12.000000000
+0200
@@ -43,6 +43,7 @@
%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} ||
0%{?fedora} || 0%{?rhel}
%{!?ruby_sitelib: %global ruby_sitelib %(ruby -r rbconfig -e 'vd =
Config::CONFIG["vendorlibdir"]; print(vd ? vd : Config::CONFIG["sitelibdir"])')}
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -r rbconfig -e 'vad =
Config::CONFIG["vendorarchdir"]; print(vad ? vad :
Config::CONFIG["sitearchdir"])')}
+%{!?ruby_vendor: %global ruby_vendor %(ruby -r rbconfig -e 'vad =
Config::CONFIG["vendor"]; print(vad ? vad : Config::CONFIG["vendor"])')}
%endif
%endif
@@ -214,6 +215,7 @@
%else
%{rb_vendorarch}/storage.so
%endif
+%{rb_vendordir}/storage_utf8.rb
%endif
%if 0%{?mandriva_version}
%{ruby_sitearchdir}/storage.so
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/po/Makefile.in
new/libstorage-2.24.6/po/Makefile.in
--- old/libstorage-2.24.5/po/Makefile.in 2013-09-26 11:20:09.000000000
+0200
+++ new/libstorage-2.24.6/po/Makefile.in 2013-10-08 14:03:49.000000000
+0200
@@ -153,8 +153,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/storage/Makefile.in
new/libstorage-2.24.6/storage/Makefile.in
--- old/libstorage-2.24.5/storage/Makefile.in 2013-09-26 11:20:09.000000000
+0200
+++ new/libstorage-2.24.6/storage/Makefile.in 2013-10-08 14:03:49.000000000
+0200
@@ -247,8 +247,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/storage/Md.cc
new/libstorage-2.24.6/storage/Md.cc
--- old/libstorage-2.24.5/storage/Md.cc 2013-09-25 17:06:50.000000000 +0200
+++ new/libstorage-2.24.6/storage/Md.cc 2013-09-30 17:10:10.000000000 +0200
@@ -145,7 +145,7 @@
: Volume(c, v), md_type(v.md_type), md_parity(v.md_parity),
chunk_k(v.chunk_k), md_uuid(v.md_uuid), md_name(v.md_name),
sb_ver(v.sb_ver), destrSb(v.destrSb), devs(v.devs), spare(v.spare),
- udev_id(udev_id),
+ udev_id(v.udev_id),
has_container(v.has_container), inactive(v.inactive),
parent_container(v.parent_container),
parent_uuid(v.parent_uuid), parent_md_name(v.parent_md_name),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/storage/Parted.cc
new/libstorage-2.24.6/storage/Parted.cc
--- old/libstorage-2.24.5/storage/Parted.cc 2013-01-22 11:28:07.000000000
+0100
+++ new/libstorage-2.24.6/storage/Parted.cc 2013-10-07 10:01:12.000000000
+0200
@@ -90,6 +90,22 @@
y2mil("device:" << device << " label:" << label << " geometry:" <<
geometry <<
" gpt_enlarge:" << gpt_enlarge);
+ iterator prev = entries.begin();
+ iterator it = prev;
+ if( it!=entries.end())
+ ++it;
+ while(it!=entries.end())
+ {
+ if( prev->cylRegion.start()>=it->cylRegion.start() &&
it->cylRegion.len()>0 )
+ {
+ y2mil("old:" << it->cylRegion );
+ it->cylRegion.setStart(it->cylRegion.start()+1);
+ it->cylRegion.setLen(it->cylRegion.len()-1);
+ y2mil("new:" << it->cylRegion );
+ }
+ prev = it;
+ ++it;
+ }
for (const_iterator it = entries.begin(); it != entries.end(); ++it)
y2mil(*it);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/storage/Volume.cc
new/libstorage-2.24.6/storage/Volume.cc
--- old/libstorage-2.24.5/storage/Volume.cc 2013-09-25 17:06:50.000000000
+0200
+++ new/libstorage-2.24.6/storage/Volume.cc 2013-10-07 10:01:12.000000000
+0200
@@ -3286,7 +3286,14 @@
}
else
{
- if (encryption == ENC_NONE)
+ const Partition* p = dynamic_cast<const Partition*>(this);
+ if (p && p->id()==Partition::ID_GPT_BIOS)
+ {
+ // displayed text before action, %1$s is replaced by device
name e.g. /dev/hda1
+ // %2$s is replaced by size (e.g. 623.5 MB)
+ txt = sformat(_("Create BIOS grub volume %1$s (%2$s)"),
dev.c_str(), sizeString().c_str());
+ }
+ else if (encryption == ENC_NONE)
{
// displayed text before action, %1$s is replaced by device
name e.g. /dev/hda1
// %2$s is replaced by size (e.g. 623.5 MB)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/storage/gen_md5sum.cc
new/libstorage-2.24.6/storage/gen_md5sum.cc
--- old/libstorage-2.24.5/storage/gen_md5sum.cc 2013-09-26 11:25:49.000000000
+0200
+++ new/libstorage-2.24.6/storage/gen_md5sum.cc 2013-10-08 14:03:37.000000000
+0200
@@ -1,5 +1,5 @@
-#define SOURCES_MD5SUM "310fb3595c8b2740efd1d5c877a7ffec"
-#define SOURCES_MD5_DATE " Thu Sep 26 11:25:49 CEST 2013 "
+#define SOURCES_MD5SUM "8fc92097a695b3ea52572b4233dc2390"
+#define SOURCES_MD5_DATE " Tue 8 Oct 14:03:37 CEST 2013 "
namespace storage
{
const char* GetSourceMd5() { return SOURCES_MD5SUM; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/testsuite/Makefile.in
new/libstorage-2.24.6/testsuite/Makefile.in
--- old/libstorage-2.24.5/testsuite/Makefile.in 2013-09-26 11:20:09.000000000
+0200
+++ new/libstorage-2.24.6/testsuite/Makefile.in 2013-10-08 14:03:49.000000000
+0200
@@ -398,8 +398,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/testsuite/config/Makefile.in
new/libstorage-2.24.6/testsuite/config/Makefile.in
--- old/libstorage-2.24.5/testsuite/config/Makefile.in 2013-09-26
11:20:09.000000000 +0200
+++ new/libstorage-2.24.6/testsuite/config/Makefile.in 2013-10-08
14:03:49.000000000 +0200
@@ -153,8 +153,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/testsuite/data/Makefile.in
new/libstorage-2.24.6/testsuite/data/Makefile.in
--- old/libstorage-2.24.5/testsuite/data/Makefile.in 2013-09-26
11:20:09.000000000 +0200
+++ new/libstorage-2.24.6/testsuite/data/Makefile.in 2013-10-08
14:03:49.000000000 +0200
@@ -193,8 +193,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/testsuite/data/empty/Makefile.in
new/libstorage-2.24.6/testsuite/data/empty/Makefile.in
--- old/libstorage-2.24.5/testsuite/data/empty/Makefile.in 2013-09-26
11:20:09.000000000 +0200
+++ new/libstorage-2.24.6/testsuite/data/empty/Makefile.in 2013-10-08
14:03:49.000000000 +0200
@@ -153,8 +153,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-2.24.5/testsuite/data/scandium/Makefile.in
new/libstorage-2.24.6/testsuite/data/scandium/Makefile.in
--- old/libstorage-2.24.5/testsuite/data/scandium/Makefile.in 2013-09-26
11:20:09.000000000 +0200
+++ new/libstorage-2.24.6/testsuite/data/scandium/Makefile.in 2013-10-08
14:03:49.000000000 +0200
@@ -153,8 +153,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-2.24.5/testsuite/data/thalassa/Makefile.in
new/libstorage-2.24.6/testsuite/data/thalassa/Makefile.in
--- old/libstorage-2.24.5/testsuite/data/thalassa/Makefile.in 2013-09-26
11:20:09.000000000 +0200
+++ new/libstorage-2.24.6/testsuite/data/thalassa/Makefile.in 2013-10-08
14:03:49.000000000 +0200
@@ -153,8 +153,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/testsuite/lib/Makefile.in
new/libstorage-2.24.6/testsuite/lib/Makefile.in
--- old/libstorage-2.24.5/testsuite/lib/Makefile.in 2013-09-26
11:20:10.000000000 +0200
+++ new/libstorage-2.24.6/testsuite/lib/Makefile.in 2013-10-08
14:03:49.000000000 +0200
@@ -153,8 +153,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-2.24.5/testsuite/libstorage.test/Makefile.in
new/libstorage-2.24.6/testsuite/libstorage.test/Makefile.in
--- old/libstorage-2.24.5/testsuite/libstorage.test/Makefile.in 2013-09-26
11:20:10.000000000 +0200
+++ new/libstorage-2.24.6/testsuite/libstorage.test/Makefile.in 2013-10-08
14:03:49.000000000 +0200
@@ -153,8 +153,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/testsuite/single.out/Makefile.in
new/libstorage-2.24.6/testsuite/single.out/Makefile.in
--- old/libstorage-2.24.5/testsuite/single.out/Makefile.in 2013-09-26
11:20:10.000000000 +0200
+++ new/libstorage-2.24.6/testsuite/single.out/Makefile.in 2013-10-08
14:03:49.000000000 +0200
@@ -153,8 +153,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.24.5/testsuite-real/Makefile.in
new/libstorage-2.24.6/testsuite-real/Makefile.in
--- old/libstorage-2.24.5/testsuite-real/Makefile.in 2013-09-26
11:20:09.000000000 +0200
+++ new/libstorage-2.24.6/testsuite-real/Makefile.in 2013-10-08
14:03:49.000000000 +0200
@@ -242,8 +242,10 @@
RUBY_BIN_DIR = @RUBY_BIN_DIR@
RUBY_EXTENSION_DIR = @RUBY_EXTENSION_DIR@
RUBY_INCLUDE_DIR = @RUBY_INCLUDE_DIR@
+RUBY_LIB_DIR = @RUBY_LIB_DIR@
RUBY_SHARED_LIB = @RUBY_SHARED_LIB@
RUBY_SO_NAME = @RUBY_SO_NAME@
+RUBY_VENDOR_DIR = @RUBY_VENDOR_DIR@
RUBY_VERSION = @RUBY_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
