rpms/zfs-fuse/EL-5 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 zfs-fuse.spec, 1.30, 1.31

Uwe Kubosch donv at fedoraproject.org
Sun Jul 11 10:51:32 UTC 2010


Author: donv

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	4 Jul 2010 00:50:31 -0000	1.7
+++ .cvsignore	11 Jul 2010 10:51:32 -0000	1.8
@@ -7,4 +7,4 @@ i686
 x86_64
 ppc
 ppc64
-zfs-fuse-0.6.9
+official


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	4 Jul 2010 00:50:31 -0000	1.7
+++ sources	11 Jul 2010 10:51:32 -0000	1.8
@@ -1 +1 @@
-49d77188138ad63cdba70396b8ef5ad4  zfs-fuse-0.6.9.tar.bz2
+9f3ac6daefb54d050ff3fe8f276643f2  zfs-fuse-0.6.9-snapshot.tar.gz


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/EL-5/zfs-fuse.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- zfs-fuse.spec	4 Jul 2010 21:46:37 -0000	1.30
+++ zfs-fuse.spec	11 Jul 2010 10:51:32 -0000	1.31
@@ -1,16 +1,16 @@
 Name:             zfs-fuse
 Version:          0.6.9
-Release:          5%{?dist}
+Release:          6.20100709git%{?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/zfs-fuse-0.6.9.tar.bz2'
+#   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.tar.bz2"
-Source00:         %{name}/%{name}-%{version}.tar.bz2
+#   make new-sources FILES="zfs-fuse-0.6.9-snapshot.tar.gz"
+Source00:         %{name}/%{name}-%{version}-snapshot.tar.gz
 Source01:         zfs-fuse.init
 Source02:         zfs-fuse.scrub
 Source03:         zfs-fuse.sysconfig
@@ -34,7 +34,7 @@ operating system.
 Project home page is at http://zfs-fuse.net/
 
 %prep
-%setup -q
+%setup -q -n official
 
 f=LICENSE
 %{__mv} $f $f.iso88591
@@ -44,30 +44,29 @@ iconv -o $f -f iso88591 -t utf8 $f.iso88
 %build
 export CCFLAGS="%{optflags}"
 pushd src
-%{__sed} -i -e 's/-pipe -Wall/%{optflags}/' SConstruct
+# %{__sed} -i -e 's/-pipe -Wall/%{optflags}/' SConstruct
 
-# FIXME(uwe):  This patch should not be necessary.  Report as bug.
-%{__sed} -i -e "s/'debug', '0'/'debug', '1'/" SConstruct
-%{__sed} -i -e "s/env.Append(CCFLAGS = Split('-O2 -DDEBUG'))/env.Append(CCFLAGS = \['-DNDEBUG'\])/" 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
+# FIXME(uwe):  This patch should not be necessary.  Reported as http://zfs-fuse.net/issues/72
+%{__sed} -i -e 's/\["-DDEBUG", optim\]/\["-DNDEBUG", optim\]/' SConstruct
 
-scons debug=1
+# 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 debug=1 optim='%{optflags}'
 
 %install
 %{__rm} -rf %{buildroot}
@@ -136,12 +135,19 @@ fi
 %{_sysconfdir}/cron.weekly/98-%{name}-scrub
 %{_sysconfdir}/sysconfig/%{name}
 %{_sysconfdir}/%{name}/zfs_pool_alert
+%{_mandir}/man8/zfs-fuse.8.gz
 %{_mandir}/man8/zdb.8.gz
 %{_mandir}/man8/zfs.8.gz
 %{_mandir}/man8/zpool.8.gz
 %{_mandir}/man8/zstreamdump.8.gz
 
 %changelog
+* Fri Jul 09 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.9-6.20100709git
+- Updated to upstream maintenance snapshot.
+- Fixes build problems on EL5
+- Added zfs-fuse man page
+- Removed package patching of linked libraries
+
 * Mon Jul 05 2010 Uwe Kubosch <uwe at kubosch.no> - 0.6.9-5
 - Cleanup of RPM spec and init script
 



More information about the scm-commits mailing list