rpms/zfs-fuse/F-13 .cvsignore, 1.10, 1.11 sources, 1.7, 1.8 zfs-fuse.spec, 1.40, 1.41

[Uwe Kubosch]

Author: donv

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

Modified Files:
	.cvsignore sources zfs-fuse.spec 
Log Message:
* Moved changes from devel to F13 branch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-13/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	23 May 2010 00:21:08 -0000	1.10
+++ .cvsignore	4 Jul 2010 00:31:55 -0000	1.11
@@ -2,8 +2,9 @@
 zfs-fuse-*.src.rpm
 zfs-fuse-*.tar.bz2
 zfs-fuse-*.tar.gz
-zfs-fuse
-zfs-fuse-0.6.9_beta3
 i386
 i686
 x86_64
+ppc
+ppc64
+zfs-fuse-0.6.9


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-13/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	22 May 2010 21:09:40 -0000	1.7
+++ sources	4 Jul 2010 00:31:55 -0000	1.8
@@ -1 +1 @@
-dbe6fdb8e2e22c27bdab79ce19c9a0f0  zfs-fuse-0.6.9_beta3.tar.bz2
+49d77188138ad63cdba70396b8ef5ad4  zfs-fuse-0.6.9.tar.bz2


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/F-13/zfs-fuse.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- zfs-fuse.spec	22 May 2010 23:46:16 -0000	1.40
+++ zfs-fuse.spec	4 Jul 2010 00:31:55 -0000	1.41
@@ -1,15 +1,15 @@
 Name:             zfs-fuse
-Version:          0.6.9_beta3
-Release:          6%{?dist}
+Version:          0.6.9
+Release:          2%{?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.net/releases/0.6.9/official-beta-release-source-package' -O zfs-fuse-0.6.9_beta3.tar.bz2
+#   wget -c 'http://zfs-fuse.net/releases/0.6.9/zfs-fuse-0.6.9.tar.bz2'
 # Add as new source with:
-#   make new-sources FILES="zfs-fuse-0.6.9_beta3.tar.bz2"
+#   make new-sources FILES="zfs-fuse-0.6.9.tar.bz2"
 Source00:         %{name}/%{name}-%{version}.tar.bz2
 Source01:         zfs-fuse.init
 Source02:         zfs-fuse.scrub
@@ -42,8 +42,10 @@ iconv -o $f -f iso88591 -t utf8 $f.iso88
 %{__rm} -f $f.iso88591
 
 %build
+export CCFLAGS="%{optflags}"
 pushd src
-%{__sed} -i -e 's/-pipe -Wall -Werror/%{optflags}/' SConstruct
+%{__sed} -i -e 's/-pipe -Wall/%{optflags}/' SConstruct
+%{__sed} -i -e "s/'debug', '0'/'debug', '1'/" SConstruct
 
 pushd lib/libzfs
 %{__sed} -i -e 's/cpppath.$/cpppath, LIBS = \["crypto"\])/' SConscript
@@ -62,7 +64,7 @@ pushd cmd/zpool
 %{__sed} -i -e "s/ssl'/ssl crypto'/" SConscript
 popd
 
-scons
+scons debug=1
 
 %install
 %{__rm} -rf %{buildroot}
@@ -113,21 +115,21 @@ fi
 %{_mandir}/man8/zstreamdump.8.gz
 
 %changelog
-* Sat May 22 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.9-6
+* Sat Jul 03 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.9-2
+- Updated to upstream stable release 0.6.9
+- Patched default debug level from 0 to 1
+- Fixed missing compiler flags and debug flag in build: BUG 595442
+
+* Sat May 22 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.9_beta3-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
-
-* Wed Jan 20 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-7
 - Fixed bug in automatic scrub script BUG 559518
 
 * Mon Jan 04 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-6