diff --git a/gating.yaml b/gating.yaml index c778f75..282e16b 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,16 +1,7 @@ --- !Policy -product_versions: - - fedora-rawhide -decision_context: bodhi_update_push_stable -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} ---- !Policy product_versions: - fedora-* decision_context: bodhi_update_push_stable subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/unpaper.spec b/unpaper.spec index 505acaa..f3c0b52 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,41 +1,40 @@ Name: unpaper Version: 7.0.0 -Release: 18%{?dist} +Release: 4%{?dist} Summary: Post-processing of scanned and photocopied book pages -# AUTHORS: GPL-2.0-only -# constants.h: GPL-2.0-only -# doc/basic-concepts.md: GPL-2.0-only -# doc/file-formats.md: GPL-2.0-only -# doc/image-processing.md: GPL-2.0-only -# doc/img/*.png.license: GPL-2.0-only -# doc/unpaper.1.rst: GPL-2.0-only -# file.c: GPL-2.0-only -# imageprocess.c: GPL-2.0-only -# imageprocess.h: GPL-2.0-only +# 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: GPL-2.0 text -# other files: GPL-2.0-only -# README.md: GPL-2.0-only +# LICENSES/GPL-2.0-only.txt: GPLv2 text +# other files: GPLv2 +# README.md: GPLv2 # version.h.in: 0BSD ## In tests subpackage # LICENSES/MIT.txt: MIT text -# tests/golden_images/*.license GPL-2.0-only -# tests/source_images/*.license GPL-2.0-only -# tests/unpaper_tests.py: GPL-2.0-only AND MIT -## Not in any binary package +# tests/golden_images/*.license GPLv2 +# tests/source_images/*.license GPLv2 +# tests/unpaper_tests.py: GPLv2 and MIT +## Not in the binary package # doc/conf.py: MIT -# LICENSES/Apache-2.0.txt: Apache-2.0 text +# LICENSES/Apache-2.0.txt: ASL 2.0 text # meson.build: MIT # .dir-locals.el: MIT # .editorconfig: 0BSD -# .github/workflows/meson-build-and-test.yml: Apache-2.0 +# .github/workflows/meson-build-and-test.yml: ASL 2.0 # .github/workflows/pre-commit.yml: MIT # .gitignore: MIT # .mailmap: MIT # .mergify.yml: MIT # .pre-commit-config.yaml: MIT -SourceLicense: GPL-2.0-only AND 0BSD AND MIT AND Apache-2.0 -License: GPL-2.0-only AND 0BSD +License: GPLv2 and 0BSD URL: https://www.flameeyes.eu/projects/%{name} Source0: https://www.flameeyes.eu/files/%{name}-%{version}.tar.xz # Missing a signature, requested by e-mail @@ -81,7 +80,7 @@ angle. This process is called "deskewing". %package tests Summary: Tests for %{name} -License: GPL-2.0-only AND MIT +License: GPLv2 and MIT BuildArch: noarch Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} # python3-pillow for PIL Python module @@ -122,8 +121,8 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %files %license LICENSES/0BSD.txt LICENSES/GPL-2.0-only.txt -%{_bindir}/unpaper -%{_mandir}/man1/unpaper.* +%{_bindir}/* +%{_mandir}/man1/* %doc AUTHORS doc/*.md doc/img NEWS README.md %files tests @@ -131,48 +130,6 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %{_libexecdir}/%{name} %changelog -* Thu Sep 03 2026 Dominik Mierzejewski - 7.0.0-18 -- Rebuilt for FFmpeg 9 - -* Fri Jul 17 2026 Fedora Release Engineering - 7.0.0-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 7.0.0-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Oct 15 2025 Dominik Mierzejewski - 7.0.0-15 -- Rebuilt for FFmpeg 8 - -* Fri Jul 25 2025 Fedora Release Engineering - 7.0.0-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 7.0.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Sep 23 2024 Fabio Valentini - 7.0.0-12 -- Rebuild for ffmpeg 7 - -* Mon Sep 23 2024 Petr Pisar - 7.0.0-11 -- Define a license of a source package - -* Sat Jul 20 2024 Fedora Release Engineering - 7.0.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 7.0.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 7.0.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sun Mar 12 2023 Neal Gompa - 7.0.0-7 -- Rebuild for ffmpeg 6.0 - -* Wed Feb 08 2023 Petr Pisar - 7.0.0-6 -- Convert license tags to an SPDX format - -* Sat Jan 21 2023 Fedora Release Engineering - 7.0.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - * Mon Oct 10 2022 Petr Pisar - 7.0.0-4 - Set an update option to supress a warning with ffmpeg-5.1 (upstream #113)