diff --git a/btrfs-progs-0.18.tar.bz2 b/btrfs-progs-0.18.tar.bz2 deleted file mode 100644 index ce58ed6..0000000 --- a/btrfs-progs-0.18.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e81f483560eb93b99f33e20aa035e968d7e5b0894543b448cff6da983d4d4f0c -size 110410 diff --git a/btrfs-progs-0.19.tar.bz2 b/btrfs-progs-0.19.tar.bz2 new file mode 100644 index 0000000..3096125 --- /dev/null +++ b/btrfs-progs-0.19.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8a3dd03e87a33506d16ccc1e5a77c4c38ff1fa84b9502ed4b88c0b39fab70fc +size 118119 diff --git a/btrfsprogs.changes b/btrfsprogs.changes index 10463fe..220e741 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jul 20 23:18:25 CEST 2009 - dmueller@suse.de + +- update to 0.19: + - build with rpm optflags + - install man pages + - fix leak in extends checking (bnc#523447) + ------------------------------------------------------------------- Wed Feb 25 18:11:55 CET 2009 - dmueller@suse.de diff --git a/btrfsprogs.spec b/btrfsprogs.spec index 300c776..d3b41d7 100644 --- a/btrfsprogs.spec +++ b/btrfsprogs.spec @@ -1,5 +1,5 @@ # -# spec file for package btrfsprogs (Version 0.18) +# spec file for package btrfsprogs (Version 0.19) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,44 +18,46 @@ Name: btrfsprogs -Url: http://btrfs.wiki.kernel.org/index.php/Main_Page -Version: 0.18 -Release: 2 -Summary: Utilities for the Second Btr File System -License: GPL v2 only +Url: http://oss.oracle.com/~mason/btrfs/ +Version: 0.19 +Release: 1 +Summary: Btrfs File System Utilities +License: GNU General Public License (GPL) Group: System/Filesystems Source: http://ftp.kernel.org/pub/linux/kernel/people/mason/btrfs/btrfs-progs-%{version}.tar.bz2 +Patch0: memleak-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libuuid-devel zlib-devel %description -Utilities needed to create and maintain btrfs file systems under Linux. - - +This package contains utilities for creating, checking, and debugging btrfs +file systems. %prep %setup -q -n btrfs-progs-%{version} +%patch0 %build -make +make CFLAGS="%{optflags}" %install -make install DESTDIR=${RPM_BUILD_ROOT} prefix=%{_prefix} +make install DESTDIR=${RPM_BUILD_ROOT} prefix=%{_prefix} mandir=%{_mandir} %files %defattr(-, root, root) /usr/bin/btrfs-debug-tree -/usr/bin/btrfs-image /usr/bin/btrfs-show /usr/bin/btrfs-vol /usr/bin/btrfsck /usr/bin/btrfsctl -/usr/bin/btrfstune /usr/bin/mkfs.btrfs +%_mandir/man8/btrfs-image.8.gz +%_mandir/man8/btrfs-show.8.gz +%_mandir/man8/btrfsck.8.gz +%_mandir/man8/btrfsctl.8.gz +%_mandir/man8/mkfs.btrfs.8.gz %clean rm -rf $RPM_BUILD_ROOT %changelog -* Wed Feb 25 2009 dmueller@suse.de -- Initial package (0.18) diff --git a/memleak-fix.diff b/memleak-fix.diff new file mode 100644 index 0000000..28c2ce1 --- /dev/null +++ b/memleak-fix.diff @@ -0,0 +1,10 @@ +--- btrfsck.c ++++ btrfsck.c +@@ -2431,6 +2431,7 @@ + break; + } + ret = check_extent_refs(root, &extent_cache); ++ free(bits); + return ret; + } +