[packages/cvs-fast-export] - updated to 1.62, enabled tests; python3 now

[qboosh]

commit 3b06bcd7795cd7817c0879a8032eef84ec64a3da
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Dec 10 13:46:44 2023 +0100

    - updated to 1.62, enabled tests; python3 now

 cvs-fast-export.spec         | 21 ++++++++++-----------
 hack-disable-cvsignore.patch | 10 +++++-----
 2 files changed, 15 insertions(+), 16 deletions(-)
---
diff --git a/cvs-fast-export.spec b/cvs-fast-export.spec
index 0fba5e5..a457d6c 100644
--- a/cvs-fast-export.spec
+++ b/cvs-fast-export.spec
@@ -1,27 +1,22 @@
 #
 # Conditional build:
-%bcond_with	tests	# perform "make check" (tests/Makefile missing)
+%bcond_without	tests	# unit tests
 
 Summary:	Tool to export CVS history into a fast-import stream
 Summary(pl.UTF-8):	Narzędzie eksportujące historię CVS w postaci strumienia fast-import
 Name:		cvs-fast-export
-Version:	1.40
+Version:	1.62
 Release:	1
 License:	GPL v2
 Group:		Development/Version Control
 Source0:	http://www.catb.org/~esr/cvs-fast-export/%{name}-%{version}.tar.gz
-# Source0-md5:	7bc950e2853df9736c638226df1bd79e
+# Source0-md5:	8ed2dac4c7c1763d8351650d0bb2630c
 Patch0:		hack-disable-cvsignore.patch
 URL:		http://www.catb.org/~esr/cvs-fast-export/
 BuildRequires:	asciidoc
 BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# debugedit is broken:
-# extracting debug info from /home/users/glen/tmp/cvs-fast-export-1.30-root-glen/usr/bin/cvs-fast-export
-# /usr/lib/rpm/bin/debugedit: canonicalization unexpectedly shrank by one character
-%define		_enable_debug_packages	0
-
 %description
 Export an RCS or CVS history as a fast-import stream. This program
 analyzes a collection of RCS files in a CVS repository (or outside of
@@ -48,7 +43,7 @@ ze zdalnych serwerów CVS.
 %setup -q
 %patch0 -p1
 
-%{__sed} -i -e '1s,/usr/bin/env python,/usr/bin/python,' cvsconvert cvsreduce
+%{__sed} -i -e '1s,/usr/bin/env python3$,%{__python3},' cvsconvert cvsstrip
 
 %build
 %{__make} cvs-fast-export man \
@@ -56,10 +51,14 @@ ze zdalnych serwerów CVS.
 	EXTRA_CFLAGS="%{rpmcflags}" \
 	LDFLAGS="%{rpmldflags}"
 
-%{?with_tests:%{__make} check}
+%if %{with tests}
+# tests are racy, use -j1
+%{__make} -C tests -j1
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
 	prefix=%{_prefix} \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -69,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README TODO
+%doc NEWS.adoc README.adoc TODO.adoc
 %attr(755,root,root) %{_bindir}/cvs-fast-export
 %attr(755,root,root) %{_bindir}/cvsconvert
 %attr(755,root,root) %{_bindir}/cvssync
diff --git a/hack-disable-cvsignore.patch b/hack-disable-cvsignore.patch
index a287170..7d0db43 100644
--- a/hack-disable-cvsignore.patch
+++ b/hack-disable-cvsignore.patch
@@ -3,15 +3,15 @@ allow disabling .gitignore generation via env
 
 Upstream: https://gitlab.com/esr/cvs-fast-export/issues/13
 
---- cvs-fast-export-1.40/export.c~	2015-11-21 23:16:26.000000000 +0200
-+++ cvs-fast-export-1.40/export.c	2016-10-13 21:10:26.557838474 +0300
-@@ -491,8 +491,10 @@
+--- cvs-fast-export-1.62/export.c.orig	2023-12-10 13:22:44.800987007 +0100
++++ cvs-fast-export-1.62/export.c	2023-12-10 13:24:03.297228423 +0100
+@@ -570,8 +570,10 @@ export_commit(git_commit *commit, const
  	}
  	if (need_ignores) {
  	    need_ignores = false;
 +	    if (!getenv("DISABLE_GITIGNORE")) {
- 	    printf("M 100644 inline .gitignore\ndata %zd\n%s\n",
- 		   sizeof(CVS_IGNORES)-1, CVS_IGNORES);
+ 	    printf("M 100644 inline .gitignore\ndata %d\n%s\n",
+ 		   (int)sizeof(CVS_IGNORES)-1, CVS_IGNORES);
 +	    }
  	}
  	if (revpairs != NULL && strlen(revpairs) > 0)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cvs-fast-export.git/commitdiff/3b06bcd7795cd7817c0879a8032eef84ec64a3da