Hello community,
here is the log from the commit of package libstorage for openSUSE:Factory
checked in at Mon Jul 11 09:00:24 CEST 2011.
--------
--- libstorage/libstorage.changes 2011-06-17 11:09:36.000000000 +0200
+++ /mounts/work_src_done/STABLE/libstorage/libstorage.changes 2011-07-08
14:20:26.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Jul 6 19:04:10 CEST 2011 - f...@suse.de
+
+- fix bug when setting mount point and changing fstype from
+ non-btrfs to btrfs and vice versa
+
+-------------------------------------------------------------------
+Tue Jul 05 14:53:34 CEST 2011 - aschn...@suse.de
+
+- provide defines with version info
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage.spec ++++++
--- /var/tmp/diff_new_pack.XxA6jo/_old 2011-07-11 08:59:22.000000000 +0200
+++ /var/tmp/diff_new_pack.XxA6jo/_new 2011-07-11 08:59:22.000000000 +0200
@@ -20,7 +20,7 @@
Name: libstorage
Version: 2.21.3
-Release: 3
+Release: 5
License: GPL
Group: System/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -31,6 +31,7 @@
BuildRequires: blocxx-devel boost-devel dejagnu doxygen gcc-c++ libxml2-devel
python-devel swig
Summary: Library for storage management
+Url: http://en.opensuse.org/Portal:Libstorage
%description
This package contains libstorage, a library for storage management.
++++++ libstorage-2.21.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/Makefile.in
new/libstorage-2.21.3/Makefile.in
--- old/libstorage-2.21.3/Makefile.in 2011-06-17 11:05:03.000000000 +0200
+++ new/libstorage-2.21.3/Makefile.in 2011-07-08 14:19:37.000000000 +0200
@@ -175,8 +175,11 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/bindings/Makefile.in
new/libstorage-2.21.3/bindings/Makefile.in
--- old/libstorage-2.21.3/bindings/Makefile.in 2011-06-17 11:05:02.000000000
+0200
+++ new/libstorage-2.21.3/bindings/Makefile.in 2011-07-08 14:19:36.000000000
+0200
@@ -135,8 +135,11 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/bindings/python/Makefile.in
new/libstorage-2.21.3/bindings/python/Makefile.in
--- old/libstorage-2.21.3/bindings/python/Makefile.in 2011-06-17
11:05:02.000000000 +0200
+++ new/libstorage-2.21.3/bindings/python/Makefile.in 2011-07-08
14:19:36.000000000 +0200
@@ -153,8 +153,11 @@
LIBOBJS = @LIBOBJS@
LIBS = $(top_builddir)/storage/libstorage.la
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/configure
new/libstorage-2.21.3/configure
--- old/libstorage-2.21.3/configure 2011-06-17 11:05:01.000000000 +0200
+++ new/libstorage-2.21.3/configure 2011-07-08 14:19:35.000000000 +0200
@@ -755,7 +755,10 @@
LIBOBJS
fillupdir
LIBVERSION_INFO
+LIBVERSION_PATCHLEVEL
+LIBVERSION_MINOR
LIBVERSION_MAJOR
+LIBVERSION
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
pkgpyexecdir
@@ -4963,13 +4966,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4966: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4969: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4969: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4972: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4972: output\"" >&5)
+ (eval echo "\"\$as_me:4975: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6175,7 +6178,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6178 "configure"' > conftest.$ac_ext
+ echo '#line 6181 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8197,11 +8200,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8200: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8203: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8204: \$? = $ac_status" >&5
+ echo "$as_me:8207: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8536,11 +8539,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8539: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8542: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8543: \$? = $ac_status" >&5
+ echo "$as_me:8546: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8641,11 +8644,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8644: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8647: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8648: \$? = $ac_status" >&5
+ echo "$as_me:8651: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8696,11 +8699,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8699: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8702: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8703: \$? = $ac_status" >&5
+ echo "$as_me:8706: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11064,7 +11067,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11067 "configure"
+#line 11070 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11160,7 +11163,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11163 "configure"
+#line 11166 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13116,11 +13119,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13119: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13122: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13123: \$? = $ac_status" >&5
+ echo "$as_me:13126: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13215,11 +13218,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13218: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13221: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13222: \$? = $ac_status" >&5
+ echo "$as_me:13225: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13267,11 +13270,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13270: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13273: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13274: \$? = $ac_status" >&5
+ echo "$as_me:13277: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14422,7 +14425,10 @@
-ac_config_files="$ac_config_files Makefile doc/Makefile doc/autodocs/Makefile
storage/Makefile bindings/Makefile bindings/python/Makefile data/Makefile
po/Makefile examples/Makefile testsuite/Makefile testsuite/lib/Makefile
testsuite/config/Makefile testsuite/libstorage.test/Makefile
testsuite/single.out/Makefile testsuite/data/Makefile
testsuite/data/thalassa/Makefile testsuite/data/scandium/Makefile
testsuite/data/empty/Makefile testsuite-real/Makefile
package/libstorage.spec:libstorage.spec.in"
+
+
+
+ac_config_files="$ac_config_files Makefile doc/Makefile doc/autodocs/Makefile
storage/Makefile storage/StorageVersion.h:storage/StorageVersion.h.in
bindings/Makefile bindings/python/Makefile data/Makefile po/Makefile
examples/Makefile testsuite/Makefile testsuite/lib/Makefile
testsuite/config/Makefile testsuite/libstorage.test/Makefile
testsuite/single.out/Makefile testsuite/data/Makefile
testsuite/data/thalassa/Makefile testsuite/data/scandium/Makefile
testsuite/data/empty/Makefile testsuite-real/Makefile
package/libstorage.spec:libstorage.spec.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -15519,6 +15525,7 @@
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"doc/autodocs/Makefile") CONFIG_FILES="$CONFIG_FILES
doc/autodocs/Makefile" ;;
"storage/Makefile") CONFIG_FILES="$CONFIG_FILES storage/Makefile" ;;
+ "storage/StorageVersion.h") CONFIG_FILES="$CONFIG_FILES
storage/StorageVersion.h:storage/StorageVersion.h.in" ;;
"bindings/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/Makefile" ;;
"bindings/python/Makefile") CONFIG_FILES="$CONFIG_FILES
bindings/python/Makefile" ;;
"data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/configure.in
new/libstorage-2.21.3/configure.in
--- old/libstorage-2.21.3/configure.in 2011-05-25 18:08:02.000000000 +0200
+++ new/libstorage-2.21.3/configure.in 2011-07-05 14:30:32.000000000 +0200
@@ -36,7 +36,10 @@
fillupdir=/var/adm/fillup-templates
AC_SUBST(VERSION)
+AC_SUBST(LIBVERSION)
AC_SUBST(LIBVERSION_MAJOR)
+AC_SUBST(LIBVERSION_MINOR)
+AC_SUBST(LIBVERSION_PATCHLEVEL)
AC_SUBST(LIBVERSION_INFO)
AC_SUBST(docdir)
AC_SUBST(fillupdir)
@@ -46,6 +49,7 @@
doc/Makefile
doc/autodocs/Makefile
storage/Makefile
+ storage/StorageVersion.h:storage/StorageVersion.h.in
bindings/Makefile
bindings/python/Makefile
data/Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/data/Makefile.in
new/libstorage-2.21.3/data/Makefile.in
--- old/libstorage-2.21.3/data/Makefile.in 2011-06-17 11:05:02.000000000
+0200
+++ new/libstorage-2.21.3/data/Makefile.in 2011-07-08 14:19:36.000000000
+0200
@@ -119,8 +119,11 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/doc/Makefile.in
new/libstorage-2.21.3/doc/Makefile.in
--- old/libstorage-2.21.3/doc/Makefile.in 2011-06-17 11:05:02.000000000
+0200
+++ new/libstorage-2.21.3/doc/Makefile.in 2011-07-08 14:19:36.000000000
+0200
@@ -135,8 +135,11 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/doc/autodocs/Makefile.in
new/libstorage-2.21.3/doc/autodocs/Makefile.in
--- old/libstorage-2.21.3/doc/autodocs/Makefile.in 2011-06-17
11:05:02.000000000 +0200
+++ new/libstorage-2.21.3/doc/autodocs/Makefile.in 2011-07-08
14:19:36.000000000 +0200
@@ -119,8 +119,11 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/examples/Makefile.in
new/libstorage-2.21.3/examples/Makefile.in
--- old/libstorage-2.21.3/examples/Makefile.in 2011-06-17 11:05:03.000000000
+0200
+++ new/libstorage-2.21.3/examples/Makefile.in 2011-07-08 14:19:36.000000000
+0200
@@ -196,8 +196,11 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/libstorage.spec.in
new/libstorage-2.21.3/libstorage.spec.in
--- old/libstorage-2.21.3/libstorage.spec.in 2011-06-07 11:05:19.000000000
+0200
+++ new/libstorage-2.21.3/libstorage.spec.in 2011-06-17 11:38:28.000000000
+0200
@@ -16,6 +16,7 @@
BuildRequires: gcc-c++ boost-devel blocxx-devel doxygen dejagnu python-devel
swig libxml2-devel
Summary: Library for storage management
+Url: http://en.opensuse.org/Portal:Libstorage
%description
This package contains libstorage, a library for storage management.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/po/Makefile.in
new/libstorage-2.21.3/po/Makefile.in
--- old/libstorage-2.21.3/po/Makefile.in 2011-06-17 11:05:03.000000000
+0200
+++ new/libstorage-2.21.3/po/Makefile.in 2011-07-08 14:19:36.000000000
+0200
@@ -95,8 +95,11 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/storage/Graph.cc
new/libstorage-2.21.3/storage/Graph.cc
--- old/libstorage-2.21.3/storage/Graph.cc 2011-05-25 18:08:02.000000000
+0200
+++ new/libstorage-2.21.3/storage/Graph.cc 2011-06-22 14:09:23.000000000
+0200
@@ -410,7 +410,7 @@
s->getVolumes(volumes);
for (deque<VolumeInfo>::const_iterator i1 = volumes.begin(); i1 !=
volumes.end(); ++i1)
{
- if (!i1->mount.empty() && i1->mount != "swap")
+ if ((!i1->mount.empty() && i1->mount != "swap") && (i1->fs !=
TMPFS))
{
Node mountpoint_node(NODE_MOUNTPOINT, i1->device, i1->mount,
i1->sizeK);
nodes.push_back(mountpoint_node);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/storage/Makefile.am
new/libstorage-2.21.3/storage/Makefile.am
--- old/libstorage-2.21.3/storage/Makefile.am 2011-05-25 18:08:02.000000000
+0200
+++ new/libstorage-2.21.3/storage/Makefile.am 2011-07-05 14:34:45.000000000
+0200
@@ -71,6 +71,7 @@
pkgincludedir = $(includedir)/storage
pkginclude_HEADERS = \
+ StorageVersion.h \
StorageInterface.h \
HumanString.h \
Graph.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/storage/Makefile.in
new/libstorage-2.21.3/storage/Makefile.in
--- old/libstorage-2.21.3/storage/Makefile.in 2011-06-17 11:05:03.000000000
+0200
+++ new/libstorage-2.21.3/storage/Makefile.in 2011-07-08 14:19:36.000000000
+0200
@@ -40,14 +40,14 @@
host_triplet = @host@
subdir = storage
DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.in $(srcdir)/StorageVersion.h.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = StorageVersion.h
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@@ -180,8 +180,11 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -335,6 +338,7 @@
libstorage_la_LDFLAGS = -version-info @LIBVERSION_INFO@
libstorage_la_LIBADD = -lblocxx -lxml2
pkginclude_HEADERS = \
+ StorageVersion.h \
StorageInterface.h \
HumanString.h \
Graph.h
@@ -373,6 +377,8 @@
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+StorageVersion.h: $(top_builddir)/config.status $(srcdir)/StorageVersion.h.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/storage/Storage.cc
new/libstorage-2.21.3/storage/Storage.cc
--- old/libstorage-2.21.3/storage/Storage.cc 2011-06-17 11:04:28.000000000
+0200
+++ new/libstorage-2.21.3/storage/Storage.cc 2011-07-07 12:22:15.000000000
+0200
@@ -1825,7 +1825,7 @@
{
ret = STORAGE_CHANGE_READONLY;
}
- else if( findVolume( partition, cont, vol ) )
+ else if( findVolume( partition, cont, vol, true ) )
{
if( cont->type()==DISK )
{
@@ -1981,7 +1981,7 @@
{
ret = STORAGE_CHANGE_READONLY;
}
- else if( findVolume( partition, cont, vol ) )
+ else if( findVolume( partition, cont, vol, true ) )
{
if( cont->type()==DISK )
{
@@ -2375,8 +2375,8 @@
if( findVolume( device, vol ) && vol->cType()!=BTRFSC )
{
vol->updateFsData();
- vol->changeMount( mp );
vol->clearUsedBy();
+ vol->changeMount( mp );
ret = vol->setFormat( format, fs );
}
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/storage/StorageInterface.h
new/libstorage-2.21.3/storage/StorageInterface.h
--- old/libstorage-2.21.3/storage/StorageInterface.h 2011-06-17
11:04:28.000000000 +0200
+++ new/libstorage-2.21.3/storage/StorageInterface.h 2011-07-05
14:25:34.000000000 +0200
@@ -33,6 +33,9 @@
using std::list;
+#include "storage/StorageVersion.h"
+
+
/*!
* \mainpage libstorage Documentation
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/storage/StorageVersion.h
new/libstorage-2.21.3/storage/StorageVersion.h
--- old/libstorage-2.21.3/storage/StorageVersion.h 1970-01-01
01:00:00.000000000 +0100
+++ new/libstorage-2.21.3/storage/StorageVersion.h 2011-07-08
14:19:41.000000000 +0200
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2011 Novell, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may
+ * find current contact information at www.novell.com.
+ */
+
+
+#ifndef STORAGE_VERSION_H
+#define STORAGE_VERSION_H
+
+
+#define LIBSTORAGE_VERSION_STRING "3.0.0"
+
+#define LIBSTORAGE_VERSION_MAJOR 3
+#define LIBSTORAGE_VERSION_MINOR 0
+#define LIBSTORAGE_VERSION_PATCHLEVEL 0
+
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/storage/StorageVersion.h.in
new/libstorage-2.21.3/storage/StorageVersion.h.in
--- old/libstorage-2.21.3/storage/StorageVersion.h.in 1970-01-01
01:00:00.000000000 +0100
+++ new/libstorage-2.21.3/storage/StorageVersion.h.in 2011-07-05
14:34:01.000000000 +0200
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2011 Novell, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, you may
+ * find current contact information at www.novell.com.
+ */
+
+
+#ifndef STORAGE_VERSION_H
+#define STORAGE_VERSION_H
+
+
+#define LIBSTORAGE_VERSION_STRING "@LIBVERSION@"
+
+#define LIBSTORAGE_VERSION_MAJOR @LIBVERSION_MAJOR@
+#define LIBSTORAGE_VERSION_MINOR @LIBVERSION_MINOR@
+#define LIBSTORAGE_VERSION_PATCHLEVEL @LIBVERSION_PATCHLEVEL@
+
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/testsuite/Makefile.in
new/libstorage-2.21.3/testsuite/Makefile.in
--- old/libstorage-2.21.3/testsuite/Makefile.in 2011-06-17 11:05:03.000000000
+0200
+++ new/libstorage-2.21.3/testsuite/Makefile.in 2011-07-08 14:19:37.000000000
+0200
@@ -332,8 +332,11 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/testsuite/config/Makefile.in
new/libstorage-2.21.3/testsuite/config/Makefile.in
--- old/libstorage-2.21.3/testsuite/config/Makefile.in 2011-06-17
11:05:03.000000000 +0200
+++ new/libstorage-2.21.3/testsuite/config/Makefile.in 2011-07-08
14:19:37.000000000 +0200
@@ -95,8 +95,11 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/testsuite/data/Makefile.in
new/libstorage-2.21.3/testsuite/data/Makefile.in
--- old/libstorage-2.21.3/testsuite/data/Makefile.in 2011-06-17
11:05:03.000000000 +0200
+++ new/libstorage-2.21.3/testsuite/data/Makefile.in 2011-07-08
14:19:37.000000000 +0200
@@ -135,8 +135,11 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/testsuite/data/empty/Makefile.in
new/libstorage-2.21.3/testsuite/data/empty/Makefile.in
--- old/libstorage-2.21.3/testsuite/data/empty/Makefile.in 2011-06-17
11:05:03.000000000 +0200
+++ new/libstorage-2.21.3/testsuite/data/empty/Makefile.in 2011-07-08
14:19:37.000000000 +0200
@@ -95,8 +95,11 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-2.21.3/testsuite/data/scandium/Makefile.in
new/libstorage-2.21.3/testsuite/data/scandium/Makefile.in
--- old/libstorage-2.21.3/testsuite/data/scandium/Makefile.in 2011-06-17
11:05:03.000000000 +0200
+++ new/libstorage-2.21.3/testsuite/data/scandium/Makefile.in 2011-07-08
14:19:37.000000000 +0200
@@ -95,8 +95,11 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-2.21.3/testsuite/data/thalassa/Makefile.in
new/libstorage-2.21.3/testsuite/data/thalassa/Makefile.in
--- old/libstorage-2.21.3/testsuite/data/thalassa/Makefile.in 2011-06-17
11:05:03.000000000 +0200
+++ new/libstorage-2.21.3/testsuite/data/thalassa/Makefile.in 2011-07-08
14:19:37.000000000 +0200
@@ -95,8 +95,11 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/testsuite/lib/Makefile.in
new/libstorage-2.21.3/testsuite/lib/Makefile.in
--- old/libstorage-2.21.3/testsuite/lib/Makefile.in 2011-06-17
11:05:03.000000000 +0200
+++ new/libstorage-2.21.3/testsuite/lib/Makefile.in 2011-07-08
14:19:37.000000000 +0200
@@ -95,8 +95,11 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libstorage-2.21.3/testsuite/libstorage.test/Makefile.in
new/libstorage-2.21.3/testsuite/libstorage.test/Makefile.in
--- old/libstorage-2.21.3/testsuite/libstorage.test/Makefile.in 2011-06-17
11:05:03.000000000 +0200
+++ new/libstorage-2.21.3/testsuite/libstorage.test/Makefile.in 2011-07-08
14:19:37.000000000 +0200
@@ -95,8 +95,11 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/testsuite/single.out/Makefile.in
new/libstorage-2.21.3/testsuite/single.out/Makefile.in
--- old/libstorage-2.21.3/testsuite/single.out/Makefile.in 2011-06-17
11:05:03.000000000 +0200
+++ new/libstorage-2.21.3/testsuite/single.out/Makefile.in 2011-07-08
14:19:37.000000000 +0200
@@ -95,8 +95,11 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.21.3/testsuite-real/Makefile.in
new/libstorage-2.21.3/testsuite-real/Makefile.in
--- old/libstorage-2.21.3/testsuite-real/Makefile.in 2011-06-17
11:05:03.000000000 +0200
+++ new/libstorage-2.21.3/testsuite-real/Makefile.in 2011-07-08
14:19:37.000000000 +0200
@@ -183,8 +183,11 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBVERSION = @LIBVERSION@
LIBVERSION_INFO = @LIBVERSION_INFO@
LIBVERSION_MAJOR = @LIBVERSION_MAJOR@
+LIBVERSION_MINOR = @LIBVERSION_MINOR@
+LIBVERSION_PATCHLEVEL = @LIBVERSION_PATCHLEVEL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
