rpms/zfs-fuse/EL-5 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 zfs-fuse.scrub, 1.2, 1.3 zfs-fuse.spec, 1.25, 1.26

[Uwe Kubosch]

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3865

Modified Files:
	.cvsignore sources zfs-fuse.scrub zfs-fuse.spec 
Log Message:
* Updated to upstream version 0.6.9_beta3


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	27 Nov 2009 21:04:05 -0000	1.5
+++ .cvsignore	23 May 2010 07:44:27 -0000	1.6
@@ -1,2 +1,9 @@
-zfs-fuse-0.6.0.tar.bz2
+.build-*.log
+zfs-fuse-*.src.rpm
+zfs-fuse-*.tar.bz2
+zfs-fuse-*.tar.gz
+zfs-fuse
+zfs-fuse-0.6.9_beta3
 i386
+i686
+x86_64


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	26 Dec 2009 18:38:55 -0000	1.5
+++ sources	23 May 2010 07:44:27 -0000	1.6
@@ -1 +1 @@
-c0e1d0d3406f7a1ac203708e5ecdc6dd  zfs-fuse-0.6.0.tar.bz2
+dbe6fdb8e2e22c27bdab79ce19c9a0f0  zfs-fuse-0.6.9_beta3.tar.bz2


Index: zfs-fuse.scrub
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/EL-5/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:49 -0000	1.2
+++ zfs-fuse.scrub	23 May 2010 07:44:27 -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/EL-5/zfs-fuse.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- zfs-fuse.spec	19 Jan 2010 23:29:49 -0000	1.25
+++ zfs-fuse.spec	23 May 2010 07:44:27 -0000	1.26
@@ -1,27 +1,25 @@
-Summary:          ZFS ported to Linux FUSE
 Name:             zfs-fuse
-Version:          0.6.0
-Release:          7%{?dist}
+Version:          0.6.9_beta3
+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
+#   wget -c 'http://zfs-fuse.net/releases/0.6.9/official-beta-release-source-package' -O zfs-fuse-0.6.9_beta3.tar.bz2
+# Add as new source with:
+#   make new-sources FILES="zfs-fuse-0.6.9_beta3.tar.bz2"
 Source00:         %{name}/%{name}-%{version}.tar.bz2
 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
 Requires(postun): initscripts
-# (2008-10-30)(uwe at kubosch.no) zfs-fuse doesn't have PPC and PPC64
-#                              implementations for atomic instructions
-# karsten at redhat.com:          neither does it have an implementation for s390(x)
-ExcludeArch:      ppc64
-ExcludeArch:      ppc
+# (2010 karsten at redhat.com) zfs-fuse doesn't have s390(x) implementations for atomic instructions
 ExcludeArch:      s390
 ExcludeArch:      s390x
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,12 +44,30 @@ iconv -o $f -f iso88591 -t utf8 $f.iso88
 %build
 pushd src
 %{__sed} -i -e 's/-pipe -Wall -Werror/%{optflags}/' SConstruct
+
+pushd lib/libzfs
+%{__sed} -i -e 's/cpppath.$/cpppath, LIBS = \["crypto"\])/' SConscript
+%{__sed} -i -e "s/^\#include <sys\\/vtoc.h>$/\#include <sys\\/vtoc.h>\\n\#include <sys\\/stat.h>\\n/" libzfs_pool.c
+popd
+
+pushd cmd/zdb
+%{__sed} -i -e "s/ssl'/ssl crypto'/" SConscript
+popd
+
+pushd cmd/zfs
+%{__sed} -i -e "s/ssl'/ssl crypto'/" SConscript
+popd
+
+pushd cmd/zpool
+%{__sed} -i -e "s/ssl'/ssl crypto'/" SConscript
+popd
+
 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 +101,30 @@ 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
-* Wed Jan 20 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-7
-- Fixed bug in automatic scrub script
+* Sat May 22 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.9-6
+- Updated to upstream version 0.6.9_beta3
+- Add more build requires to build on F13 BUG 565076
+- Add patches for missing libraries and includes to build on F13 BUG 565076
+- Added packages for ppc and ppc64
+- Build on F13 BUG 565076
+- Updated to upstream version 0.6.9-BETA
+- Fixes BUG 558172
+- Added man files
+- Added zfs_pool_alert
+- Added zstreamdump
+- 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.