Imported Upstream version 0.6.4.2

diff --git a/META b/META
index db36bacd48ac2c283e4d738aff0630c407e77581..5c3fe29c2d369df7d16acdb98fec340a862f696c 100644 (file)
--- a/META
+++ b/META
@@ -1,7 +1,7 @@
 Meta:         1
 Name:         spl
 Branch:       1.0
-Version:      0.6.4.1
+Version:      0.6.4.2
 Release:      1
 Release-Tags: relext
 License:      GPL

diff --git a/configure b/configure
index ea30ce4d551d245035f252bb2cf1c8e14dc2e00b..a6878b322508e0dda148246d3e8758f861c1520e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for spl 0.6.4.1.
+# Generated by GNU Autoconf 2.68 for spl 0.6.4.2.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='spl'
 PACKAGE_TARNAME='spl'
-PACKAGE_VERSION='0.6.4.1'
-PACKAGE_STRING='spl 0.6.4.1'
+PACKAGE_VERSION='0.6.4.2'
+PACKAGE_STRING='spl 0.6.4.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1357,7 +1357,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures spl 0.6.4.1 to adapt to many kinds of systems.
+\`configure' configures spl 0.6.4.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1428,7 +1428,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of spl 0.6.4.1:";;
+     short | recursive ) echo "Configuration of spl 0.6.4.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1545,7 +1545,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-spl configure 0.6.4.1
+spl configure 0.6.4.2
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1823,7 +1823,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by spl $as_me 0.6.4.1, which was
+It was created by spl $as_me 0.6.4.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2947,7 +2947,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='spl'
- VERSION='0.6.4.1'
+ VERSION='0.6.4.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17646,7 +17646,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by spl $as_me 0.6.4.1, which was
+This file was extended by spl $as_me 0.6.4.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17712,7 +17712,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-spl config.status 0.6.4.1
+spl config.status 0.6.4.2
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

diff --git a/rpm/generic/spl-kmod.spec.in b/rpm/generic/spl-kmod.spec.in
index 8f1f2321c218c1481b28fd60c91f95491114a606..d95e2df58d579a70ea0a7df9c3e99380706a1361 100644 (file)
--- a/rpm/generic/spl-kmod.spec.in
+++ b/rpm/generic/spl-kmod.spec.in
@@ -160,6 +160,9 @@ chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/*
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jun  24 2015 Ned Bass <bass6@llnl.gov> - 0.6.4.2-1
+- No changes from 0.6.4-1
+- Bump version to match ZFS release
 * Wed Apr  8 2015 Brian Behlendorf <behlendorf1@llnl.gov> - 0.6.4-1
 - Released 0.6.4-1
 * Thu Jun 12 2014 Brian Behlendorf <behlendorf1@llnl.gov> - 0.6.3-1

diff --git a/rpm/generic/spl.spec.in b/rpm/generic/spl.spec.in
index 81f30e025f12bf699698a5dc2724ec9d2ace386f..1faeba965e52b368f32d50ca8023a2a38c334e95 100644 (file)
--- a/rpm/generic/spl.spec.in
+++ b/rpm/generic/spl.spec.in
@@ -38,6 +38,9 @@ make install DESTDIR=%{?buildroot}
 %{_mandir}/man5/*
 
 %changelog
+* Wed Jun  24 2015 Ned Bass <bass6@llnl.gov> - 0.6.4.2-1
+- No changes from 0.6.4-1
+- Bump version to match ZFS release
 * Wed Apr  8 2015 Brian Behlendorf <behlendorf1@llnl.gov> - 0.6.4-1
 - Released 0.6.4-1
 * Thu Jun 12 2014 Brian Behlendorf <behlendorf1@llnl.gov> - 0.6.3-1

diff --git a/rpm/redhat/spl.spec.in b/rpm/redhat/spl.spec.in
index 81f30e025f12bf699698a5dc2724ec9d2ace386f..1faeba965e52b368f32d50ca8023a2a38c334e95 100644 (file)
--- a/rpm/redhat/spl.spec.in
+++ b/rpm/redhat/spl.spec.in
@@ -38,6 +38,9 @@ make install DESTDIR=%{?buildroot}
 %{_mandir}/man5/*
 
 %changelog
+* Wed Jun  24 2015 Ned Bass <bass6@llnl.gov> - 0.6.4.2-1
+- No changes from 0.6.4-1
+- Bump version to match ZFS release
 * Wed Apr  8 2015 Brian Behlendorf <behlendorf1@llnl.gov> - 0.6.4-1
 - Released 0.6.4-1
 * Thu Jun 12 2014 Brian Behlendorf <behlendorf1@llnl.gov> - 0.6.3-1