- updated to 1.66

[packages/cvs-fast-export.git] / cvs-fast-export.spec

diff --git a/cvs-fast-export.spec b/cvs-fast-export.spec
index 3b3425dd5282040e64fceed0eca34b3c9223c503..2649aabc5723f3b48c95aadf393df5199e047afc 100644 (file)
--- a/cvs-fast-export.spec
+++ b/cvs-fast-export.spec
@@ -1,26 +1,28 @@
 #
 # 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.34
+Version:       1.66
 Release:       1
 License:       GPL v2
 Group:         Development/Version Control
 Source0:       http://www.catb.org/~esr/cvs-fast-export/%{name}-%{version}.tar.gz
-# Source0-md5: 338197d21e5c9096b983c0fc83b8aeb5
+# Source0-md5: b619c3dc9c72cc1b14f8b4fefdcb4f32
+Patch0:                hack-disable-cvsignore.patch
+Patch1:                %{name}-tsan.patch
+Patch2:                %{name}-asan.patch
+Patch3:                %{name}-ubsan.patch
 URL:           http://www.catb.org/~esr/cvs-fast-export/
 BuildRequires: asciidoc
 BuildRequires: sed >= 4.0
+%if %{with tests}
+BuildRequires: cvs
+%endif
 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
@@ -45,8 +47,12 @@ ze zdalnych serwerów CVS.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -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 \
@@ -54,10 +60,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
@@ -67,7 +77,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