From 03b2cd48628d8743800cdf2f327364cc2d20c319 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Mon, 7 Jul 2025 19:33:59 -0700 Subject: [PATCH] fix(nim,nim-nightly): provides and conflicts and files (#5786) (#5789) * fix(nim-nightly): provides and conflicts and files * also fix nim --------- (cherry picked from commit c2bb6258a62c79e454986c1f3326f0ced9718eec) Signed-off-by: madomado Co-authored-by: madomado --- anda/langs/nim/nim-nightly/nim-nightly.spec | 11 ++++++----- anda/langs/nim/nim/nim.spec | 4 +++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index e8c5cd8d5d..354160440b 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -7,7 +7,7 @@ Name: nim-nightly Version: %ver^%commit_date.%shortcommit -Release: 1%?dist +Release: 2%?dist Summary: Imperative, multi-paradigm, compiled programming language License: MIT and BSD URL: https://nim-lang.org @@ -19,8 +19,9 @@ BuildRequires: gcc mold git gcc-c++ nodejs openssl-devel pkgconfig(bash-completi Requires: redhat-rpm-config gcc Conflicts: choosenim # somehow wrong name and never noticed -Provides: nim-nightly = %version-%release Obsoletes: nim-nighlty < 2.1.1^20240404.9e1b170-2 +Conflicts: nim +Recommends: nim-nightly-tools nimble %description @@ -33,6 +34,7 @@ order of priority). Summary: Tools for Nim programming language Provides: nim-nightly-tools = %version-%release Obsoletes: nim-nighlty-tools < 2.1.1^20240404.9e1b170-2 +Conflicts: nim-tools %description tools Nim is a compiled, garbage-collected systems programming language with a @@ -102,7 +104,6 @@ sh ./install.sh %buildroot/usr/bin mkdir -p %buildroot/%_bindir %buildroot/%_datadir/bash-completion/completions %buildroot/usr/lib/nim %buildroot%_datadir install -Dpm755 bin/nim{grep,suggest,pretty} %buildroot/%_bindir install -Dpm644 tools/nim.bash-completion %buildroot/%_datadir/bash-completion/completions/nim -install -Dpm644 dist/nimble/nimble.bash-completion %buildroot/%_datadir/bash-completion/completions/nimble install -Dpm644 -t%buildroot/%_mandir/man1 %SOURCE1 %SOURCE2 %SOURCE4 mv %buildroot%_bindir/nim %buildroot%_datadir/ ln -s %_datadir/nim/bin/nim %buildroot%_bindir/nim @@ -131,9 +132,9 @@ cp -r %buildroot%_prefix/lib/nim/dist %buildroot%_datadir/nim/ %files %license copying.txt dist/nimble/license.txt %doc doc/readme.txt -%_bindir/nim{,ble} +%_bindir/nim %_mandir/man1/nim.1.* -%_datadir/bash-completion/completions/nim{,ble} +%_datadir/bash-completion/completions/nim %_datadir/nim/ %_prefix/lib/nim/ %_sysconfdir/nim/ diff --git a/anda/langs/nim/nim/nim.spec b/anda/langs/nim/nim/nim.spec index c48e0f91c7..f748318f81 100644 --- a/anda/langs/nim/nim/nim.spec +++ b/anda/langs/nim/nim/nim.spec @@ -3,7 +3,7 @@ Name: nim Version: 2.2.4 -Release: 2%?dist +Release: 3%?dist Summary: Imperative, multi-paradigm, compiled programming language License: MIT and BSD URL: https://nim-lang.org @@ -14,6 +14,8 @@ Source4: nimsuggest.1 BuildRequires: gcc mold git-core gcc-c++ nodejs openssl-devel pkgconfig(bash-completion) gc-devel pcre-devel BuildRequires: redhat-rpm-config anda-srpm-macros Requires: gcc +Recommends: nim-tools +Conflicts: nimble %description