- up to 3.16

diff --git a/btrfs-progs-man.patch b/btrfs-progs-man.patch
index 8d74f81dfe831615335d7ea5f7059c2ffc6ac255..668d72b81402cbd02faddd0d3ec054f2dda8fd79 100644 (file)
--- a/btrfs-progs-man.patch
+++ b/btrfs-progs-man.patch
@@ -1,11 +1,11 @@
---- btrfs-progs-v3.14.2/Documentation/Makefile.orig    2014-05-30 02:56:59.000000000 +0200
-+++ btrfs-progs-v3.14.2/Documentation/Makefile 2014-06-15 20:37:16.269541245 +0200
-@@ -74,7 +74,7 @@
- install-man: man
-       $(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
+--- btrfs-progs-v3.16/Documentation/Makefile~  2014-08-26 15:50:36.000000000 +0200
++++ btrfs-progs-v3.16/Documentation/Makefile   2014-11-08 20:42:52.850482084 +0100
+@@ -89,7 +89,7 @@
+       # want to keep the code generic
+       mv $(DESTDIR)$(man5dir)/btrfs-mount.5.gz $(DESTDIR)$(man5dir)/btrfs.5.gz
        $(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir)
--      $(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)
-+      $(LNS) btrfs-check.8 $(DESTDIR)$(man8dir)/btrfsck.8
+-      $(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz
++      $(LNS) btrfs-check.8 $(DESTDIR)$(man8dir)/btrfsck.8.
  
- clean:
-       $(RM) *.xml *.xml+ *.8 *.8.gz
+ uninstall:
+       cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8.gz $(GZ_MAN8)

diff --git a/btrfs-progs.spec b/btrfs-progs.spec
index 5026082bba6530c635c7cb63a086a1d47babe6ad..7f9b2b377bc1c215716266a516268638a46425bd 100644 (file)
--- a/btrfs-progs.spec
+++ b/btrfs-progs.spec
@@ -1,12 +1,12 @@
 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.2
+Version:       3.16
 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: 18dadb86a668c3fe26b2bcb57bbdf59e
+# Source0-md5: 26035e2ff30513dfeeb2538cacf954b2
 Patch0:                %{name}-man.patch
 URL:           http://btrfs.wiki.kernel.org/
 BuildRequires: acl-devel
@@ -100,6 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/btrfs-show-super
 %attr(755,root,root) %{_libdir}/libbtrfs.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libbtrfs.so.0
+%{_mandir}/man5/btrfs.5*
 %{_mandir}/man8/btrfs.8*
 %{_mandir}/man8/btrfs-*.8*
 %{_mandir}/man8/btrfsck.8*