- updated to 4.20.2

diff --git a/btrfs-progs-man.patch b/btrfs-progs-man.patch
deleted file mode 100644 (file)
index 9f42d35..0000000
--- a/btrfs-progs-man.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- btrfs-progs-v4.17/Documentation/Makefile.in.orig   2018-06-15 16:21:17.000000000 +0200
-+++ btrfs-progs-v4.17/Documentation/Makefile.in        2018-07-18 20:55:12.806687678 +0200
-@@ -37,9 +37,9 @@
- MAN_TXT = $(MAN3_TXT) $(MAN8_TXT) $(MAN5_TXT)
- MAN_XML = $(patsubst %.asciidoc,%.xml,$(MAN_TXT))
- MAN_HTML = $(patsubst %.asciidoc,%.html,$(MAN_TXT))
--GZ_MAN3 = $(patsubst %.asciidoc,%.3.gz,$(MAN3_TXT))
--GZ_MAN5 = $(patsubst %.asciidoc,%.5.gz,$(MAN5_TXT))
--GZ_MAN8 = $(patsubst %.asciidoc,%.8.gz,$(MAN8_TXT))
-+GZ_MAN3 = $(patsubst %.asciidoc,%.3,$(MAN3_TXT))
-+GZ_MAN5 = $(patsubst %.asciidoc,%.5,$(MAN5_TXT))
-+GZ_MAN8 = $(patsubst %.asciidoc,%.8,$(MAN8_TXT))
- 
- mandir ?= $(prefix)/share/man
- man3dir = $(mandir)/man3
-@@ -99,9 +99,9 @@
-       $(INSTALL) -m 644 $(GZ_MAN5) $(DESTDIR)$(man5dir)
-       # the source file name of btrfs.5 clashes with section 8 page, but we
-       # want to keep the code generic
--      $(MV) $(DESTDIR)$(man5dir)/btrfs-man5.5.gz $(DESTDIR)$(man5dir)/btrfs.5.gz
-+      $(MV) $(DESTDIR)$(man5dir)/btrfs-man5.5 $(DESTDIR)$(man5dir)/btrfs.5
-       $(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir)
--      $(LN_S) -f btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz
-+      $(LN_S) -f btrfs-check.8 $(DESTDIR)$(man8dir)/btrfsck.8
- 
- uninstall:
-       cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8.gz $(GZ_MAN8)

diff --git a/btrfs-progs-python-async.patch b/btrfs-progs-python-async.patch
deleted file mode 100644 (file)
index 8574205..0000000
--- a/btrfs-progs-python-async.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- btrfs-progs-v4.17/libbtrfsutil/python/subvolume.c.orig     2018-06-15 16:21:17.000000000 +0200
-+++ btrfs-progs-v4.17/libbtrfsutil/python/subvolume.c  2018-07-19 18:23:25.792471799 +0200
-@@ -322,7 +322,7 @@
- 
- PyObject *create_subvolume(PyObject *self, PyObject *args, PyObject *kwds)
- {
--      static char *keywords[] = {"path", "async", "qgroup_inherit", NULL};
-+      static char *keywords[] = {"path", "async_", "qgroup_inherit", NULL};
-       struct path_arg path = {.allow_fd = false};
-       enum btrfs_util_error err;
-       int async = 0;
-@@ -352,7 +352,7 @@
- PyObject *create_snapshot(PyObject *self, PyObject *args, PyObject *kwds)
- {
-       static char *keywords[] = {
--              "source", "path", "recursive", "read_only", "async",
-+              "source", "path", "recursive", "read_only", "async_",
-               "qgroup_inherit", NULL,
-       };
-       struct path_arg src = {.allow_fd = true}, dst = {.allow_fd = false};
---- btrfs-progs-v4.17/libbtrfsutil/python/tests/test_subvolume.py.orig 2018-06-15 16:21:17.000000000 +0200
-+++ btrfs-progs-v4.17/libbtrfsutil/python/tests/test_subvolume.py      2018-07-19 18:24:06.355804667 +0200
-@@ -202,7 +202,7 @@
-         btrfsutil.create_subvolume(subvol + '6//')
-         self.assertTrue(btrfsutil.is_subvolume(subvol + '6'))
- 
--        transid = btrfsutil.create_subvolume(subvol + '7', async=True)
-+        transid = btrfsutil.create_subvolume(subvol + '7', async_=True)
-         self.assertTrue(btrfsutil.is_subvolume(subvol + '7'))
-         self.assertGreater(transid, 0)
- 
-@@ -265,7 +265,7 @@
-         btrfsutil.create_snapshot(subvol, snapshot + '2', recursive=True)
-         self.assertTrue(os.path.exists(os.path.join(snapshot + '2', 'nested/more_nested/nested_dir')))
- 
--        transid = btrfsutil.create_snapshot(subvol, snapshot + '3', recursive=True, async=True)
-+        transid = btrfsutil.create_snapshot(subvol, snapshot + '3', recursive=True, async_=True)
-         self.assertTrue(os.path.exists(os.path.join(snapshot + '3', 'nested/more_nested/nested_dir')))
-         self.assertGreater(transid, 0)
- 

diff --git a/btrfs-progs.spec b/btrfs-progs.spec
index 13a6221bd717fc2c08866e86deb9cedfe637e8cd..e1122ba78073285477b4569191de469ac12062ce 100644 (file)
--- a/btrfs-progs.spec
+++ b/btrfs-progs.spec
@@ -9,15 +9,13 @@
 Summary:       Utilities belonging to the btrfs filesystem
 Summary(pl.UTF-8):     Narzędzia należące do systemu plików btrfs
 Name:          btrfs-progs
-Version:       4.17.1
+Version:       4.20.2
 Release:       1
 License:       GPL v2
 Group:         Applications/System
 Source0:       https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/%{name}-v%{version}.tar.xz
-# Source0-md5: 130be469ced99b01948af64b6a6312f6
-Patch0:                %{name}-man.patch
-Patch1:                %{name}-sh.patch
-Patch2:                %{name}-python-async.patch
+# Source0-md5: f5487352c734a73c7b1ccded3b126715
+Patch0:                %{name}-sh.patch
 URL:           http://btrfs.wiki.kernel.org/
 BuildRequires: acl-devel
 BuildRequires: asciidoc
@@ -151,8 +149,6 @@ Biblioteka Pythona do zarządzania systemami plików Btrfs.
 %prep
 %setup -q -n %{name}-v%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__aclocal} -I m4
@@ -245,5 +241,5 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python}
 %files -n python3-btrfsutil
 %attr(755,root,root) %{py3_sitedir}/btrfsutil.cpython-*.so
-%{py3_sitedir}/btrfsutil-1.0.0-py*.egg-info
+%{py3_sitedir}/btrfsutil-1.1.0-py*.egg-info
 %endif