diff --git a/_service b/_service
index 7a0c044..cae341e 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
git://git.kernel.org/pub/scm/utils/b4/b4.git
git
enable
- stable-0.6.y
+ stable-0.7.y
@PARENT_TAG@+@TAG_OFFSET@
v(.*)
\1
diff --git a/_servicedata b/_servicedata
index 5c5d826..bc67ce9 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
git://git.kernel.org/pub/scm/utils/b4/b4.git
- e66d514b4113fffc81e48c7c531dcf148ba8b8e8
\ No newline at end of file
+ ee5e56d06c786d7906c214fc1f8cbbeeb3e658a6
\ No newline at end of file
diff --git a/b4-0.6.2+5.obscpio b/b4-0.6.2+5.obscpio
deleted file mode 100644
index 5e42a6f..0000000
--- a/b4-0.6.2+5.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ebd905f82a439eaff4b90dae6ff376e8fb467227543289f4a81322646ce116d1
-size 230923
diff --git a/b4-0.7.0+0.obscpio b/b4-0.7.0+0.obscpio
new file mode 100644
index 0000000..02fb706
--- /dev/null
+++ b/b4-0.7.0+0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:717c53704c80d2c9d1c457e95513cdab32a9c8f37a8baff11065023de3ad4a6f
+size 330763
diff --git a/b4.changes b/b4.changes
index cd1d463..2d4e667 100644
--- a/b4.changes
+++ b/b4.changes
@@ -1,3 +1,63 @@
+-------------------------------------------------------------------
+Thu May 27 06:30:41 UTC 2021 - jslaby@suse.cz
+
+- Update to version 0.7.0+0:
+ * Add new b4 pr flags
+ * Check uids on the key when using default keyring
+ * Update attestation section in the README
+ * Don't depend on List-Archive lore header
+ * Handle situations where -f only has an email
+ * Fix pr -l where we introduced var collision
+ * Bump patatt to 0.4.2
+ * Avoid type error when local mbox lacks specified message ID
+ * Tweak lore.kernel.org match
+ * Return early if no messages retrieved
+ * Strip any List-* headers matching lore
+ * Move --show-keys into its own kr subcommand
+ * Handle partial reroll of series without cover
+ * Don't crash on absent cover letter
+ * Warn when we find an "Obsoleted-by" trailer
+ * Reimplement single-msgid cherrypicking
+ * Initial support for Obsoleted-by: trailer
+ * Cherrypick from the correct series revision
+ * Write maildir atomically
+ * Minor visual tweak in output
+ * Fix a crash on incomplete/missing threads
+ * Tweak output filenames
+ * Document save-maildirs and -M options
+ * Don't use mboxo for anything
+ * Allow passing entire mbox via stdin
+ * Perform mboxo unescaping before DKIM check
+ * Implement partial reroll
+ * Don't try to read stdin multiple times
+ * Restore check for attestation-check-dkim
+ * Improve subject parsing for bracketed prefixes
+ * Ensure trailers are tracked with source messages
+ * Fix DKIM check on headers that don't lowercase h
+ * Properly fail with BADSIG on bad signature
+ * Force datetime to UTC if it's native
+ * Fix crash when PGP key not in default keyring
+ * Clean up after ourselves
+ * Rudimentary support for showing patatt key info
+ * Fix for DKIM signatures without t= field
+ * Reimplement attestation-staleness-days
+ * Python 3.6 compatibility fixes
+ * Remove sendemail-validte hook
+ * Reimplement attestation code one more time
+ * Loosen compatible release identifiers for install_requires
+ * Save to/cc headers as-is for tracking
+ * Add -f to "b4 mbox" to filter dupes
+ * Check if -o is a maildir
+ * Recognize merged PRs when attempting auto-base
+ * Raise RuntimeError instead of exiting
+ * Convert mboxrd to mboxo
+ * Allow passing extra opts to git-format-patch
+ * Fix crasher when we don't use -g with b4 pr
+ * Rework b4 pr exploder for transparency log needs
+ * DKIM: remove extra public-inbox headers
+ * Only check allow-list of trailers in follow-ups
+ * Add BugLink to non-person trailers
+
-------------------------------------------------------------------
Tue Mar 30 04:28:36 UTC 2021 - jslaby@suse.cz
diff --git a/b4.obsinfo b/b4.obsinfo
index 25d7b6b..a8e8df1 100644
--- a/b4.obsinfo
+++ b/b4.obsinfo
@@ -1,5 +1,5 @@
name: b4
-version: 0.6.2+5
-mtime: 1614627630
-commit: e66d514b4113fffc81e48c7c531dcf148ba8b8e8
+version: 0.7.0+0
+mtime: 1622050582
+commit: ee5e56d06c786d7906c214fc1f8cbbeeb3e658a6
diff --git a/b4.spec b/b4.spec
index 1b8618f..f4debae 100644
--- a/b4.spec
+++ b/b4.spec
@@ -16,9 +16,9 @@
#
-%define version_unconverted 0.6.2+5
+%define version_unconverted 0.7.0+0
Name: b4
-Version: 0.6.2+5
+Version: 0.7.0+0
Release: 0
Summary: Helper scripts for kernel.org patches
License: GPL-2.0-or-later
@@ -26,12 +26,17 @@ Group: Development/Tools/Other
URL: https://git.kernel.org/pub/scm/utils/b4/b4.git
Source0: %{name}-%{version}.tar.xz
BuildArch: noarch
-# for checks
+# SECTION test requirements
BuildRequires: git-core
+BuildRequires: python3-dkimpy
+BuildRequires: python3-dnspython
+BuildRequires: python3-patatt
BuildRequires: python3-requests
+# /SECTION
BuildRequires: python3-setuptools
Requires: python3-dkimpy >= 1.0.5
Requires: python3-dnspython >= 2.0.0
+Requires: python3-patatt >= 0.4
Requires: python3-requests >= 2.24.0
%description
@@ -46,6 +51,9 @@ precursor to Lore and Data in the Star Trek universe.
%prep
%autosetup -p1
+# use the system one
+rm -rf patatt
+
# ditch shebang from .py files, they are non-executables anyway
sed -i.old '1{/#!.*/d}' b4/*.py
@@ -59,11 +67,11 @@ mv %{buildroot}/%{_mandir}/man5 %{buildroot}/%{_mandir}/man.5
%check
python3 setup.py check
export PYTHONPATH="./"
-THEIRS=`python3 ./b4/command.py --version`
+THEIRS=`%{buildroot}/%{_bindir}/b4 --version`
OURS=`sed -n "s/__VERSION__ = '\(.*\)'/\1/p" b4/__init__.py`
test "$THEIRS" = "$OURS"
-python3 ./b4/command.py --help |grep -q 'mbox,am,attest'
-python3 ./b4/command.py mbox abc |& grep -q 'Looking up https://lore.kernel.org/r/abc'
+%{buildroot}/%{_bindir}/b4 --help |grep -q 'mbox,am,attest'
+%{buildroot}/%{_bindir}/b4 mbox abc |& grep -q 'Looking up https://lore.kernel.org/r/abc'
%files
%doc README.rst