From 6ad23905a834221f1085a0cf5fe9f19d49e5b4fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:33:48 +0000 Subject: [PATCH 01/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- unpaper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unpaper.spec b/unpaper.spec index e0b2bcb..705c25a 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,6 +1,6 @@ Name: unpaper Version: 0.3 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Post-processing of scanned and photocopied book pages # Licensed under any GPL version since none is specified License: GPL+ @@ -44,6 +44,9 @@ install -p -m 0755 src/unpaper $RPM_BUILD_ROOT/%{_bindir} %doc doc CHANGELOG README %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.3-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 0.3-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From c733c7eb9dd03f81d61321f0101d18765721f1de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 25 Feb 2022 14:43:05 +0100 Subject: [PATCH 02/27] 6.1 bump from Flameeyes fork The fork was merged back to the origin. The 6.1 code does not build with current libav 5.0. Fix in upstream requires too many changes. I will add a rabase on top. --- .gitignore | 2 + ...AEF3008A1CC62079C2A16847664B94E36B629F.gpg | Bin 0 -> 3086 bytes sources | 3 +- unpaper-0.3-format-security.patch | 55 ----------- ...1-Do-not-install-COPYING-into-docdir.patch | 30 ++++++ unpaper-6.1-fix-ffmpeg-incompatibility.patch | 55 +++++++++++ unpaper.spec | 88 +++++++++++++----- 7 files changed, 156 insertions(+), 77 deletions(-) create mode 100644 gpgkey-BDAEF3008A1CC62079C2A16847664B94E36B629F.gpg delete mode 100644 unpaper-0.3-format-security.patch create mode 100644 unpaper-6.1-Do-not-install-COPYING-into-docdir.patch create mode 100644 unpaper-6.1-fix-ffmpeg-incompatibility.patch diff --git a/.gitignore b/.gitignore index bbf3d51..5ea3b42 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ unpaper-0.3.tar.gz +/unpaper-6.1.tar.xz +/unpaper-6.1.tar.xz.sig diff --git a/gpgkey-BDAEF3008A1CC62079C2A16847664B94E36B629F.gpg b/gpgkey-BDAEF3008A1CC62079C2A16847664B94E36B629F.gpg new file mode 100644 index 0000000000000000000000000000000000000000..80e7276c48cb1f4f2990f172924d303790bc4e68 GIT binary patch literal 3086 zcmb`Jc{J2}AIHtu8)dSu8Ob&xCM3&PM#d5mA(T7#8O!j)XiStySC$D`%2qv3W?L7B+?$SNaKhJ-k^Ld~1{pa&KukV`*xy50R-}8g;vE`Uo zIoC3g7lCcXOIucVbQ*i9NiiFvP(8)RPV31tL$FP835)(ouVU=TDkF#dAfH=u#??b1 z*@XntzUMF>(79qT+cxFUCT@L@1j{%#GJ1DqsZuFhe++i}xDXlcvrN>WiQ{&q9GlP7 zzaeM&k(OTAR)lK$^h4%6&z;>AYc-S!bjp8vwMwn(Yh>)gSVevYvWD?9AExk^GTkDP zY<|@=c3u~q&YPeW4pud|t5D~(%D>)DwHdOgj(W|QKasj z&kjE+j@Qm}m1J~t@}VVc+{V2Fw z_^qj}`W5ofgMf+r?7=72ZWC(YH4!q24wt-cjIrB!emVLl)cjQiHdiaeSv95YEfs4I zr=s(z6>;_R`;-d6l9$CmE!#l|8>B|n)EB^mh*Jb#5Mc|1h5~^t4-xv_1Y7_BTn30n z|C!W0!2onTWSBz`!o!A!O0sjpczL*?T*CW!d0EX0+VdH}_*x>RkKY>!DSg#fSl@+MnCLiE*eD;v{Q}F38FBBtpa;N*G zr}rj!&7LK{2scM5MfLJZzwJ@U)2<;Fg;^nS6OSD%B~RtK^-?;t4~(*iW5s@5}-%& zPPynFVAoi*)teqhB(>X`Ke#)dr7KCzw62WwucI#(^pvtvDRtY{w}tgtB3GS`=~Vit z%Orp!h}Y_vqtW?G{Oc% z5Wqk@5Q4xV{`xoqM?`?$2pf&!|l*62XEbo~J#I!tumXjh?y zxMlqv{`p2@Y716%8~$caxDG^X1|N`pbrD5Me3V!bP}R~LNe zwKs|DmD90LL=_8kG+8S3Q~31SyJJx<<=GJ7@Ce6M@Kc*)U~#r9!F+!UsyB;j{e14x zy=oMRDS{E{7}_K>jM*t~6ktBcr{=X(niaVvEK$xg{Tzgpk|seCc4MKN&?qy#BkL|l z2@v}7ZemT@Mzms_b+UW3cl+36Rfhl3XQoo^tByJBOg`qzPin*I&J2%osN;yvQ-gjH zg5*U-8KuK7&M1o;Cx%T=svGZ8-=93POuv!3EZsLy%MAXQ3Y;huB;J zAKkc;yVWG_GDCSv5~SP&BiikpZeH{`W-_>dRypH7Nar#;+yEL~SGIjvtHm|aUiQl7 zgh6QjMC{oWj(iiEkapU3e@s%x6mc!F5lf_}wA{GmyZn`wsqf2Pmc~wlwj=t^FgnF? zSIztka27Hs(Vk=BRR^@6w$~lp-9M|(QB%z4mPu1Q_``E+F8598Q^IAMGpZwZ`vo$K z#+&F%$xx8*WKXRPp1%4n{sBHs6s_g3j@R=)Nqv?i&NBtgkuh2U^Q^UUe#`3*BPuoNZFBP0I`@9gp2wSdc+LgbGrT-g6~O_t9qur3k*Ay~+K(1Jbvg;Mw*=WLmUxZbSCxl@B44 zm1`lbop~Akzz4QCx}RH^(29+{2xo#-8~(0B0z(3x*Cns|A*j^by=IQ$fAG|3J+Gzy z*eh|0@x=bDqxJ7KQ#ZD%NoK)z8_;;K2AAzGh9-~S^;2luavGsuN~ivX&%_bV#h=)l zHQSX^c|?^$9-KNnXwiYp=E+|;GPYV;IOVIStVPV^ntYv26NQbuL7v<%cKKmmrH12P z8$RM8QcIEl()z`A0f}|$=U~l(at0*K+s(HyIww1Vo886yZGtN>O@m+j_y{FQqb^#o z9ERe%W@`Elhs%+!sZ6guL5_v z>ZM20&4whI*pG~oQ6=CimF;}L%1}%f6zHd$p583{$TuSK9HvhWE0zh@w=$A94X1qN zbLg(Sf9?gW(vs*pIn(=oK{wbO1J;;)mkgA;h9<)PlBXv?B>IAZ2rJ<7pQQ2M)&X2X z$3sTHl@8A*F?zKUwLZ_=Etl|zmTSk_+hvW$B|7E#F* zeI|;26L#~Fpm%ALhdAwUQN~#QaAXR4?D}VwDoDAnF5r+g^z$8wWD21{C+z;fif1}3 zyZpx@-Mpg4=;T2JG}4<{$Krycf_toQ?6ZQDYPH;BN0ntUd7>0r3u(!!Uy{?0CjMx6 zYO0I}dsTp~-ZN=Wo{X`~(zr0)#mGf;1-4uxnU^eHkhtbBc9c}_G5c=X@NlTdc!^dD zopbP|xHVM2TFH!Z? zU-}m{-1Imeej\" -lm -O3 -funroll-all-loops -fomit-frame-pointer -ftree-vectorize -o unpaper unpaper.c\n"; - - /* ------------------------------------------------------------------------ */ -@@ -46,17 +46,17 @@ const char* BUILD = TIMESTAMP; - const char* BUILD = NULL; - #endif - --const char* WELCOME = -+const char WELCOME[] = - "unpaper %s - written by Jens Gulden 2005-2007.\n" - "Licensed under the GNU General Public License, this comes with no warranty.\n"; - --const char* USAGE = -+const char USAGE[] = - "Usage: unpaper [options] \n\n" - "Filenames may contain a formatting placeholder starting with '%%' to insert a\n" - "page counter for multi-page processing. E.g.: 'scan%%03d.pbm' to process files\n" - "scan001.pbm, scan002.pbm, scan003.pbm etc.\n"; - --const char* OPTIONS = -+const char OPTIONS[] = - "-l --layout single Set default layout options for a sheet:\n" - " |double 'single': One page per sheet.\n" - " |none 'double': Two pages per sheet, landscape\n" -@@ -558,7 +558,7 @@ const char* OPTIONS = - //--help-compile Undocumented. - - --const char* HELP = -+const char HELP[] = - "Run 'unpaper --help' for usage information.\n"; - - diff --git a/unpaper-6.1-Do-not-install-COPYING-into-docdir.patch b/unpaper-6.1-Do-not-install-COPYING-into-docdir.patch new file mode 100644 index 0000000..dfd3218 --- /dev/null +++ b/unpaper-6.1-Do-not-install-COPYING-into-docdir.patch @@ -0,0 +1,30 @@ +From 78480f765f26f4bc2e5ac521fa78ba62bd899213 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Fri, 8 Jul 2016 10:29:29 +0200 +Subject: [PATCH] Do not install COPYING into docdir +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Petr Písař +--- + Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 461d7ef..5e518d2 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -6,7 +6,8 @@ unpaper_SOURCES = file.c imageprocess.c imageprocess.h parse.c \ + unpaper_CFLAGS = $(LIBAV_CFLAGS) + unpaper_LDADD = $(LIBAV_LIBS) + +-dist_doc_DATA = NEWS COPYING README.md AUTHORS ++extra_DIST = COPYING ++dist_doc_DATA = NEWS README.md AUTHORS + dist_man_MANS = unpaper.1 + + dist_html_DATA = doc/basic-concepts.md doc/image-processing.md \ +-- +2.5.5 + diff --git a/unpaper-6.1-fix-ffmpeg-incompatibility.patch b/unpaper-6.1-fix-ffmpeg-incompatibility.patch new file mode 100644 index 0000000..2c80388 --- /dev/null +++ b/unpaper-6.1-fix-ffmpeg-incompatibility.patch @@ -0,0 +1,55 @@ +From 89bce4417c35a8cbaa35f5a7451abca3d1c95adc Mon Sep 17 00:00:00 2001 +From: Thomas Koch +Date: Mon, 28 Sep 2015 07:39:30 +0200 +Subject: [PATCH] fix ffmpeg incompatibility +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Thanks to Andreas Cadhalpun for the patch. + +Received 2015-09-28 via debian bug +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=800312 +with the following comment: + +Not really. unpaper just doesn't use the API correctly. +More specifically, it doesn't make sure it actually got a frame. +The following change makes it work: + +Closes: #39 +Signed-off-by: Petr Písař +--- + file.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/file.c b/file.c +index c92994d..3989447 100644 +--- a/file.c ++++ b/file.c +@@ -93,12 +93,23 @@ void loadImage(const char *filename, AVFrame **image) { + if (pkt.stream_index != 0) + errOutput("unable to open file %s: invalid stream.", filename); + ++ while (!got_frame && pkt.data) { ++ ++ if (pkt.size <= 0) { ++ pkt.data = NULL; ++ pkt.size = 0; ++ } ++ + ret = avcodec_decode_video2(avctx, frame, &got_frame, &pkt); + if (ret < 0) { + av_strerror(ret, errbuff, sizeof(errbuff)); + errOutput("unable to open file %s: %s", filename, errbuff); + } + ++ pkt.data += ret; ++ pkt.size -= ret; ++ } ++ + switch(frame->format) { + case AV_PIX_FMT_Y400A: // 8-bit grayscale PNG + case AV_PIX_FMT_GRAY8: +-- +2.5.5 + diff --git a/unpaper.spec b/unpaper.spec index 705c25a..5dab769 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,15 +1,40 @@ Name: unpaper -Version: 0.3 -Release: 27%{?dist} +Version: 6.1 +Release: 1%{?dist} Summary: Post-processing of scanned and photocopied book pages -# Licensed under any GPL version since none is specified -License: GPL+ -URL: http://unpaper.berlios.de/ -Source0: http://download.berlios.de/%{name}/%{name}-%{version}.tar.gz -Patch0: unpaper-0.3-format-security.patch +# COPYING: GPLv2 text +# other files: GPLv2 +# README.md: GPLv2 +## Not in the binary package +# aclocal.m4: FSFULLR and GPLv2+ with Autoconf exception +# configure: FSFUL +# depcomp: GPLv2+ with Autoconf exception +# install-sh: MIT +# Makefile.in: FSFULLR +# missing: GPLv2+ with Autoconf exception +# test-driver: GPLv2+ with Autoconf exception +License: GPLv2 +URL: https://www.flameeyes.eu/projects/{%name} +Source0: https://www.flameeyes.eu/files/%{name}-%{version}.tar.xz +Source1: https://www.flameeyes.eu/files/%{name}-%{version}.tar.xz.sig +# A key exported from keyserver on 2022-02-25. +Source2: gpgkey-BDAEF3008A1CC62079C2A16847664B94E36B629F.gpg +# Do not put COPYING into docdir, not upstreamable, +Patch0: unpaper-6.1-Do-not-install-COPYING-into-docdir.patch +# Restore compatibility with ffmpeg-2.8, +# +Patch1: unpaper-6.1-fix-ffmpeg-incompatibility.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: bash BuildRequires: coreutils BuildRequires: gcc +BuildRequires: gnupg2 +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) BuildRequires: sed +# xsltproc not used, there is no XML source for the manual %description unpaper is a post-processing tool for scanned sheets of paper, especially for @@ -17,33 +42,54 @@ book pages that have been scanned from previously created photocopies. The main purpose is to make scanned book pages better readable on screen after conversion to PDF. Additionally, unpaper might be useful to enhance the quality of scanned pages before performing optical character recognition (OCR). + unpaper tries to clean scanned images by removing dark edges that appeared through scanning or copying on areas outside the actual page content (e.g. dark -areas between the left-hand-side and the right-hand-side of a double- sided -book-page scan). The program also tries to detect misaligned centering and -rotation of pages and will automatically straighten each page by rotating it to -the correct angle. This process is called "deskewing". +areas between the left-hand-side and the right-hand-side of a double-sided +book-page scan). + +The program also tries to detect misaligned centering and rotation of pages +and will automatically straighten each page by rotating it to the correct +angle. This process is called "deskewing". %prep -%setup -q -%patch0 -p1 -# fix eol encoding in LICENSE -sed -i -e 's/\r//' LICENSE +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +%autosetup -p1 +# Fix end-of-line coding +sed -i -e 's/\r//' COPYING +autoreconf -fi %build -cd src -gcc $RPM_OPT_FLAGS $RPM_LD_FLAGS -o unpaper unpaper.c -lm +%configure --disable-silent-rules +%{make_build} + +%check +# The F and G tests fail. Because of CPU optimizations, resulting image cannot +# be deterministic. Fixed in upstream by commit: +# +# commit 5bdd7acd09675086114b4006eff50b8fe78f95cc +# Author: Diego Elio Pettenò +# Date: Tue Nov 11 19:31:40 2014 +0000 +# Subject: Rewrite tests to use an image comparison binary instead of md5sum. +# +# Because the patch is huge (test data) and the bug is in the tests, not in +# the tool, I will disable tests for now. +# +# make check %{?_smp_mflags} %install -install -d $RPM_BUILD_ROOT/%{_bindir} -install -p -m 0755 src/unpaper $RPM_BUILD_ROOT/%{_bindir} +%{make_install} %files -%license LICENSE +%license COPYING %{_bindir}/* -%doc doc CHANGELOG README +%doc AUTHORS doc NEWS README.md %changelog +* Fri Feb 25 2022 Petr Pisar - 6.1-1 +- 6.1 bump from Flameeyes fork +- License changed to GPLv2 + * Sat Jan 22 2022 Fedora Release Engineering - 0.3-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 382a7325f7e5aae1ab670b6afb067c549e76fe8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 25 Feb 2022 16:38:46 +0100 Subject: [PATCH 03/27] Bump to a post-6.1 git snapshot e515408 --- .gitignore | 1 + .rpmlint | 2 - sources | 3 +- ...1-Do-not-install-COPYING-into-docdir.patch | 30 ------- unpaper-6.1-fix-ffmpeg-incompatibility.patch | 55 ------------ unpaper.rpmlintrc | 1 + unpaper.spec | 85 ++++++++----------- 7 files changed, 40 insertions(+), 137 deletions(-) delete mode 100644 .rpmlint delete mode 100644 unpaper-6.1-Do-not-install-COPYING-into-docdir.patch delete mode 100644 unpaper-6.1-fix-ffmpeg-incompatibility.patch create mode 100644 unpaper.rpmlintrc diff --git a/.gitignore b/.gitignore index 5ea3b42..01b1f09 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ unpaper-0.3.tar.gz /unpaper-6.1.tar.xz /unpaper-6.1.tar.xz.sig +/unpaper-6.1^20220117.gite515408.tar.xz diff --git a/.rpmlint b/.rpmlint deleted file mode 100644 index 2e2d927..0000000 --- a/.rpmlint +++ /dev/null @@ -1,2 +0,0 @@ -from Config import * -addFilter("spelling-error .* deskewing"); diff --git a/sources b/sources index 6021d2a..312e301 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (unpaper-6.1.tar.xz) = afef705985d3c265672c9e42130acc34befc080c361f3169e299b5110c662d0b9845a9d0ca4fc3aad468f49967ded36fb60ffed296373569dd7337c3cb81e79c -SHA512 (unpaper-6.1.tar.xz.sig) = b1047d94cb521beb95d502f00d24ba47d52fbd5aa327f6ec07e54f1427bcb242af57625dda7fc95039ed34d242f2d6c29449f1e2ffc1d1cc00597c9ae881d40f +SHA512 (unpaper-6.1^20220117.gite515408.tar.xz) = b18055a00f75336cca0eba32564baca23891b22c673d97596ed87c510058f523d0aa5f4f23d89fc9db5a3d523c1f1638d9cbcdcf717fbaec154aae6296cd10f1 diff --git a/unpaper-6.1-Do-not-install-COPYING-into-docdir.patch b/unpaper-6.1-Do-not-install-COPYING-into-docdir.patch deleted file mode 100644 index dfd3218..0000000 --- a/unpaper-6.1-Do-not-install-COPYING-into-docdir.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 78480f765f26f4bc2e5ac521fa78ba62bd899213 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Fri, 8 Jul 2016 10:29:29 +0200 -Subject: [PATCH] Do not install COPYING into docdir -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Petr Písař ---- - Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 461d7ef..5e518d2 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -6,7 +6,8 @@ unpaper_SOURCES = file.c imageprocess.c imageprocess.h parse.c \ - unpaper_CFLAGS = $(LIBAV_CFLAGS) - unpaper_LDADD = $(LIBAV_LIBS) - --dist_doc_DATA = NEWS COPYING README.md AUTHORS -+extra_DIST = COPYING -+dist_doc_DATA = NEWS README.md AUTHORS - dist_man_MANS = unpaper.1 - - dist_html_DATA = doc/basic-concepts.md doc/image-processing.md \ --- -2.5.5 - diff --git a/unpaper-6.1-fix-ffmpeg-incompatibility.patch b/unpaper-6.1-fix-ffmpeg-incompatibility.patch deleted file mode 100644 index 2c80388..0000000 --- a/unpaper-6.1-fix-ffmpeg-incompatibility.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 89bce4417c35a8cbaa35f5a7451abca3d1c95adc Mon Sep 17 00:00:00 2001 -From: Thomas Koch -Date: Mon, 28 Sep 2015 07:39:30 +0200 -Subject: [PATCH] fix ffmpeg incompatibility -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Thanks to Andreas Cadhalpun for the patch. - -Received 2015-09-28 via debian bug -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=800312 -with the following comment: - -Not really. unpaper just doesn't use the API correctly. -More specifically, it doesn't make sure it actually got a frame. -The following change makes it work: - -Closes: #39 -Signed-off-by: Petr Písař ---- - file.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/file.c b/file.c -index c92994d..3989447 100644 ---- a/file.c -+++ b/file.c -@@ -93,12 +93,23 @@ void loadImage(const char *filename, AVFrame **image) { - if (pkt.stream_index != 0) - errOutput("unable to open file %s: invalid stream.", filename); - -+ while (!got_frame && pkt.data) { -+ -+ if (pkt.size <= 0) { -+ pkt.data = NULL; -+ pkt.size = 0; -+ } -+ - ret = avcodec_decode_video2(avctx, frame, &got_frame, &pkt); - if (ret < 0) { - av_strerror(ret, errbuff, sizeof(errbuff)); - errOutput("unable to open file %s: %s", filename, errbuff); - } - -+ pkt.data += ret; -+ pkt.size -= ret; -+ } -+ - switch(frame->format) { - case AV_PIX_FMT_Y400A: // 8-bit grayscale PNG - case AV_PIX_FMT_GRAY8: --- -2.5.5 - diff --git a/unpaper.rpmlintrc b/unpaper.rpmlintrc new file mode 100644 index 0000000..2fc81da --- /dev/null +++ b/unpaper.rpmlintrc @@ -0,0 +1 @@ +addFilter('spelling-error .* deskewing') diff --git a/unpaper.spec b/unpaper.spec index 5dab769..5e07523 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,40 +1,42 @@ Name: unpaper -Version: 6.1 +Version: 6.1^20220117.gite515408 Release: 1%{?dist} Summary: Post-processing of scanned and photocopied book pages -# COPYING: GPLv2 text +# LICENSES/GPL-2.0-only.txt: GPLv2 text # other files: GPLv2 # README.md: GPLv2 ## Not in the binary package -# aclocal.m4: FSFULLR and GPLv2+ with Autoconf exception -# configure: FSFUL -# depcomp: GPLv2+ with Autoconf exception -# install-sh: MIT -# Makefile.in: FSFULLR -# missing: GPLv2+ with Autoconf exception -# test-driver: GPLv2+ with Autoconf exception +# 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 +# .github/workflows/meson-build-and-test.yml: ASL 2.0 +# .github/workflows/pre-commit.yml: MIT +# .gitignore: MIT +# .mergify.yml: MIT +# .mailmap: MIT +# .pre-commit-config.yaml: MIT License: GPLv2 URL: https://www.flameeyes.eu/projects/{%name} -Source0: https://www.flameeyes.eu/files/%{name}-%{version}.tar.xz -Source1: https://www.flameeyes.eu/files/%{name}-%{version}.tar.xz.sig -# A key exported from keyserver on 2022-02-25. -Source2: gpgkey-BDAEF3008A1CC62079C2A16847664B94E36B629F.gpg -# Do not put COPYING into docdir, not upstreamable, -Patch0: unpaper-6.1-Do-not-install-COPYING-into-docdir.patch -# Restore compatibility with ffmpeg-2.8, -# -Patch1: unpaper-6.1-fix-ffmpeg-incompatibility.patch -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: bash -BuildRequires: coreutils +#Source0: https://www.flameeyes.eu/files/%%{name}-%%{version}.tar.xz +#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: gnupg2 +BuildRequires: meson >= 0.57 BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) -BuildRequires: sed -# xsltproc not used, there is no XML source for the manual +BuildRequires: python3-sphinx >= 3.4 +# Tests: +BuildRequires: python3-pytest +BuildRequires: python3dist(pillow) %description unpaper is a post-processing tool for scanned sheets of paper, especially for @@ -53,41 +55,28 @@ and will automatically straighten each page by rotating it to the correct angle. This process is called "deskewing". %prep -%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +#%%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 -# Fix end-of-line coding -sed -i -e 's/\r//' COPYING -autoreconf -fi %build -%configure --disable-silent-rules -%{make_build} +%meson +%meson_build %check -# The F and G tests fail. Because of CPU optimizations, resulting image cannot -# be deterministic. Fixed in upstream by commit: -# -# commit 5bdd7acd09675086114b4006eff50b8fe78f95cc -# Author: Diego Elio Pettenò -# Date: Tue Nov 11 19:31:40 2014 +0000 -# Subject: Rewrite tests to use an image comparison binary instead of md5sum. -# -# Because the patch is huge (test data) and the bug is in the tests, not in -# the tool, I will disable tests for now. -# -# make check %{?_smp_mflags} +%meson_test %install -%{make_install} +%meson_install %files -%license COPYING +%license LICENSES/GPL-2.0-only.txt %{_bindir}/* -%doc AUTHORS doc NEWS README.md +%{_mandir}/man1/* +%doc AUTHORS doc/*.md doc/img NEWS README.md %changelog -* Fri Feb 25 2022 Petr Pisar - 6.1-1 -- 6.1 bump from Flameeyes fork +* Fri Feb 25 2022 Petr Pisar - 6.1^20220117.gite515408-1 +- 6.1 bump from upstream git tree - License changed to GPLv2 * Sat Jan 22 2022 Fedora Release Engineering - 0.3-27 From 46c9a1b3fda8dedb2ae87506daf0cbaec1d9556d Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 8 Mar 2022 10:36:12 -0500 Subject: [PATCH 04/27] Rebuild for ffmpeg 5.0 ABI fix (#2061392) --- unpaper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unpaper.spec b/unpaper.spec index 5e07523..bb1963e 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,6 +1,6 @@ Name: unpaper Version: 6.1^20220117.gite515408 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Post-processing of scanned and photocopied book pages # LICENSES/GPL-2.0-only.txt: GPLv2 text # other files: GPLv2 @@ -75,6 +75,9 @@ angle. This process is called "deskewing". %doc AUTHORS doc/*.md doc/img NEWS README.md %changelog +* Tue Mar 08 2022 Neal Gompa - 6.1^20220117.gite515408-2 +- Rebuild for ffmpeg 5.0 ABI fix (#2061392) + * Fri Feb 25 2022 Petr Pisar - 6.1^20220117.gite515408-1 - 6.1 bump from upstream git tree - License changed to GPLv2 From 9f25b954f257b63fb504e462d4467a7c8f1101a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 31 May 2022 13:48:25 +0200 Subject: [PATCH 05/27] 7.0.0 bump --- .gitignore | 1 + sources | 2 +- unpaper.spec | 41 +++++++++++++++++++++++++++++------------ 3 files changed, 31 insertions(+), 13 deletions(-) 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) From a140636d4317f6b8b29b8468d62d96cfe1ab05ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 31 May 2022 14:37:02 +0200 Subject: [PATCH 06/27] Package the tests --- unpaper.rpmlintrc | 1 + unpaper.spec | 42 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/unpaper.rpmlintrc b/unpaper.rpmlintrc index 2fc81da..d67411a 100644 --- a/unpaper.rpmlintrc +++ b/unpaper.rpmlintrc @@ -1 +1,2 @@ addFilter('spelling-error .* deskewing') +addFilter('-tests\.noarch: W: no-documentation') diff --git a/unpaper.spec b/unpaper.spec index eab9c8d..ac8ea64 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -17,12 +17,15 @@ Summary: Post-processing of scanned and photocopied book pages # other files: GPLv2 # README.md: GPLv2 # version.h.in: 0BSD +## In tests subpackage +# LICENSES/MIT.txt: MIT text +# 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: ASL 2.0 text -# LICENSES/MIT.txt: MIT text # meson.build: MIT -# tests/unpaper_tests.py: GPLv2 and MIT # .dir-locals.el: MIT # .editorconfig: 0BSD # .github/workflows/meson-build-and-test.yml: ASL 2.0 @@ -67,6 +70,21 @@ The program also tries to detect misaligned centering and rotation of pages and will automatically straighten each page by rotating it to the correct angle. This process is called "deskewing". +%package tests +Summary: Tests for %{name} +License: GPLv2 and MIT +BuildArch: noarch +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +# python3-pillow for PIL Python module +Requires: python3-pillow +Requires: python3-pytest +# Parallelize tests +Requires: python3-pytest-xdist + +%description tests +Tests from %{name}. Execute them +with "%{_libexecdir}/%{name}/test". + %prep #%%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 @@ -80,6 +98,19 @@ angle. This process is called "deskewing". %install %meson_install +# Install tests +mkdir -p %{buildroot}%{_libexecdir}/%{name} +cp -a tests %{buildroot}%{_libexecdir}/%{name} +cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF' +#!/bin/sh +export TEST_IMGSRC_DIR=tests/source_images +export TEST_GOLDEN_DIR=tests/golden_images +export TEST_UNPAPER_BINARY=%{_bindir}/unpaper +# 391 seconds single-threaded +cd %{_libexecdir}/%{name} && exec pytest -v -n "$(getconf _NPROCESSORS_ONLN)" tests/unpaper_tests.py +EOF +chmod +x %{buildroot}%{_libexecdir}/%{name}/test +%{_fixperms} %{buildroot}/* %files %license LICENSES/0BSD.txt LICENSES/GPL-2.0-only.txt @@ -87,10 +118,15 @@ angle. This process is called "deskewing". %{_mandir}/man1/* %doc AUTHORS doc/*.md doc/img NEWS README.md +%files tests +%license LICENSES/MIT.txt +%{_libexecdir}/%{name} + %changelog * Tue May 31 2022 Petr Pisar - 7.0.0-1 - 7.0.0 bump -- License changed from (GPLv2) to (GPLv2 and 0BSD) +- License changed from (GPLv2) to (GPLv2 and 0BSD and MIT) +- Package the tests * Tue Mar 08 2022 Neal Gompa - 6.1^20220117.gite515408-2 - Rebuild for ffmpeg 5.0 ABI fix (#2061392) From 5d33082409c048f54338cbea25a2beea7f7655c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 31 May 2022 14:39:00 +0200 Subject: [PATCH 07/27] Enable TMT tests and gating --- .fmf/version | 1 + gating.yaml | 7 +++++++ plans/sanity.fmf | 5 +++++ tests/upstream-tests.fmf | 5 +++++ unpaper.spec | 1 - 5 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 .fmf/version create mode 100644 gating.yaml create mode 100644 plans/sanity.fmf create mode 100644 tests/upstream-tests.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..282e16b --- /dev/null +++ b/gating.yaml @@ -0,0 +1,7 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/plans/sanity.fmf b/plans/sanity.fmf new file mode 100644 index 0000000..a72ded4 --- /dev/null +++ b/plans/sanity.fmf @@ -0,0 +1,5 @@ +summary: Sanity tests +discover: + how: fmf +execute: + how: tmt diff --git a/tests/upstream-tests.fmf b/tests/upstream-tests.fmf new file mode 100644 index 0000000..8db150f --- /dev/null +++ b/tests/upstream-tests.fmf @@ -0,0 +1,5 @@ +summary: Upstream tests +component: unpaper +require: unpaper-tests +test: /usr/libexec/unpaper/test +duration: 12m diff --git a/unpaper.spec b/unpaper.spec index ac8ea64..8d43f35 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -106,7 +106,6 @@ cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF' export TEST_IMGSRC_DIR=tests/source_images export TEST_GOLDEN_DIR=tests/golden_images export TEST_UNPAPER_BINARY=%{_bindir}/unpaper -# 391 seconds single-threaded cd %{_libexecdir}/%{name} && exec pytest -v -n "$(getconf _NPROCESSORS_ONLN)" tests/unpaper_tests.py EOF chmod +x %{buildroot}%{_libexecdir}/%{name}/test From 0ef0a7fee6407bca4cc9f0de9e556ea2fb937250 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:26:16 +0000 Subject: [PATCH 08/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- unpaper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unpaper.spec b/unpaper.spec index 8d43f35..b5eb5bb 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,6 +1,6 @@ Name: unpaper Version: 7.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Post-processing of scanned and photocopied book pages # AUTHORS: GPLv2 # constants.h: GPLv2 @@ -122,6 +122,9 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %{_libexecdir}/%{name} %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 7.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue May 31 2022 Petr Pisar - 7.0.0-1 - 7.0.0 bump - License changed from (GPLv2) to (GPLv2 and 0BSD and MIT) From 094ed21243ae1a21a63844a650ba037009610a54 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 29 Aug 2022 19:16:35 -0400 Subject: [PATCH 09/27] Rebuild for ffmpeg 5.1 (#2121070) --- unpaper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unpaper.spec b/unpaper.spec index b5eb5bb..d49bec8 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,6 +1,6 @@ Name: unpaper Version: 7.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Post-processing of scanned and photocopied book pages # AUTHORS: GPLv2 # constants.h: GPLv2 @@ -122,6 +122,9 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %{_libexecdir}/%{name} %changelog +* Mon Aug 29 2022 Neal Gompa - 7.0.0-3 +- Rebuild for ffmpeg 5.1 (#2121070) + * Sat Jul 23 2022 Fedora Release Engineering - 7.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 52fb09cf3942bc45612a04aa6a390bbc40e86492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 31 Aug 2022 09:57:30 +0200 Subject: [PATCH 10/27] Correct an URL in RPM metadata --- unpaper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unpaper.spec b/unpaper.spec index d49bec8..73aeec7 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -35,7 +35,7 @@ Summary: Post-processing of scanned and photocopied book pages # .mergify.yml: MIT # .pre-commit-config.yaml: MIT License: GPLv2 and 0BSD -URL: https://www.flameeyes.eu/projects/{%name} +URL: https://www.flameeyes.eu/projects/%{name} Source0: https://www.flameeyes.eu/files/%{name}-%{version}.tar.xz # Missing a signature, requested by e-mail # . From 54f9913222a510f756b844f382165b5ca267e43e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 10 Oct 2022 14:31:14 +0200 Subject: [PATCH 11/27] Set an update option to supress a warning with ffmpeg-5.1 --- ...ption-to-suppress-the-ffmpeg-5.1-war.patch | 44 +++++++++++++++ ...oc_output_context2-to-create-the-out.patch | 55 +++++++++++++++++++ unpaper.spec | 13 ++++- 3 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 unpaper-7.0.0-Set-the-update-option-to-suppress-the-ffmpeg-5.1-war.patch create mode 100644 unpaper-7.0.0-Use-avformat_alloc_output_context2-to-create-the-out.patch diff --git a/unpaper-7.0.0-Set-the-update-option-to-suppress-the-ffmpeg-5.1-war.patch b/unpaper-7.0.0-Set-the-update-option-to-suppress-the-ffmpeg-5.1-war.patch new file mode 100644 index 0000000..f8eb9be --- /dev/null +++ b/unpaper-7.0.0-Set-the-update-option-to-suppress-the-ffmpeg-5.1-war.patch @@ -0,0 +1,44 @@ +From a2a88fe837fd6770ac94f08b2eb841f0dc9d2430 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= +Date: Sat, 8 Oct 2022 10:14:46 +0100 +Subject: [PATCH] Set the `update` option to suppress the ffmpeg 5.1 warning. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This addresses Issue #113, the spurious warning coming from ffmpeg 5.1+ +about the filename not being an image sequence (we do our own sequencing +so we do not want it to be seen by ffmpeg at all!) + +Signed-off-by: Petr Písař +--- + file.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/file.c b/file.c +index fc24a4c..53ef727 100644 +--- a/file.c ++++ b/file.c +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include "tools.h" + #include "unpaper.h" +@@ -142,6 +143,11 @@ void saveImage(char *filename, AVFrame *input, int outputPixFmt) { + errOutput("unable to allocate output context."); + } + ++ if ((ret = av_opt_set(out_ctx->priv_data, "update", "true", 0)) < 0) { ++ av_strerror(ret, errbuff, sizeof(errbuff)); ++ errOutput("unable to configure update option: %s", errbuff); ++ } ++ + switch (outputPixFmt) { + case AV_PIX_FMT_RGB24: + output_codec = AV_CODEC_ID_PPM; +-- +2.37.3 + diff --git a/unpaper-7.0.0-Use-avformat_alloc_output_context2-to-create-the-out.patch b/unpaper-7.0.0-Use-avformat_alloc_output_context2-to-create-the-out.patch new file mode 100644 index 0000000..b388b1f --- /dev/null +++ b/unpaper-7.0.0-Use-avformat_alloc_output_context2-to-create-the-out.patch @@ -0,0 +1,55 @@ +From d29fd2cf84ea386c67ecb0302adebc0700088d94 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= +Date: Sat, 8 Oct 2022 00:16:20 +0100 +Subject: [PATCH] Use avformat_alloc_output_context2() to create the out + context. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This simplifies the API usage quite a bit, while maintaining the same +logic as previously. + +Signed-off-by: Petr Písař +--- + file.c | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) + +diff --git a/file.c b/file.c +index d9c239e..fc24a4c 100644 +--- a/file.c ++++ b/file.c +@@ -127,7 +127,6 @@ void loadImage(const char *filename, AVFrame **image) { + * @return true on success, false on failure + */ + void saveImage(char *filename, AVFrame *input, int outputPixFmt) { +- const AVOutputFormat *fmt = NULL; + enum AVCodecID output_codec = -1; + const AVCodec *codec; + AVFormatContext *out_ctx; +@@ -138,20 +137,11 @@ void saveImage(char *filename, AVFrame *input, int outputPixFmt) { + int ret; + char errbuff[1024]; + +- fmt = av_guess_format("image2", NULL, NULL); +- +- if (!fmt) { +- errOutput("could not find suitable output fmt."); +- } +- +- out_ctx = avformat_alloc_context(); +- if (!out_ctx) { ++ if (avformat_alloc_output_context2(&out_ctx, NULL, "image2", filename) < 0 || ++ out_ctx == NULL) { + errOutput("unable to allocate output context."); + } + +- out_ctx->oformat = fmt; +- out_ctx->url = av_strdup(filename); +- + switch (outputPixFmt) { + case AV_PIX_FMT_RGB24: + output_codec = AV_CODEC_ID_PPM; +-- +2.37.3 + diff --git a/unpaper.spec b/unpaper.spec index 73aeec7..e032a8e 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,6 +1,6 @@ Name: unpaper Version: 7.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Post-processing of scanned and photocopied book pages # AUTHORS: GPLv2 # constants.h: GPLv2 @@ -42,6 +42,14 @@ Source0: https://www.flameeyes.eu/files/%{name}-%{version}.tar.xz #Source1: https://www.flameeyes.eu/files/%%{name}-%%{version}.tar.xz.sig ## A key exported from keyserver on 2022-02-25. #Source2: gpgkey-BDAEF3008A1CC62079C2A16847664B94E36B629F.gpg +# 1/2Set an update option to supress a warning with ffmpeg-5.1, +# in upstream after 7.0.0, +# +Patch0: unpaper-7.0.0-Use-avformat_alloc_output_context2-to-create-the-out.patch +# 2/2 Set an update option to supress a warning with ffmpeg-5.1, +# in upstream after 7.0.0, +# +Patch1: unpaper-7.0.0-Set-the-update-option-to-suppress-the-ffmpeg-5.1-war.patch BuildRequires: gcc #BuildRequires: gnupg2 BuildRequires: meson >= 0.57 @@ -122,6 +130,9 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %{_libexecdir}/%{name} %changelog +* Mon Oct 10 2022 Petr Pisar - 7.0.0-4 +- Set an update option to supress a warning with ffmpeg-5.1 (upstream #113) + * Mon Aug 29 2022 Neal Gompa - 7.0.0-3 - Rebuild for ffmpeg 5.1 (#2121070) From 422f187bdec553b3583ef15c0f74fcac4070a1ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 10 Oct 2022 14:47:13 +0200 Subject: [PATCH 12/27] Escape all percents in a comment --- unpaper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unpaper.spec b/unpaper.spec index e032a8e..f3c0b52 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -94,7 +94,7 @@ Tests from %{name}. Execute them with "%{_libexecdir}/%{name}/test". %prep -#%%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +#%%{gpgverify} --keyring='%%{SOURCE2}' --signature='%%{SOURCE1}' --data='%%{SOURCE0}' %autosetup -p1 %build From 10ff7477c00065ddd792f541a8031b99bcee5d72 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:51:37 +0000 Subject: [PATCH 13/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- unpaper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unpaper.spec b/unpaper.spec index f3c0b52..bfa80b0 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,6 +1,6 @@ Name: unpaper Version: 7.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Post-processing of scanned and photocopied book pages # AUTHORS: GPLv2 # constants.h: GPLv2 @@ -130,6 +130,9 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %{_libexecdir}/%{name} %changelog +* 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) From cd0cb68ef9740a16ac570bb3d77ebb5627090eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 8 Feb 2023 12:27:46 +0100 Subject: [PATCH 14/27] Convert license tags to an SPDX format --- unpaper.spec | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/unpaper.spec b/unpaper.spec index bfa80b0..c29f522 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,40 +1,40 @@ Name: unpaper Version: 7.0.0 -Release: 5%{?dist} +Release: 6%{?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 +# 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 # LICENSES/0BSD.txt: 0BSD text -# LICENSES/GPL-2.0-only.txt: GPLv2 text -# other files: GPLv2 -# README.md: GPLv2 +# LICENSES/GPL-2.0-only.txt: GPL-2.0 text +# other files: GPL-2.0-only +# README.md: GPL-2.0-only # version.h.in: 0BSD ## In tests subpackage # LICENSES/MIT.txt: MIT text -# tests/golden_images/*.license GPLv2 -# tests/source_images/*.license GPLv2 -# tests/unpaper_tests.py: GPLv2 and MIT -## Not in the binary package +# 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 # doc/conf.py: MIT -# LICENSES/Apache-2.0.txt: ASL 2.0 text +# LICENSES/Apache-2.0.txt: Apache-2.0 text # meson.build: MIT # .dir-locals.el: MIT # .editorconfig: 0BSD -# .github/workflows/meson-build-and-test.yml: ASL 2.0 +# .github/workflows/meson-build-and-test.yml: Apache-2.0 # .github/workflows/pre-commit.yml: MIT # .gitignore: MIT # .mailmap: MIT # .mergify.yml: MIT # .pre-commit-config.yaml: MIT -License: GPLv2 and 0BSD +License: GPL-2.0-only 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 @@ -80,7 +80,7 @@ angle. This process is called "deskewing". %package tests Summary: Tests for %{name} -License: GPLv2 and MIT +License: GPL-2.0-only AND MIT BuildArch: noarch Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} # python3-pillow for PIL Python module @@ -130,6 +130,9 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %{_libexecdir}/%{name} %changelog +* 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 From fd67f13a77187a3d1a343394273ac7dadf6e975a Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 12 Mar 2023 15:38:10 -0400 Subject: [PATCH 15/27] Rebuild for ffmpeg 6.0 --- unpaper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unpaper.spec b/unpaper.spec index c29f522..b9b78ad 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,6 +1,6 @@ Name: unpaper Version: 7.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Post-processing of scanned and photocopied book pages # AUTHORS: GPL-2.0-only # constants.h: GPL-2.0-only @@ -130,6 +130,9 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %{_libexecdir}/%{name} %changelog +* 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 From 1a8fccbf3dad90deac5fd4089450333c997c2777 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:09:39 +0000 Subject: [PATCH 16/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- unpaper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unpaper.spec b/unpaper.spec index b9b78ad..5a37fd8 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,6 +1,6 @@ Name: unpaper Version: 7.0.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Post-processing of scanned and photocopied book pages # AUTHORS: GPL-2.0-only # constants.h: GPL-2.0-only @@ -130,6 +130,9 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %{_libexecdir}/%{name} %changelog +* 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 From 8f726eedd3c0cdff3d6244f296196fd6e5148a7a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:09:41 +0000 Subject: [PATCH 17/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- unpaper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unpaper.spec b/unpaper.spec index 5a37fd8..0b5ce8f 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,6 +1,6 @@ Name: unpaper Version: 7.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Post-processing of scanned and photocopied book pages # AUTHORS: GPL-2.0-only # constants.h: GPL-2.0-only @@ -130,6 +130,9 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %{_libexecdir}/%{name} %changelog +* 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 From 105ecf0d1c1f6390926fbf3012c4a3067064c2ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:18:46 +0000 Subject: [PATCH 18/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- unpaper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unpaper.spec b/unpaper.spec index 0b5ce8f..af6157a 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,6 +1,6 @@ Name: unpaper Version: 7.0.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Post-processing of scanned and photocopied book pages # AUTHORS: GPL-2.0-only # constants.h: GPL-2.0-only @@ -130,6 +130,9 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %{_libexecdir}/%{name} %changelog +* 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 From 7a7db7ee98a09e8ce4dbe6cf66266cdec465f290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 23 Sep 2024 09:45:52 +0200 Subject: [PATCH 19/27] Modernize a spec file --- unpaper.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/unpaper.spec b/unpaper.spec index af6157a..d831f34 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,6 +1,6 @@ Name: unpaper Version: 7.0.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Post-processing of scanned and photocopied book pages # AUTHORS: GPL-2.0-only # constants.h: GPL-2.0-only @@ -34,6 +34,7 @@ Summary: Post-processing of scanned and photocopied book pages # .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 URL: https://www.flameeyes.eu/projects/%{name} Source0: https://www.flameeyes.eu/files/%{name}-%{version}.tar.xz @@ -121,8 +122,8 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %files %license LICENSES/0BSD.txt LICENSES/GPL-2.0-only.txt -%{_bindir}/* -%{_mandir}/man1/* +%{_bindir}/unpaper +%{_mandir}/man1/unpaper.* %doc AUTHORS doc/*.md doc/img NEWS README.md %files tests @@ -130,6 +131,9 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %{_libexecdir}/%{name} %changelog +* 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 From 682354d6fd05976801dc2b141141bd67a42edd61 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 23 Sep 2024 17:02:04 +0200 Subject: [PATCH 20/27] Rebuild for ffmpeg 7 --- unpaper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unpaper.spec b/unpaper.spec index d831f34..6472ec9 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,6 +1,6 @@ Name: unpaper Version: 7.0.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Post-processing of scanned and photocopied book pages # AUTHORS: GPL-2.0-only # constants.h: GPL-2.0-only @@ -131,6 +131,9 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %{_libexecdir}/%{name} %changelog +* 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 From 04c71f9e1aa8bf232f2df1df1ca2e57acb2a878d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:48:52 +0000 Subject: [PATCH 21/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- unpaper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unpaper.spec b/unpaper.spec index 6472ec9..d51166b 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,6 +1,6 @@ Name: unpaper Version: 7.0.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Post-processing of scanned and photocopied book pages # AUTHORS: GPL-2.0-only # constants.h: GPL-2.0-only @@ -131,6 +131,9 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %{_libexecdir}/%{name} %changelog +* 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 From ecca12cc73feea0c820143e11f87884dd8b635ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 6 Jun 2025 16:03:18 +0200 Subject: [PATCH 22/27] Require more gating tests --- gating.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gating.yaml b/gating.yaml index 282e16b..c778f75 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,7 +1,16 @@ --- !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} From e23cea17b89ce20401168d6a304f96405fd25dfa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:48:43 +0000 Subject: [PATCH 23/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- unpaper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unpaper.spec b/unpaper.spec index d51166b..b40aa04 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,6 +1,6 @@ Name: unpaper Version: 7.0.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Post-processing of scanned and photocopied book pages # AUTHORS: GPL-2.0-only # constants.h: GPL-2.0-only @@ -131,6 +131,9 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %{_libexecdir}/%{name} %changelog +* 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 From 1f69bae87fe99ff0012b3f2c5f486cf2bd27ee9f Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 15 Oct 2025 10:43:03 +0200 Subject: [PATCH 24/27] Rebuilt for FFmpeg 8 --- unpaper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unpaper.spec b/unpaper.spec index b40aa04..144b5e1 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,6 +1,6 @@ Name: unpaper Version: 7.0.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Post-processing of scanned and photocopied book pages # AUTHORS: GPL-2.0-only # constants.h: GPL-2.0-only @@ -131,6 +131,9 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %{_libexecdir}/%{name} %changelog +* 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 From 2c735bbae30a85c5acdac71d1465ecc06f2b0068 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:38:06 +0000 Subject: [PATCH 25/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- unpaper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unpaper.spec b/unpaper.spec index 144b5e1..cfcd2ed 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,6 +1,6 @@ Name: unpaper Version: 7.0.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Post-processing of scanned and photocopied book pages # AUTHORS: GPL-2.0-only # constants.h: GPL-2.0-only @@ -131,6 +131,9 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %{_libexecdir}/%{name} %changelog +* 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 From 13f711d6e03001706e4235a974d2e3eab25a86a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:12:44 +0000 Subject: [PATCH 26/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- unpaper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unpaper.spec b/unpaper.spec index cfcd2ed..d1cf862 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,6 +1,6 @@ Name: unpaper Version: 7.0.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Post-processing of scanned and photocopied book pages # AUTHORS: GPL-2.0-only # constants.h: GPL-2.0-only @@ -131,6 +131,9 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test %{_libexecdir}/%{name} %changelog +* 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 From 7c9a58a579c04f238295005e8f301d753446aca1 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 3 Sep 2026 22:08:31 +0200 Subject: [PATCH 27/27] Rebuilt for FFmpeg 9 --- unpaper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unpaper.spec b/unpaper.spec index d1cf862..505acaa 100644 --- a/unpaper.spec +++ b/unpaper.spec @@ -1,6 +1,6 @@ Name: unpaper Version: 7.0.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Post-processing of scanned and photocopied book pages # AUTHORS: GPL-2.0-only # constants.h: GPL-2.0-only @@ -131,6 +131,9 @@ 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