* btrfs-progs: rebuild

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5964 ec354946-7b23-47d6-9f5a-488ba84defc7

b/btrfs-progs/btrfs-progs-vl.spec

@@ -1,6 +1,6 @@
 Name:           btrfs-progs
 Version:        0.19
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        Userspace programs for btrfs
 Summary(ja):    btrfs ファイルシステム用ユーザスペースプログラム集
 
@@ -8,12 +8,11 @@ Group:          System Environment/Base
 License:        GPLv2
 URL:            http://btrfs.wiki.kernel.org/index.php/Main_Page
 Source0:        http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/%{name}-%{version}.tar.bz2
-Patch0: btrfs-progs-fix-labels.patch
+Patch0: btrfs-progs-upstream.patch
-Patch1: btrfs-progs-build-everything.patch
+Patch1: btrfs-progs-fix-labels.patch
-Patch2: btrfs-progs-valgrind.patch
+Patch2: btrfs-progs-build-everything.patch
-Patch3: btrfs-progs-fix-return-value.patch
+Patch3: btrfs-progs-valgrind.patch
 Patch4: btrfs-progs-build-fixes.patch
-Patch5: btrfs-progs-upstream.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  e2fsprogs-devel, libuuid-devel, zlib-devel, libacl-devel
@@ -33,25 +32,24 @@ btrfs-progs パッケージには、btrfs ファイルシステムを作成、
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch1 -p1
 
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make CFLAGS="%{optflags}" %{?_smp_mflags}
-make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} LDFLAGS="-lcom_err" convert
+make CFLAGS="%{optflags}" %{?_smp_mflags} LDFLAGS="-lcom_err" convert
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make mandir=%{_mandir} bindir=%{_root_sbindir} install DESTDIR=$RPM_BUILD_ROOT
+make mandir=%{_mandir} bindir=%{_root_sbindir} install DESTDIR=%{buildroot}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -68,6 +66,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_root_sbindir}/btrfstune
 %{_root_sbindir}/btrfs
 %{_root_sbindir}/btrfs-map-logical
+%{_root_sbindir}/btrfs-zero-log
 %{_mandir}/man8/btrfs-image.8.gz
 %{_mandir}/man8/btrfs-show.8.gz
 %{_mandir}/man8/btrfsck.8.gz
@@ -77,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Mar 22 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 0.19-2
+- rebuild
+
 * Wed Sep 22 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 0.19-1
 - initial package for Vine Linux