upgraded to 4.12

[packages/btrfs-progs.git] / btrfs-progs.spec

diff --git a/btrfs-progs.spec b/btrfs-progs.spec
index ddf260e04e2d9d07c828158f88b973988ba4e059..e7c721ce30b0fc58dc76a3c08f2869fc1decd97c 100644 (file)
--- a/btrfs-progs.spec
+++ b/btrfs-progs.spec
@@ -1,20 +1,25 @@
 Summary:       Utilities belonging to the btrfs filesystem
 Summary(pl.UTF-8):     Narzędzia należące do systemu plików btrfs
 Name:          btrfs-progs
-Version:       3.14.1
+Version:       4.12
 Release:       1
 License:       GPL v2
 Group:         Applications/System
-Source0:       https://www.kernel.org/pub/linux/kernel/people/mason/btrfs-progs/%{name}-v%{version}.tar.xz
-# Source0-md5: 761d07cfe5b468ec733e90a57b413e5c
-Patch0:                %{name}-arg_strtou64.patch
+Source0:       https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/%{name}-v%{version}.tar.xz
+# Source0-md5: 4b1a143677597de413381118db8c10bb
+Patch0:                %{name}-man.patch
 URL:           http://btrfs.wiki.kernel.org/
 BuildRequires: acl-devel
-BuildRequires: e2fsprogs-devel
+BuildRequires: asciidoc
+BuildRequires: autoconf >= 2.60
+BuildRequires: e2fsprogs-devel >= 1.42.0
 BuildRequires: libblkid-devel
+BuildRequires: libcom_err-devel
 BuildRequires: libuuid-devel
-BuildRequires: lzo-devel
+BuildRequires: lzo-devel >= 2
+BuildRequires: pkgconfig >= 0.9.0
 BuildRequires: tar >= 1:1.22
+BuildRequires: xmlto
 BuildRequires: xz
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -63,10 +68,11 @@ Statyczna biblioteka dla systemu plików btrfs.
 %patch0 -p1
 
 %build
+%{__aclocal}
+%{__autoconf}
+%configure
 %{__make} \
-       V=1 \
-       CC="%{__cc}" \
-       CFLAGS="%{rpmcppflags} %{rpmcflags} -fno-strict-aliasing"
+       V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -78,40 +84,34 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8}
        libdir=%{_libdir} \
        DESTDIR=$RPM_BUILD_ROOT
 
-ln -sf btrfsck $RPM_BUILD_ROOT%{_sbindir}/fsck.btrfs
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc INSTALL
-%attr(755,root,root) %{_sbindir}/btrfsck
-%attr(755,root,root) %{_sbindir}/mkfs.btrfs
-%attr(755,root,root) %{_sbindir}/fsck.btrfs
+%doc CHANGES README.md
+%attr(755,root,root) %{_sbindir}/btrfs
+%attr(755,root,root) %{_sbindir}/btrfs-convert
 %attr(755,root,root) %{_sbindir}/btrfs-debug-tree
+%attr(755,root,root) %{_sbindir}/btrfs-find-root
 %attr(755,root,root) %{_sbindir}/btrfs-image
-%attr(755,root,root) %{_sbindir}/btrfs-convert
-%attr(755,root,root) %{_sbindir}/btrfstune
-%attr(755,root,root) %{_sbindir}/btrfs
 %attr(755,root,root) %{_sbindir}/btrfs-map-logical
+%attr(755,root,root) %{_sbindir}/btrfs-select-super
 %attr(755,root,root) %{_sbindir}/btrfs-zero-log
-%attr(755,root,root) %{_sbindir}/btrfs-find-root
-%attr(755,root,root) %{_sbindir}/btrfs-show-super
+%attr(755,root,root) %{_sbindir}/btrfsck
+%attr(755,root,root) %{_sbindir}/btrfstune
+%attr(755,root,root) %{_sbindir}/fsck.btrfs
+%attr(755,root,root) %{_sbindir}/mkfs.btrfs
 %attr(755,root,root) %{_libdir}/libbtrfs.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libbtrfs.so.0
-%{_mandir}/man8/btrfs-image.8*
-%{_mandir}/man8/btrfsck.8*
-%{_mandir}/man8/mkfs.btrfs.8*
+/lib/udev/rules.d/64-btrfs-dm.rules
+%{_mandir}/man5/btrfs.5*
 %{_mandir}/man8/btrfs.8*
-%{_mandir}/man8/btrfs-convert.8*
-%{_mandir}/man8/btrfs-debug-tree.8*
-%{_mandir}/man8/btrfs-find-root.8*
-%{_mandir}/man8/btrfs-map-logical.8*
-%{_mandir}/man8/btrfs-show-super.8*
-%{_mandir}/man8/btrfs-zero-log.8*
+%{_mandir}/man8/btrfs-*.8*
+%{_mandir}/man8/btrfsck.8*
 %{_mandir}/man8/btrfstune.8*
 %{_mandir}/man8/fsck.btrfs.8*
+%{_mandir}/man8/mkfs.btrfs.8*
 
 %files devel
 %defattr(644,root,root,755)