RPMSpec · 1685 bytes Raw Blame History
1 Name: fit
2 Version: 0.1.0
3 Release: 1%{?dist}
4 Summary: Terminal-based merge conflict resolver with three-pane TUI interface
5
6 License: MIT
7 %global debug_package %{nil}
8 URL: https://github.com/FortranGoingOnForty/fit
9 Source0: %{name}-%{version}.tar.gz
10
11 BuildRequires: gfortran >= 4.8
12 BuildRequires: make
13 Requires: glibc
14 Requires: git
15
16 %description
17 fit is a terminal-based merge conflict resolver with a three-pane TUI interface,
18 written in Modern Fortran.
19
20 Features:
21 - Three-Pane Layout: Visual side-by-side comparison similar to VS Code's merge conflict UI
22 - Left pane: Incoming changes (from remote/HEAD)
23 - Right pane: Local changes (current branch)
24 - Bottom pane: Live preview of your resolution choice
25 - Color-Coded Diffs: Green + for incoming additions, Red - for local changes
26 - Sequential Navigation: Navigate through multiple conflicts with keyboard shortcuts
27 - Interactive Resolution: Choose incoming, local, or both changes for each conflict
28
29 %prep
30 %autosetup
31
32 %build
33 make release
34
35 %install
36 mkdir -p %{buildroot}%{_bindir}
37 mkdir -p %{buildroot}%{_docdir}/%{name}
38
39 # Install binary
40 install -Dm755 bin/fit %{buildroot}%{_bindir}/fit
41
42 # Install documentation
43 install -Dm644 README.md %{buildroot}%{_docdir}/%{name}/README.md
44
45 %files
46 %{_bindir}/fit
47 %{_docdir}/%{name}/README.md
48
49 %changelog
50 * Sun Oct 26 2025 mfw <espadon@outlook.com> - 0.1.0-1
51 - Initial release of fit
52 - Terminal-based merge conflict resolver
53 - Three-pane TUI interface (incoming, local, preview)
54 - Color-coded diffs with visual indicators
55 - Interactive resolution with keyboard shortcuts
56 - Sequential navigation through multiple conflicts
57