From ab5a43251c8c1e9ce054a1e8c24cedd183b833d0 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Sun, 3 Jan 2021 02:22:16 +0100 Subject: [PATCH] Drop the -lang package --- mercurial.spec | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/mercurial.spec b/mercurial.spec index f1a7443..e0fb959 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -24,10 +24,10 @@ BuildRequires: python3-docutils Provides: hg = %{version}-%{release} Requires: python3 Requires: emacs-filesystem -Requires: %{name}-lang = %{version}-%{release} # TODO: drop these obsoletes in F36 Obsoletes: %{name}-py2 < %{version}-%{release} Obsoletes: %{name}-py3 < %{version}-%{release} +Obsoletes: %{name}-lang < %{version}-%{release} %description Mercurial is a fast, lightweight source control management system designed @@ -68,12 +68,6 @@ Mercurial. When you type chg, a C program connects to that background process and executes Mercurial commands. -%package lang -Summary: Locales for mercurial - -%description lang -Locales for mercurial. - %prep %setup -q -n %{name}-%{upstreamversion} @@ -153,12 +147,10 @@ rm -rf %{buildroot}%{python3_sitearch}/mercurial/locale %find_lang hg -grep -v locale %{name}-base.files > %{name}-base-filtered.files - pathfix.py -pni "%{python3}" %{buildroot}%{_bindir}/hg-ssh -%files -f %{name}-base-filtered.files +%files -f %{name}-base.files -f hg.lang %doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html *.cgi contrib/*.fcgi contrib/*.wsgi %doc %attr(644,root,root) %{_mandir}/man?/hg*.gz %doc %attr(644,root,root) contrib/*.svg @@ -187,8 +179,6 @@ pathfix.py -pni "%{python3}" %{buildroot}%{_bindir}/hg-ssh %{_bindir}/chg %doc %attr(644,root,root) %{_mandir}/man?/chg.*.gz -%files lang -f hg.lang - #%%check # This will now fail everytime. Mercurial is not ported properly for Python3