[zfs-fuse] FTBFS fix, service not autostarting, sysconfig config noreplace, cron silencing.

[Jon Ciesla]

commit 4074e43a70fea532f895230cfa818251d0feb3b1
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Feb 28 08:22:28 2012 -0600

    FTBFS fix, service not autostarting, sysconfig config noreplace, cron silencing.

 sources                   |    2 +-
 zfs-fuse-0.7.0-umem.patch |   11 +++++++++++
 zfs-fuse.spec             |   23 ++++++++++++++++-------
 zfs-fuse.sysconfig        |    2 +-
 4 files changed, 29 insertions(+), 9 deletions(-)
---
diff --git a/sources b/sources
index 03cdaa7..8b46e79 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9f3ac6daefb54d050ff3fe8f276643f2  zfs-fuse-0.6.9-snapshot.tar.gz
+4b060af9f3604f1b2c5e8984b8a623e4  zfs-fuse-0.7.0.tar.bz2
diff --git a/zfs-fuse-0.7.0-umem.patch b/zfs-fuse-0.7.0-umem.patch
new file mode 100644
index 0000000..0fc9d83
--- /dev/null
+++ b/zfs-fuse-0.7.0-umem.patch
@@ -0,0 +1,11 @@
+--- src/lib/libumem/malloc.c~	2012-01-09 02:31:29.000000000 -0600
++++ src/lib/libumem/malloc.c	2012-02-27 14:29:47.694476734 -0600
+@@ -453,7 +453,7 @@
+ 	}
+ }
+ 
+-void (*__malloc_initialize_hook)(void) = umem_malloc_init_hook;
++//void (*__malloc_initialize_hook)(void) = umem_malloc_init_hook;
+ 
+ #else
+ void __attribute__((constructor))
diff --git a/zfs-fuse.spec b/zfs-fuse.spec
index ebc9fbf..6b86715 100644
--- a/zfs-fuse.spec
+++ b/zfs-fuse.spec
@@ -1,6 +1,6 @@
 Name:             zfs-fuse
-Version:          0.6.9
-Release:          9.20100709git%{?dist}
+Version:          0.7.0
+Release:          1%{?dist}
 Summary:          ZFS ported to Linux FUSE
 Group:            System Environment/Base
 License:          CDDL
@@ -10,10 +10,12 @@ URL:              http://zfs-fuse.net/
 #   wget -c 'http://gitweb.zfs-fuse.net/?p=official;a=snapshot;h=maint;sf=tgz' -O 'zfs-fuse-0.6.9-snapshot.tar.gz'
 # Add as new source with:
 #   make new-sources FILES="zfs-fuse-0.6.9-snapshot.tar.gz"
-Source00:         %{name}/%{name}-%{version}-snapshot.tar.gz
+#Source00:         %{name}/%{name}-%{version}-snapshot.tar.gz
+Source00:         %{name}/%{name}-%{version}.tar.bz2
 Source01:         zfs-fuse.init
 Source02:         zfs-fuse.scrub
 Source03:         zfs-fuse.sysconfig
+Patch0:           zfs-fuse-0.7.0-umem.patch
 BuildRequires:    fuse-devel libaio-devel scons zlib-devel openssl-devel libattr-devel
 Requires:         fuse >= 2.7.4-1
 Requires(post):   chkconfig
@@ -34,7 +36,9 @@ operating system.
 Project home page is at http://zfs-fuse.net/
 
 %prep
-%setup -q -n official
+%setup -q
+
+%patch0 -p0
 
 f=LICENSE
 %{__mv} $f $f.iso88591
@@ -97,9 +101,7 @@ else
 fi
 
 if [ $1 = 1 ] ; then
-    echo "Initial install.  Starting service"
     /sbin/chkconfig --add %{name}
-    /sbin/service %{name} start >/dev/null 2>&1 || :
 fi
 
 %preun
@@ -133,7 +135,7 @@ fi
 %{_bindir}/ztest
 %{_initrddir}/%{name}
 %{_sysconfdir}/cron.weekly/98-%{name}-scrub
-%{_sysconfdir}/sysconfig/%{name}
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %{_sysconfdir}/%{name}/zfs_pool_alert
 %{_mandir}/man8/zfs-fuse.8.gz
 %{_mandir}/man8/zdb.8.gz
@@ -142,6 +144,13 @@ fi
 %{_mandir}/man8/zstreamdump.8.gz
 
 %changelog
+* Mon Feb 27 2012 Jon Ciesla <limburgher at gmail.com> - 0.7.0-1
+- New upstream, fix FTBFS BZ 716087.
+- Patch out bad umem declaration.
+- Stop starting automatically in post. BZ 755464.
+- Marked sysconfig file noreplace, BZ 772403.
+- Setting weekly scrub to off by default in sysconfig to silence crob job if service disabled, BZ 757488 et. al.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.9-9.20100709git
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/zfs-fuse.sysconfig b/zfs-fuse.sysconfig
index 429a430..eff8988 100644
--- a/zfs-fuse.sysconfig
+++ b/zfs-fuse.sysconfig
@@ -2,7 +2,7 @@
 ZFS_AUTOMOUNT=yes
 
 # Set this option to yes to enable weekly scrubbing of your ZFS pools.
-ZFS_WEEKLY_SCRUB=yes
+ZFS_WEEKLY_SCRUB=no
 
 # Set this option to yes_really to kill all processes with unknown working directory at zfs-fuse startup
 # Use with extreme care.  This will also kill processes totally unrelated to zfs-fuse.