commit 7bb32c98f7fa5764519bea7113ec9f4d6ea1ca8f Author: Jan Palus <at...@pld-linux.org> Date: Sun Aug 16 18:39:23 2020 +0200
up to 0.4.2 patchutils-format.patch | 20 -------------------- patchutils.spec | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 27 deletions(-) --- diff --git a/patchutils.spec b/patchutils.spec index 5e88dfe..f4e3c70 100644 --- a/patchutils.spec +++ b/patchutils.spec @@ -4,18 +4,18 @@ Summary(pt_BR.UTF-8): Utilitário para Patches Summary(ru.UTF-8): Набор инструментов для работы с patch-файлами Summary(uk.UTF-8): Набір інструментів для роботи з patch-файлами Name: patchutils -Version: 0.3.4 +Version: 0.4.2 Release: 1 License: GPL v2+ Group: Applications/Text # also http://cyberelk.net/tim/data/patchutils/stable/ Source0: https://github.com/twaugh/patchutils/archive/%{version}.tar.gz -# Source0-md5: c3f709900079946109e539b11ee52d6c -Patch0: %{name}-format.patch -Patch1: %{name}-fixcvsdiff.patch +# Source0-md5: c7bfa14a0f9e07b995f8eac9227cb1bf +Patch0: %{name}-fixcvsdiff.patch URL: http://cyberelk.net/tim/patchutils/ BuildRequires: autoconf >= 2.50 BuildRequires: automake >= 1.6 +BuildRequires: pcre2-posix-devel BuildRequires: perl-base BuildRequires: tar >= 1:1.22 BuildRequires: xmlto @@ -141,15 +141,15 @@ patch-файлів непотрібних patch'ів на основі шабл %prep %setup -q -%patch0 -p1 -%patch1 -p0 +%patch0 -p0 %build %{__aclocal} %{__autoconf} %{__autoheader} %{__automake} -%configure +%configure \ + --with-pcre2 %{__make} %install @@ -171,12 +171,17 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/filterdiff %attr(755,root,root) %{_bindir}/fixcvsdiff %attr(755,root,root) %{_bindir}/flipdiff +%attr(755,root,root) %{_bindir}/gitdiff +%attr(755,root,root) %{_bindir}/gitdiffview %attr(755,root,root) %{_bindir}/grepdiff %attr(755,root,root) %{_bindir}/interdiff %attr(755,root,root) %{_bindir}/lsdiff +%attr(755,root,root) %{_bindir}/patchview %attr(755,root,root) %{_bindir}/recountdiff %attr(755,root,root) %{_bindir}/rediff %attr(755,root,root) %{_bindir}/splitdiff +%attr(755,root,root) %{_bindir}/svndiff +%attr(755,root,root) %{_bindir}/svndiffview %attr(755,root,root) %{_bindir}/unwrapdiff %{_mandir}/man1/combinediff.1* %{_mandir}/man1/dehtmldiff.1* @@ -188,6 +193,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/grepdiff.1* %{_mandir}/man1/interdiff.1* %{_mandir}/man1/lsdiff.1* +%{_mandir}/man1/patchview.1* %{_mandir}/man1/recountdiff.1* %{_mandir}/man1/rediff.1* %{_mandir}/man1/splitdiff.1* diff --git a/patchutils-format.patch b/patchutils-format.patch deleted file mode 100644 index 9a6bba5..0000000 --- a/patchutils-format.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- patchutils-0.3.3/src/filterdiff.c.orig 2011-05-26 15:47:46.000000000 +0200 -+++ patchutils-0.3.3/src/filterdiff.c 2013-07-11 16:31:31.894473188 +0200 -@@ -1263,7 +1263,7 @@ - char errstr[300]; - regerror (err, ®ex[num_regex - 1], errstr, - sizeof (errstr)); -- error (EXIT_FAILURE, 0, errstr); -+ error (EXIT_FAILURE, 0, "%s", errstr); - exit (1); - } - } -@@ -1509,7 +1509,7 @@ - char errstr[300]; - regerror (err, ®ex[num_regex - 1], errstr, - sizeof (errstr)); -- error (EXIT_FAILURE, 0, errstr); -+ error (EXIT_FAILURE, 0, "%s", errstr); - exit (1); - } - } ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/patchutils.git/commitdiff/7bb32c98f7fa5764519bea7113ec9f4d6ea1ca8f _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit