diff --git a/.gitignore b/.gitignore
index 01b1f09..495602f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ unpaper-0.3.tar.gz
/unpaper-6.1.tar.xz
/unpaper-6.1.tar.xz.sig
/unpaper-6.1^20220117.gite515408.tar.xz
+/unpaper-7.0.0.tar.xz
diff --git a/sources b/sources
index 312e301..19a18e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (unpaper-6.1^20220117.gite515408.tar.xz) = b18055a00f75336cca0eba32564baca23891b22c673d97596ed87c510058f523d0aa5f4f23d89fc9db5a3d523c1f1638d9cbcdcf717fbaec154aae6296cd10f1
+SHA512 (unpaper-7.0.0.tar.xz) = 58da969e773bf16ffee98b96f903ac5347f66d9a93c63bdb9131f5d45f4d7973c09f364ac2f27f8cb61f75de0421c6b01aa248fa9619fbdbde30fcebc76aa484
diff --git a/unpaper.spec b/unpaper.spec
index bb1963e..eab9c8d 100644
--- a/unpaper.spec
+++ b/unpaper.spec
@@ -1,32 +1,44 @@
Name: unpaper
-Version: 6.1^20220117.gite515408
-Release: 2%{?dist}
+Version: 7.0.0
+Release: 1%{?dist}
Summary: Post-processing of scanned and photocopied book pages
+# AUTHORS: GPLv2
+# constants.h: GPLv2
+# doc/basic-concepts.md: GPLv2
+# doc/file-formats.md: GPLv2
+# doc/image-processing.md: GPLv2
+# doc/img/*.png.license: GPLv2
+# doc/unpaper.1.rst: GPLv2
+# file.c: GPLv2
+# imageprocess.c: GPLv2
+# imageprocess.h: GPLv2
+# LICENSES/0BSD.txt: 0BSD text
# LICENSES/GPL-2.0-only.txt: GPLv2 text
# other files: GPLv2
# README.md: GPLv2
+# version.h.in: 0BSD
## Not in the binary package
# doc/conf.py: MIT
# LICENSES/Apache-2.0.txt: ASL 2.0 text
# LICENSES/MIT.txt: MIT text
# meson.build: MIT
# tests/unpaper_tests.py: GPLv2 and MIT
-# .dir-locals.el: MIT
+# .dir-locals.el: MIT
+# .editorconfig: 0BSD
# .github/workflows/meson-build-and-test.yml: ASL 2.0
# .github/workflows/pre-commit.yml: MIT
# .gitignore: MIT
-# .mergify.yml: MIT
# .mailmap: MIT
+# .mergify.yml: MIT
# .pre-commit-config.yaml: MIT
-License: GPLv2
+License: GPLv2 and 0BSD
URL: https://www.flameeyes.eu/projects/{%name}
-#Source0: https://www.flameeyes.eu/files/%%{name}-%%{version}.tar.xz
+Source0: https://www.flameeyes.eu/files/%{name}-%{version}.tar.xz
+# Missing a signature, requested by e-mail
+# .
#Source1: https://www.flameeyes.eu/files/%%{name}-%%{version}.tar.xz.sig
## A key exported from keyserver on 2022-02-25.
#Source2: gpgkey-BDAEF3008A1CC62079C2A16847664B94E36B629F.gpg
-# A git snapshot because of a fix for porting to libav 5.0
-# depends on too many changes.
-Source0: %{name}-%{version}.tar.xz
BuildRequires: gcc
#BuildRequires: gnupg2
BuildRequires: meson >= 0.57
@@ -35,8 +47,9 @@ BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
BuildRequires: python3-sphinx >= 3.4
# Tests:
-BuildRequires: python3-pytest
-BuildRequires: python3dist(pillow)
+BuildRequires: python3dist(pytest)
+# python3-pillow for PIL Python module
+BuildRequires: python3-pillow
%description
unpaper is a post-processing tool for scanned sheets of paper, especially for
@@ -69,12 +82,16 @@ angle. This process is called "deskewing".
%meson_install
%files
-%license LICENSES/GPL-2.0-only.txt
+%license LICENSES/0BSD.txt LICENSES/GPL-2.0-only.txt
%{_bindir}/*
%{_mandir}/man1/*
%doc AUTHORS doc/*.md doc/img NEWS README.md
%changelog
+* Tue May 31 2022 Petr Pisar - 7.0.0-1
+- 7.0.0 bump
+- License changed from (GPLv2) to (GPLv2 and 0BSD)
+
* Tue Mar 08 2022 Neal Gompa - 6.1^20220117.gite515408-2
- Rebuild for ffmpeg 5.0 ABI fix (#2061392)