Hello community,
here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2012-05-08 11:14:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libstorage (Old)
and /work/SRC/openSUSE:Factory/.libstorage.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage", Maintainer is "ASchnell@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2012-03-22 12:35:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2012-05-08 11:14:58.000000000 +0200
@@ -1,0 +2,19 @@
+Wed May 2 18:08:06 CEST 2012 - fehr@suse.de
+
+- 2.22.2
+- add code to support resizing of a btrfs volume (bnc#731753)
+
+-------------------------------------------------------------------
+Thu Apr 5 11:59:15 CEST 2012 - fehr@suse.de
+
+- suppress dm maps for "-real" and "-cow" of LVM snapshots in
+ general Dm container
+- fix order of LV removals in removeVg when snapshots are present
+ (bnc#755021)
+
+-------------------------------------------------------------------
+Mon Apr 02 16:11:03 CEST 2012 - aschnell@suse.de
+
+- calculate max_primary for artificial XEN disks (bnc#754649)
+
+-------------------------------------------------------------------
Old:
----
libstorage-2.22.1.tar.bz2
New:
----
libstorage-2.22.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage.spec ++++++
--- /var/tmp/diff_new_pack.Wdw6XM/_old 2012-05-08 11:14:59.000000000 +0200
+++ /var/tmp/diff_new_pack.Wdw6XM/_new 2012-05-08 11:14:59.000000000 +0200
@@ -15,27 +15,46 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: libstorage
-Version: 2.22.1
+Version: 2.22.2
Release: 0
-License: GPL-2.0
-Group: System/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: libstorage-%{version}.tar.bz2
Prefix: /usr
-BuildRequires: blocxx-devel boost-devel dejagnu doxygen gcc-c++ libtool libxml2-devel python-devel ruby-devel swig
+BuildRequires: blocxx-devel
+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
Summary: Library for storage management
+License: GPL-2.0
+Group: System/Libraries
Url: http://en.opensuse.org/Portal:Libstorage
%description
This package contains libstorage, a library for storage management.
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?py_requires: %global py_requires Requires: python}
+
+%if 0%{?ruby_sitelib} == 0
+%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"])')}
+%endif
+%endif
+
%prep
%setup -n libstorage-%{version}
@@ -50,6 +69,14 @@
autoconf
%{?suse_update_config:%{suse_update_config -f}}
+%if 0%{?fedora_version} || 0%{?centos_version}
+CXXFLAGS="-I/usr/include/libxml2" \
+%else
+%if 0%{?rhel_version} >= 500 && 0%{?rhel_version} < 600
+CXXFLAGS="-I/usr/include/libxml2 -I/usr/include/c++/4.1.1/tr1" \
+%endif
+%endif
+
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} --disable-silent-rules
make %{?jobs:-j%jobs}
@@ -76,19 +103,34 @@
%if 0%{?mandriva_version}
rm $RPM_BUILD_ROOT/%{ruby_sitearchdir}/storage.la
%endif
+%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
+rm $RPM_BUILD_ROOT/%{ruby_sitearch}/storage.la
+%endif
%clean
rm -rf "$RPM_BUILD_ROOT"
%package -n libstorage3
-Requires: parted >= 2.2 mdadm device-mapper lvm2 dmraid multipath-tools cryptsetup
-Requires: coreutils udev util-linux >= 2.16 grep lsscsi
+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
%ifarch s390 s390x
Requires: s390-tools
%endif
+%if 0%{?suse_version}
PreReq: %fillup_prereq
+%endif
Obsoletes: yast2-storage-lib
Provides: yast2-storage-lib
Obsoletes: libstorage < 2.21.2
@@ -115,15 +157,21 @@
%post -n libstorage3
/sbin/ldconfig
+%if 0%{?suse_version}
%{fillup_only -an storage}
+%endif
%postun -n libstorage3
/sbin/ldconfig
%package -n libstorage-devel
+Requires: blocxx-devel
+Requires: boost-devel
+Requires: gcc-c++
+Requires: libstdc++-devel
Requires: libstorage3 = %version
-Requires: gcc-c++ libstdc++-devel boost-devel blocxx-devel libxml2-devel
+Requires: libxml2-devel
Summary: Header files and documentation for libstorage
Group: Development/Languages/C and C++
@@ -147,6 +195,7 @@
%package -n libstorage-python
Requires: libstorage3 = %version
+%{py_requires}
Summary: Python bindings for libstorage
Group: System/Libraries
@@ -184,6 +233,9 @@
%if 0%{?mandriva_version}
%{ruby_sitearchdir}/storage.so
%endif
+%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
+%{ruby_sitearch}/storage.so
+%endif
%package -n libstorage-testsuite
++++++ libstorage-2.22.1.tar.bz2 -> libstorage-2.22.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.22.1/VERSION new/libstorage-2.22.2/VERSION
--- old/libstorage-2.22.1/VERSION 2012-03-15 17:18:28.000000000 +0100
+++ new/libstorage-2.22.2/VERSION 2012-05-02 18:10:55.000000000 +0200
@@ -1 +1 @@
-2.22.1
+2.22.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.22.1/bindings/python/libstorage.py new/libstorage-2.22.2/bindings/python/libstorage.py
--- old/libstorage-2.22.1/bindings/python/libstorage.py 2012-03-15 17:20:23.000000000 +0100
+++ new/libstorage-2.22.2/bindings/python/libstorage.py 2012-05-02 18:11:53.000000000 +0200
@@ -1483,6 +1483,8 @@
BTRFS_EXTEND_FAIL = _libstorage.BTRFS_EXTEND_FAIL
BTRFS_REDUCE_FAIL = _libstorage.BTRFS_REDUCE_FAIL
BTRFS_LIST_EMPTY = _libstorage.BTRFS_LIST_EMPTY
+BTRFS_RESIZE_INVALID_VOLUME = _libstorage.BTRFS_RESIZE_INVALID_VOLUME
+BTRFS_MULTIDEV_SHRINK_UNSUPPORTED = _libstorage.BTRFS_MULTIDEV_SHRINK_UNSUPPORTED
TMPFS_REMOVE_INVALID_VOLUME = _libstorage.TMPFS_REMOVE_INVALID_VOLUME
TMPFS_REMOVE_NO_TMPFS = _libstorage.TMPFS_REMOVE_NO_TMPFS
TMPFS_REMOVE_NOT_FOUND = _libstorage.TMPFS_REMOVE_NOT_FOUND
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.22.1/bindings/ruby/storage_wrap.cxx new/libstorage-2.22.2/bindings/ruby/storage_wrap.cxx
--- old/libstorage-2.22.1/bindings/ruby/storage_wrap.cxx 2012-03-15 17:20:50.000000000 +0100
+++ new/libstorage-2.22.2/bindings/ruby/storage_wrap.cxx 2012-05-02 18:11:57.000000000 +0200
@@ -38440,6 +38440,8 @@
rb_define_const(mStorage, "BTRFS_EXTEND_FAIL", SWIG_From_int(static_cast< int >(storage::BTRFS_EXTEND_FAIL)));
rb_define_const(mStorage, "BTRFS_REDUCE_FAIL", SWIG_From_int(static_cast< int >(storage::BTRFS_REDUCE_FAIL)));
rb_define_const(mStorage, "BTRFS_LIST_EMPTY", SWIG_From_int(static_cast< int >(storage::BTRFS_LIST_EMPTY)));
+ rb_define_const(mStorage, "BTRFS_RESIZE_INVALID_VOLUME", SWIG_From_int(static_cast< int >(storage::BTRFS_RESIZE_INVALID_VOLUME)));
+ rb_define_const(mStorage, "BTRFS_MULTIDEV_SHRINK_UNSUPPORTED", SWIG_From_int(static_cast< int >(storage::BTRFS_MULTIDEV_SHRINK_UNSUPPORTED)));
rb_define_const(mStorage, "TMPFS_REMOVE_INVALID_VOLUME", SWIG_From_int(static_cast< int >(storage::TMPFS_REMOVE_INVALID_VOLUME)));
rb_define_const(mStorage, "TMPFS_REMOVE_NO_TMPFS", SWIG_From_int(static_cast< int >(storage::TMPFS_REMOVE_NO_TMPFS)));
rb_define_const(mStorage, "TMPFS_REMOVE_NOT_FOUND", SWIG_From_int(static_cast< int >(storage::TMPFS_REMOVE_NOT_FOUND)));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.22.1/libstorage.spec.in new/libstorage-2.22.2/libstorage.spec.in
--- old/libstorage-2.22.1/libstorage.spec.in 2012-03-15 17:17:46.000000000 +0100
+++ new/libstorage-2.22.2/libstorage.spec.in 2012-04-25 11:40:29.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libstorage
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,8 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: libstorage
Version: @VERSION@
@@ -28,7 +26,8 @@
Prefix: /usr
-BuildRequires: blocxx-devel boost-devel dejagnu doxygen gcc-c++ libtool libxml2-devel python-devel ruby-devel swig
+BuildRequires: blocxx-devel boost-devel dejagnu doxygen gcc-c++ libtool libxml2-devel python-devel swig
+BuildRequires: ruby ruby-devel
Summary: Library for storage management
Url: http://en.opensuse.org/Portal:Libstorage
@@ -36,6 +35,17 @@
%description
This package contains libstorage, a library for storage management.
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?py_requires: %global py_requires Requires: python}
+
+%if 0%{?ruby_sitelib} == 0
+%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"])')}
+%endif
+%endif
+
%prep
%setup -n libstorage-%{version}
@@ -50,6 +60,14 @@
autoconf
%{?suse_update_config:%{suse_update_config -f}}
+%if 0%{?fedora_version} || 0%{?centos_version}
+CXXFLAGS="-I/usr/include/libxml2" \
+%else
+%if 0%{?rhel_version} >= 500 && 0%{?rhel_version} < 600
+CXXFLAGS="-I/usr/include/libxml2 -I/usr/include/c++/4.1.1/tr1" \
+%endif
+%endif
+
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} --disable-silent-rules
make %{?jobs:-j%jobs}
@@ -76,6 +94,9 @@
%if 0%{?mandriva_version}
rm $RPM_BUILD_ROOT/%{ruby_sitearchdir}/storage.la
%endif
+%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
+rm $RPM_BUILD_ROOT/%{ruby_sitearch}/storage.la
+%endif
%clean
rm -rf "$RPM_BUILD_ROOT"
@@ -88,7 +109,9 @@
Requires: s390-tools
%endif
+%if 0%{?suse_version}
PreReq: %fillup_prereq
+%endif
Obsoletes: yast2-storage-lib
Provides: yast2-storage-lib
Obsoletes: libstorage < 2.21.2
@@ -115,7 +138,9 @@
%post -n libstorage@LIBVERSION_MAJOR@
/sbin/ldconfig
+%if 0%{?suse_version}
%{fillup_only -an storage}
+%endif
%postun -n libstorage@LIBVERSION_MAJOR@
/sbin/ldconfig
@@ -147,6 +172,7 @@
%package -n libstorage-python
Requires: libstorage@LIBVERSION_MAJOR@ = %version
+%{py_requires}
Summary: Python bindings for libstorage
Group: System/Libraries
@@ -184,6 +210,9 @@
%if 0%{?mandriva_version}
%{ruby_sitearchdir}/storage.so
%endif
+%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
+%{ruby_sitearch}/storage.so
+%endif
%package -n libstorage-testsuite
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.22.1/storage/BtrfsCo.cc new/libstorage-2.22.2/storage/BtrfsCo.cc
--- old/libstorage-2.22.1/storage/BtrfsCo.cc 2012-03-15 17:17:46.000000000 +0100
+++ new/libstorage-2.22.2/storage/BtrfsCo.cc 2012-04-05 12:47:17.000000000 +0200
@@ -496,6 +496,38 @@
}
}
+int BtrfsCo::resizeVolume( Volume* v, Container* r_co,
+ Volume* r_v, unsigned long long newSize )
+ {
+ int ret = 0;
+ Btrfs *b = dynamic_cast