rpms/zfs-fuse/devel .cvsignore, 1.8, 1.9 sources, 1.6, 1.7 zfs-fuse.spec, 1.30, 1.31

[Uwe Kubosch]

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7552

Modified Files:
	.cvsignore sources zfs-fuse.spec 
Log Message:
* Added patch for explicit reference to libcrypto


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	17 May 2010 18:05:34 -0000	1.8
+++ .cvsignore	23 May 2010 00:14:25 -0000	1.9
@@ -1,2 +1,9 @@
-zfs-fuse-0.6.9.tar.gz
+.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/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	17 May 2010 18:05:34 -0000	1.6
+++ sources	23 May 2010 00:14:25 -0000	1.7
@@ -1 +1 @@
-a80011b914c3b8ae89877a61166c2b5b  zfs-fuse-0.6.9.tar.gz
+dbe6fdb8e2e22c27bdab79ce19c9a0f0  zfs-fuse-0.6.9_beta3.tar.bz2


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- zfs-fuse.spec	17 May 2010 18:00:37 -0000	1.30
+++ zfs-fuse.spec	23 May 2010 00:14:25 -0000	1.31
@@ -1,14 +1,16 @@
 Name:             zfs-fuse
-Version:          0.6.9
-Release:          0%{?dist}
+Version:          0.6.9_beta3
+Release:          6%{?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 -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
+#   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
@@ -17,11 +19,7 @@ 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)
@@ -36,7 +34,7 @@ operating system.
 Project home page is at http://zfs-fuse.net/
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 f=LICENSE
 %{__mv} $f $f.iso88591
@@ -46,6 +44,24 @@ 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
@@ -97,8 +113,16 @@ fi
 %{_mandir}/man8/zstreamdump.8.gz
 
 %changelog
-* Tue May 18 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.9-0
+* 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
+
+* Sat May 22 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.9-0
+- 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