Hello community, here is the log from the commit of package libstorage for openSUSE:13.1 checked in at 2013-10-08 13:56:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-03 07:25:48.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.libstorage.new/libstorage.changes 2013-10-08 13:56:44.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Oct 8 11:54:26 UTC 2013 - tchva...@suse.com + +- Revert to 2.24.5 as 2.25 was ment only for factory. + +------------------------------------------------------------------- Old: ---- libstorage-2.25.0.tar.bz2 New: ---- libstorage-2.24.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.q3uFDF/_old 2013-10-08 13:56:44.000000000 +0200 +++ /var/tmp/diff_new_pack.q3uFDF/_new 2013-10-08 13:56:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.25.0 +Version: 2.24.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 @@ -51,7 +51,6 @@ %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 @@ -235,7 +234,6 @@ %else %{rb_vendorarch}/storage.so %endif -%{rb_vendordir}/storage_utf8.rb %endif %if 0%{?mandriva_version} %{ruby_sitearchdir}/storage.so ++++++ libstorage-2.25.0.tar.bz2 -> libstorage-2.24.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.0/Makefile.in new/libstorage-2.24.5/Makefile.in --- old/libstorage-2.25.0/Makefile.in 2013-09-30 18:05:01.000000000 +0200 +++ new/libstorage-2.24.5/Makefile.in 2013-09-26 11:20:08.000000000 +0200 @@ -246,10 +246,8 @@ 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@ @@ -683,7 +681,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+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.25.0/VERSION new/libstorage-2.24.5/VERSION --- old/libstorage-2.25.0/VERSION 2013-09-30 17:06:15.000000000 +0200 +++ new/libstorage-2.24.5/VERSION 2013-09-25 17:06:50.000000000 +0200 @@ -1 +1 @@ -2.25.0 +2.24.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.0/bindings/Makefile.in new/libstorage-2.24.5/bindings/Makefile.in --- old/libstorage-2.25.0/bindings/Makefile.in 2013-09-30 18:05:01.000000000 +0200 +++ new/libstorage-2.24.5/bindings/Makefile.in 2013-09-26 11:20:08.000000000 +0200 @@ -193,10 +193,8 @@ 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.25.0/bindings/python/Makefile.in new/libstorage-2.24.5/bindings/python/Makefile.in --- old/libstorage-2.25.0/bindings/python/Makefile.in 2013-09-30 18:05:01.000000000 +0200 +++ new/libstorage-2.24.5/bindings/python/Makefile.in 2013-09-26 11:20:08.000000000 +0200 @@ -257,10 +257,8 @@ 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.25.0/bindings/python/examples/Makefile.in new/libstorage-2.24.5/bindings/python/examples/Makefile.in --- old/libstorage-2.25.0/bindings/python/examples/Makefile.in 2013-09-30 18:05:01.000000000 +0200 +++ new/libstorage-2.24.5/bindings/python/examples/Makefile.in 2013-09-26 11:20:08.000000000 +0200 @@ -183,10 +183,8 @@ 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.25.0/bindings/python/libstorage.py new/libstorage-2.24.5/bindings/python/libstorage.py --- old/libstorage-2.25.0/bindings/python/libstorage.py 2013-09-25 18:44:15.000000000 +0200 +++ new/libstorage-2.24.5/bindings/python/libstorage.py 2013-09-26 11:32:28.000000000 +0200 @@ -1,5 +1,5 @@ # This file was automatically generated by SWIG (http://www.swig.org). -# Version 2.0.9 +# Version 2.0.7 # # 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.25.0/bindings/ruby/Makefile.am new/libstorage-2.24.5/bindings/ruby/Makefile.am --- old/libstorage-2.25.0/bindings/ruby/Makefile.am 2013-09-30 09:39:21.000000000 +0200 +++ new/libstorage-2.24.5/bindings/ruby/Makefile.am 2013-01-22 11:28:07.000000000 +0100 @@ -4,7 +4,7 @@ SUBDIRS = examples -EXTRA_DIST = storage.i enum_ref.i storage_utf8.rb +EXTRA_DIST = storage.i enum_ref.i MAINTAINERCLEANFILES = storage_wrap.cxx @@ -35,7 +35,4 @@ 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.25.0/bindings/ruby/Makefile.in new/libstorage-2.24.5/bindings/ruby/Makefile.in --- old/libstorage-2.25.0/bindings/ruby/Makefile.in 2013-09-30 18:05:01.000000000 +0200 +++ new/libstorage-2.24.5/bindings/ruby/Makefile.in 2013-09-26 11:20:08.000000000 +0200 @@ -252,10 +252,8 @@ 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@ @@ -321,7 +319,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = examples -EXTRA_DIST = storage.i enum_ref.i storage_utf8.rb +EXTRA_DIST = storage.i enum_ref.i MAINTAINERCLEANFILES = storage_wrap.cxx BUILT_SOURCES = storage_wrap.cxx rubyextensiondirdir = $(RUBY_EXTENSION_DIR) @@ -726,8 +724,7 @@ info-am: install-data-am: install-rubyextensiondirLTLIBRARIES - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook + install-dvi: install-dvi-recursive install-dvi-am: @@ -776,7 +773,7 @@ .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ cscopelist-recursive ctags-recursive install install-am \ - install-data-am install-strip tags-recursive + install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ @@ -784,24 +781,21 @@ 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-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 + 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 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.25.0/bindings/ruby/examples/Makefile.in new/libstorage-2.24.5/bindings/ruby/examples/Makefile.in --- old/libstorage-2.25.0/bindings/ruby/examples/Makefile.in 2013-09-30 18:05:01.000000000 +0200 +++ new/libstorage-2.24.5/bindings/ruby/examples/Makefile.in 2013-09-26 11:20:08.000000000 +0200 @@ -183,10 +183,8 @@ 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.25.0/bindings/ruby/storage_utf8.rb new/libstorage-2.24.5/bindings/ruby/storage_utf8.rb --- old/libstorage-2.25.0/bindings/ruby/storage_utf8.rb 2013-09-30 10:46:36.000000000 +0200 +++ new/libstorage-2.24.5/bindings/ruby/storage_utf8.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -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.25.0/configure new/libstorage-2.24.5/configure --- old/libstorage-2.25.0/configure 2013-09-30 18:05:00.000000000 +0200 +++ new/libstorage-2.24.5/configure 2013-09-26 11:20:06.000000000 +0200 @@ -637,9 +637,7 @@ 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 @@ -15237,8 +15235,6 @@ 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.25.0/configure.in new/libstorage-2.24.5/configure.in --- old/libstorage-2.25.0/configure.in 2013-09-27 16:38:56.000000000 +0200 +++ new/libstorage-2.24.5/configure.in 2013-01-22 11:28:07.000000000 +0100 @@ -59,11 +59,9 @@ fi AC_SUBST(RUBY_INCLUDE_DIR) RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["libdir"]]'` -AC_SUBST(RUBY_LIB_DIR) +AC_SUBST(RUBY_EXTENSION_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.25.0/data/Makefile.in new/libstorage-2.24.5/data/Makefile.in --- old/libstorage-2.25.0/data/Makefile.in 2013-09-30 18:05:01.000000000 +0200 +++ new/libstorage-2.24.5/data/Makefile.in 2013-09-26 11:20:08.000000000 +0200 @@ -183,10 +183,8 @@ 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.25.0/doc/Makefile.in new/libstorage-2.24.5/doc/Makefile.in --- old/libstorage-2.25.0/doc/Makefile.in 2013-09-30 18:05:01.000000000 +0200 +++ new/libstorage-2.24.5/doc/Makefile.in 2013-09-26 11:20:08.000000000 +0200 @@ -193,10 +193,8 @@ 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.25.0/doc/autodocs/Makefile.in new/libstorage-2.24.5/doc/autodocs/Makefile.in --- old/libstorage-2.25.0/doc/autodocs/Makefile.in 2013-09-30 18:05:01.000000000 +0200 +++ new/libstorage-2.24.5/doc/autodocs/Makefile.in 2013-09-26 11:20:08.000000000 +0200 @@ -183,10 +183,8 @@ 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.25.0/examples/Makefile.in new/libstorage-2.24.5/examples/Makefile.in --- old/libstorage-2.25.0/examples/Makefile.in 2013-09-30 18:05:01.000000000 +0200 +++ new/libstorage-2.24.5/examples/Makefile.in 2013-09-26 11:20:09.000000000 +0200 @@ -283,10 +283,8 @@ 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.25.0/libstorage.spec.in new/libstorage-2.24.5/libstorage.spec.in --- old/libstorage-2.25.0/libstorage.spec.in 2013-09-30 17:57:27.000000000 +0200 +++ new/libstorage-2.24.5/libstorage.spec.in 2013-02-21 16:06:32.000000000 +0100 @@ -43,7 +43,6 @@ %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 @@ -87,9 +86,9 @@ %{find_lang} libstorage -rm -f $RPM_BUILD_ROOT/%{python_sitearch}/_libstorage.a +rm -f $RPM_BUILD_ROOT/%{python_sitearch}/_libstorage.a rm -f $RPM_BUILD_ROOT/%{python_sitearch}/_libstorage.la -%if 0%{?suse_version} +%if 0%{?suse_version} %if "%{?rb_vendorarchdir}" != "" rm -f $RPM_BUILD_ROOT/%{rb_vendorarchdir}/storage.la %else @@ -209,13 +208,12 @@ %files -n libstorage-ruby %defattr(-,root,root) -%if 0%{?suse_version} +%if 0%{?suse_version} %if "%{?rb_vendorarchdir}" != "" %{rb_vendorarchdir}/storage.so %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.25.0/po/Makefile.in new/libstorage-2.24.5/po/Makefile.in --- old/libstorage-2.25.0/po/Makefile.in 2013-09-30 18:05:01.000000000 +0200 +++ new/libstorage-2.24.5/po/Makefile.in 2013-09-26 11:20:09.000000000 +0200 @@ -153,10 +153,8 @@ 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.25.0/storage/Makefile.in new/libstorage-2.24.5/storage/Makefile.in --- old/libstorage-2.25.0/storage/Makefile.in 2013-09-30 18:05:02.000000000 +0200 +++ new/libstorage-2.24.5/storage/Makefile.in 2013-09-26 11:20:09.000000000 +0200 @@ -247,10 +247,8 @@ 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.25.0/storage/Md.cc new/libstorage-2.24.5/storage/Md.cc --- old/libstorage-2.25.0/storage/Md.cc 2013-09-30 09:40:39.000000000 +0200 +++ new/libstorage-2.24.5/storage/Md.cc 2013-09-25 17:06:50.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(v.udev_id), + udev_id(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.25.0/storage/gen_md5sum.cc new/libstorage-2.24.5/storage/gen_md5sum.cc --- old/libstorage-2.25.0/storage/gen_md5sum.cc 2013-09-30 11:28:53.000000000 +0200 +++ new/libstorage-2.24.5/storage/gen_md5sum.cc 2013-09-26 11:25:49.000000000 +0200 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "973dc07d30cbbc7942ffd98a53ee50d3" -#define SOURCES_MD5_DATE " Mon 30 Sep 11:28:54 CEST 2013 " +#define SOURCES_MD5SUM "310fb3595c8b2740efd1d5c877a7ffec" +#define SOURCES_MD5_DATE " Thu Sep 26 11:25:49 CEST 2013 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.25.0/testsuite/Makefile.in new/libstorage-2.24.5/testsuite/Makefile.in --- old/libstorage-2.25.0/testsuite/Makefile.in 2013-09-30 18:05:02.000000000 +0200 +++ new/libstorage-2.24.5/testsuite/Makefile.in 2013-09-26 11:20:09.000000000 +0200 @@ -398,10 +398,8 @@ 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.25.0/testsuite/config/Makefile.in new/libstorage-2.24.5/testsuite/config/Makefile.in --- old/libstorage-2.25.0/testsuite/config/Makefile.in 2013-09-30 18:05:02.000000000 +0200 +++ new/libstorage-2.24.5/testsuite/config/Makefile.in 2013-09-26 11:20:09.000000000 +0200 @@ -153,10 +153,8 @@ 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.25.0/testsuite/data/Makefile.in new/libstorage-2.24.5/testsuite/data/Makefile.in --- old/libstorage-2.25.0/testsuite/data/Makefile.in 2013-09-30 18:05:02.000000000 +0200 +++ new/libstorage-2.24.5/testsuite/data/Makefile.in 2013-09-26 11:20:09.000000000 +0200 @@ -193,10 +193,8 @@ 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.25.0/testsuite/data/empty/Makefile.in new/libstorage-2.24.5/testsuite/data/empty/Makefile.in --- old/libstorage-2.25.0/testsuite/data/empty/Makefile.in 2013-09-30 18:05:02.000000000 +0200 +++ new/libstorage-2.24.5/testsuite/data/empty/Makefile.in 2013-09-26 11:20:09.000000000 +0200 @@ -153,10 +153,8 @@ 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.25.0/testsuite/data/scandium/Makefile.in new/libstorage-2.24.5/testsuite/data/scandium/Makefile.in --- old/libstorage-2.25.0/testsuite/data/scandium/Makefile.in 2013-09-30 18:05:02.000000000 +0200 +++ new/libstorage-2.24.5/testsuite/data/scandium/Makefile.in 2013-09-26 11:20:09.000000000 +0200 @@ -153,10 +153,8 @@ 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.25.0/testsuite/data/thalassa/Makefile.in new/libstorage-2.24.5/testsuite/data/thalassa/Makefile.in --- old/libstorage-2.25.0/testsuite/data/thalassa/Makefile.in 2013-09-30 18:05:02.000000000 +0200 +++ new/libstorage-2.24.5/testsuite/data/thalassa/Makefile.in 2013-09-26 11:20:09.000000000 +0200 @@ -153,10 +153,8 @@ 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.25.0/testsuite/lib/Makefile.in new/libstorage-2.24.5/testsuite/lib/Makefile.in --- old/libstorage-2.25.0/testsuite/lib/Makefile.in 2013-09-30 18:05:02.000000000 +0200 +++ new/libstorage-2.24.5/testsuite/lib/Makefile.in 2013-09-26 11:20:10.000000000 +0200 @@ -153,10 +153,8 @@ 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.25.0/testsuite/libstorage.test/Makefile.in new/libstorage-2.24.5/testsuite/libstorage.test/Makefile.in --- old/libstorage-2.25.0/testsuite/libstorage.test/Makefile.in 2013-09-30 18:05:02.000000000 +0200 +++ new/libstorage-2.24.5/testsuite/libstorage.test/Makefile.in 2013-09-26 11:20:10.000000000 +0200 @@ -153,10 +153,8 @@ 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.25.0/testsuite/single.out/Makefile.in new/libstorage-2.24.5/testsuite/single.out/Makefile.in --- old/libstorage-2.25.0/testsuite/single.out/Makefile.in 2013-09-30 18:05:02.000000000 +0200 +++ new/libstorage-2.24.5/testsuite/single.out/Makefile.in 2013-09-26 11:20:10.000000000 +0200 @@ -153,10 +153,8 @@ 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.25.0/testsuite-real/Makefile.in new/libstorage-2.24.5/testsuite-real/Makefile.in --- old/libstorage-2.25.0/testsuite-real/Makefile.in 2013-09-30 18:05:02.000000000 +0200 +++ new/libstorage-2.24.5/testsuite-real/Makefile.in 2013-09-26 11:20:09.000000000 +0200 @@ -242,10 +242,8 @@ 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