From 510cd7fe7b72dc26ed1b2362c200602947bc9688 Mon Sep 17 00:00:00 2001 From: jonathanspw Date: Jan 02 2023 18:24:53 +0000 Subject: update to 4.0 --- diff --git a/.gitignore b/.gitignore index b787da6..732c79d 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ RBTools-0.2.tar.gz /RBTools-2.0.1.tar.gz /RBTools-3.1.1.tar.gz /RBTools-3.1.2.tar.gz +/RBTools-4.0.tar.gz diff --git a/RBTools.spec b/RBTools.spec index a9a2217..84418a5 100644 --- a/RBTools.spec +++ b/RBTools.spec @@ -1,5 +1,5 @@ Name: RBTools -Version: 3.1.2 +Version: 4.0 Release: 1%{?dist} Summary: Tools for use with ReviewBoard @@ -32,7 +32,7 @@ Requires: python3-tqdm Requires: python3-texttable # Test dependencies: BuildRequires: cvs -BuildRequires: git +BuildRequires: git-core BuildRequires: mercurial BuildRequires: python3-pytest-env BuildRequires: python3-kgb @@ -67,7 +67,10 @@ rm -Rf %{name}*.egg-info rm -rf rbtools/clients/tests/test_svn.py \ rbtools/clients/tests/test_scanning.py \ rbtools/commands/tests/test_alias.py -%pytest +# we need git to function +git config --global user.email "you@example.com" +git config --global user.name "Your Name" +%pytest -k 'not GitPerforceClientTests and not GitSubversionClientTests' %install @@ -93,7 +96,10 @@ cp rbtools/commands/conf/_rbt-zsh-completion \ %{python3_sitelib}/%{name}-%{version}.dist-info/ %changelog -* Mon Dec 02 2023 Jonathan Wright - 3.1.2-1 +* Mon Jan 02 2023 Jonathan Wright - 4.0-1 +- Update to 4.0 + +* Mon Jan 02 2023 Jonathan Wright - 3.1.2-1 - Update to 3.1.2 - Fix for python 3.11 diff --git a/build_release.patch b/build_release.patch index b416175..9a745db 100644 --- a/build_release.patch +++ b/build_release.patch @@ -1,8 +1,8 @@ -diff -uNr rbtools-release-3.1.1.orig/setup.cfg rbtools-release-3.1.1/setup.cfg ---- rbtools-release-3.1.1.orig/setup.cfg 2022-08-07 16:59:01.701501955 -0500 -+++ rbtools-release-3.1.1/setup.cfg 2022-08-07 18:25:08.943574967 -0500 -@@ -14,10 +14,6 @@ - universal = 1 +diff -uNr rbtools-release-4.0.orig/setup.cfg rbtools-release-4.0/setup.cfg +--- rbtools-release-4.0.orig/setup.cfg 2023-01-02 11:53:09.793890761 -0600 ++++ rbtools-release-4.0/setup.cfg 2023-01-02 11:54:01.373524817 -0600 +@@ -10,10 +10,6 @@ + release = egg_info -Db '' -[egg_info] diff --git a/sources b/sources index d77f36c..e7875ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (RBTools-3.1.2.tar.gz) = 2a21627a5d535bf3270bd02d7cfa1ddec8c5ce9760375fc4a03f9a6221f1fd3be62fbc03820619164caac2bfab20039ac2cb68e9a39747b0c2e54a33194496f5 +SHA512 (RBTools-4.0.tar.gz) = f2d91ced0aef7ed5a57dadcb8e38e7c030252c4cddaccde3a9fe85bf87e30ff14958a1da62f96707bd1d201312dd234cace6ed7e25ff3b650bb8911ff33bd605