summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schneider <qsx@chaotikum.eu>2024-04-19 13:21:41 +0200
committerThomas Schneider <qsx@chaotikum.eu>2024-04-19 13:21:41 +0200
commit3e49c14e935077ce6992296aa4e4478df680ac30 (patch)
tree7c07804c2ba0583665468ad143fab83542fb4766
parente389198b66e7727ca73e5661b84114b376ce4982 (diff)
New upstream release 0.1.78
-rw-r--r--.gitignore2
-rw-r--r--catch.patch22
-rw-r--r--chr.spec10
-rw-r--r--sources2
4 files changed, 4 insertions, 32 deletions
diff --git a/.gitignore b/.gitignore
index e56468b..19ea511 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
*.rpm
/results_chr
-/editor-0.1.77.tar.gz
+/editor-*.tar.gz
diff --git a/catch.patch b/catch.patch
deleted file mode 100644
index d7b74f4..0000000
--- a/catch.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/catchwrapper.h b/src/catchwrapper.h
-index b2108b2..9d57f82 100644
---- a/src/catchwrapper.h
-+++ b/src/catchwrapper.h
-@@ -10,7 +10,12 @@
- #include <Tui/ZColor.h>
- #include <Tui/ZDocument.h>
-
--#include <../third-party/catch.hpp>
-+#ifdef CATCH3
-+#include <catch2/catch_all.hpp>
-+using Catch::Approx;
-+#else
-+#include <catch2/catch.hpp>
-+#endif
-
- #include "filecategorize.h"
-
-diff --git a/third-party/catch.hpp b/third-party/catch2/catch.hpp
-similarity index 100%
-rename from third-party/catch.hpp
-rename to third-party/catch2/catch.hpp
diff --git a/chr.spec b/chr.spec
index 02e0a0d..5109014 100644
--- a/chr.spec
+++ b/chr.spec
@@ -1,5 +1,5 @@
Name: chr
-Version: 0.1.77
+Version: 0.1.78
Release: %autorelease
Summary: Terminal editor is inspired by the Turbo Pascal editor
@@ -10,8 +10,6 @@ License: Boost
URL: %{forgeurl}
Source0: %{forgeurl}/releases/download/%{version}/editor-%{version}.tar.gz
-Patch0: catch.patch
-
BuildRequires: meson
BuildRequires: gcc-c++
BuildRequires: qt5-qtbase-devel
@@ -39,14 +37,10 @@ rm -rf third-party/catch2
%install
%meson_install
-install -D -m0644 manpages/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
-install -D -m0644 manpages/%{name}.de.1 %{buildroot}%{_mandir}/de/man1/%{name}.1
%check
-pushd %{_vpath_builddir}/src
-./tests
-popd
+%meson_test
%files
diff --git a/sources b/sources
index cab9c8a..db000ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (editor-0.1.77.tar.gz) = e5cc9fb337774f936363bdacffc0c85c4d4cd885b7829df1df89a8fed787e7d89515efead1e7ae65dd1a86b27a2dec86cf993470396117bcb289f82a2f76ab75
+SHA512 (editor-0.1.78.tar.gz) = 15548c93520e7c51b675fb3a7681f226d04f05701195fabb9a43f7e10a4b37ffa92c75ed67b8ec724ac9674a2babb423ccec2a6ca0f1be4247b63981aba4991d