rpms/zfs-fuse/F-12 .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 zfs-fuse.scrub, 1.2, 1.3 zfs-fuse.spec, 1.21, 1.22

[Uwe Kubosch]

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19564

Modified Files:
	.cvsignore sources zfs-fuse.scrub zfs-fuse.spec 
Log Message:
* Tue May 18 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.9-0
- Updated to upstream version 0.6.9-BETA
- Added man files
- Added zfs_pool_alert
- Added zstreamdump



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	29 Nov 2009 00:03:11 -0000	1.4
+++ .cvsignore	17 May 2010 21:08:48 -0000	1.5
@@ -1,2 +1,2 @@
-zfs-fuse-0.6.0.tar.bz2
+zfs-fuse-0.6.9.tar.gz
 i386


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	26 Dec 2009 01:55:10 -0000	1.5
+++ sources	17 May 2010 21:08:48 -0000	1.6
@@ -1 +1 @@
-c0e1d0d3406f7a1ac203708e5ecdc6dd  zfs-fuse-0.6.0.tar.bz2
+a80011b914c3b8ae89877a61166c2b5b  zfs-fuse-0.6.9.tar.gz


Index: zfs-fuse.scrub
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-12/zfs-fuse.scrub,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- zfs-fuse.scrub	19 Jan 2010 23:29:50 -0000	1.2
+++ zfs-fuse.scrub	17 May 2010 21:08:48 -0000	1.3
@@ -13,11 +13,13 @@ zpool=/usr/bin/zpool
 
 pools=`$zpool list -H | cut -f1`
 
-echo Found these pools: $pools
+if [ "$pools" != "" ] ; then
+    echo Found these pools: $pools
 
-for pool in $pools; do
-  echo "Starting scrub of pool $pool"
-  $zpool scrub $pool
-done
+    for pool in $pools; do
+	echo "Starting scrub of pool $pool"
+	$zpool scrub $pool
+    done
 
-echo "ZFS Fuse automatic scrub start done.  Use '$zpool status' to see progress."
+    echo "ZFS Fuse automatic scrub start done.  Use '$zpool status' to see progress."
+fi


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-12/zfs-fuse.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- zfs-fuse.spec	19 Jan 2010 23:29:50 -0000	1.21
+++ zfs-fuse.spec	17 May 2010 21:08:49 -0000	1.22
@@ -1,18 +1,18 @@
-Summary:          ZFS ported to Linux FUSE
 Name:             zfs-fuse
-Version:          0.6.0
-Release:          7%{?dist}
+Version:          0.6.9
+Release:          0%{?dist}
+Summary:          ZFS ported to Linux FUSE
 Group:            System Environment/Base
 License:          CDDL
 URL:              http://zfs-fuse.net/
 # The source for this package was pulled from upstream's vcs.  Use the
 # following command to generate the tarball:
-#   wget http://zfs-fuse.net/releases/0.6.0/zfs-fuse-0.6.0.tar.bz2
-Source00:         %{name}/%{name}-%{version}.tar.bz2
+#   wget -c 'http://zfs-fuse.sehe.nl/?p=zfs-fuse;a=snapshot;h=0dc59d7a5cc20e1e0c1658ce07b6b84dd0d51460;sf=tgz' -O zfs-fuse-0.6.9.tar.gz
+Source00:         %{name}/%{name}-%{version}.tar.gz
 Source01:         zfs-fuse.init
 Source02:         zfs-fuse.scrub
 Source03:         zfs-fuse.sysconfig
-BuildRequires:    fuse-devel libaio-devel scons zlib-devel
+BuildRequires:    fuse-devel libaio-devel scons zlib-devel openssl-devel libattr-devel
 Requires:         fuse >= 2.7.4-1
 Requires(post):   chkconfig
 Requires(preun):  chkconfig initscripts
@@ -36,7 +36,7 @@ operating system.
 Project home page is at http://zfs-fuse.net/
 
 %prep
-%setup -q
+%setup -q -n %{name}
 
 f=LICENSE
 %{__mv} $f $f.iso88591
@@ -51,7 +51,7 @@ scons
 %install
 %{__rm} -rf %{buildroot}
 pushd src
-scons install install_dir=%{buildroot}%{_bindir}
+scons install install_dir=%{buildroot}%{_bindir} man_dir=%{buildroot}%{_mandir}/man8/ cfg_dir=%{buildroot}/%{_sysconfdir}/%{name}
 %{__install} -Dp -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
 %{__install} -Dp -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/98-%{name}-scrub
 %{__install} -Dp -m 0755 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
@@ -85,14 +85,26 @@ fi
 %{_bindir}/zfs
 %{_bindir}/zfs-fuse
 %{_bindir}/zpool
+%{_bindir}/zstreamdump
 %{_bindir}/ztest
 %{_initrddir}/%{name}
 %{_sysconfdir}/cron.weekly/98-%{name}-scrub
 %{_sysconfdir}/sysconfig/%{name}
+%{_sysconfdir}/%{name}/zfs_pool_alert
+%{_mandir}/man8/zdb.8.gz
+%{_mandir}/man8/zfs.8.gz
+%{_mandir}/man8/zpool.8.gz
+%{_mandir}/man8/zstreamdump.8.gz
 
 %changelog
+* Tue May 18 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.9-0
+- Updated to upstream version 0.6.9-BETA
+- Added man files
+- Added zfs_pool_alert
+- Added zstreamdump
+
 * Wed Jan 20 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-7
-- Fixed bug in automatic scrub script
+- Fixed bug in automatic scrub script BUG 559518
 
 * Mon Jan 04 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-6
 - Added option for automatic weekly scrubbing.