Sync from SUSE:SLFO:Main mercurial revision 5df8eda1ad70eb124f7b3c8d9c22b634
This commit is contained in:
commit
5119b52a6b
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
3
cacerts.rc
Normal file
3
cacerts.rc
Normal file
@ -0,0 +1,3 @@
|
||||
[web]
|
||||
cacerts = /etc/ssl/ca-bundle.pem
|
||||
|
||||
BIN
mercurial-6.4.3.tar.gz
(Stored with Git LFS)
Normal file
BIN
mercurial-6.4.3.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
11
mercurial-docutils-compat.diff
Normal file
11
mercurial-docutils-compat.diff
Normal file
@ -0,0 +1,11 @@
|
||||
--- doc/Makefile.orig 2011-03-09 13:05:17.000000000 +0100
|
||||
+++ doc/Makefile 2011-03-09 13:06:03.000000000 +0100
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
%: %.txt %.gendoc.txt common.txt
|
||||
$(PYTHON) runrst hgmanpage $(RSTARGS) --halt warning \
|
||||
- --strip-elements-with-class htmlonly $*.txt $*
|
||||
+ $*.txt $*
|
||||
|
||||
%.html: %.txt %.gendoc.txt common.txt
|
||||
$(PYTHON) runrst html $(RSTARGS) --halt warning \
|
||||
15
mercurial-hgk-path-fix.diff
Normal file
15
mercurial-hgk-path-fix.diff
Normal file
@ -0,0 +1,15 @@
|
||||
Index: contrib/hgk
|
||||
===================================================================
|
||||
--- contrib/hgk.orig
|
||||
+++ contrib/hgk
|
||||
@@ -4086,6 +4086,10 @@ proc getconfig {} {
|
||||
}
|
||||
|
||||
# defaults...
|
||||
+if {![info exists env(HG)]} {
|
||||
+ set env(HG) "hg"
|
||||
+}
|
||||
+
|
||||
set datemode 0
|
||||
set boldnames 0
|
||||
set diffopts "-U 5 -p"
|
||||
11
mercurial-locale-path-fix.patch
Normal file
11
mercurial-locale-path-fix.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/mercurial/i18n.py
|
||||
+++ b/mercurial/i18n.py
|
||||
@@ -58,7 +58,7 @@ if (
|
||||
|
||||
|
||||
datapath = pycompat.fsdecode(resourceutil.datapath)
|
||||
-localedir = os.path.join(datapath, 'locale')
|
||||
+localedir = '/usr/share/locale'
|
||||
t = gettextmod.translation('hg', localedir, _languages, fallback=True)
|
||||
try:
|
||||
_ugettext = t.ugettext # pytype: disable=attribute-error
|
||||
1
mercurial-rpmlintrc
Normal file
1
mercurial-rpmlintrc
Normal file
@ -0,0 +1 @@
|
||||
addFilter("python-naming-policy-not-applied")
|
||||
4583
mercurial.changes
Normal file
4583
mercurial.changes
Normal file
File diff suppressed because it is too large
Load Diff
151
mercurial.spec
Normal file
151
mercurial.spec
Normal file
@ -0,0 +1,151 @@
|
||||
#
|
||||
# spec file for package mercurial
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
|
||||
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
|
||||
%endif
|
||||
Name: mercurial
|
||||
Version: 6.4.3
|
||||
Release: 0
|
||||
Summary: Scalable Distributed SCM
|
||||
License: GPL-2.0-or-later
|
||||
Group: Development/Tools/Version Control
|
||||
URL: https://www.mercurial-scm.org/
|
||||
Source: https://www.mercurial-scm.org/release/mercurial-%{version}.tar.gz
|
||||
Source1: cacerts.rc
|
||||
Source99: mercurial-rpmlintrc
|
||||
Patch0: mercurial-hgk-path-fix.diff
|
||||
# PATCH-FIX-OPENSUSE mercurial-docutils-compat.diff -- Fix for new docutils options not available on 11.1 and older
|
||||
Patch1: mercurial-docutils-compat.diff
|
||||
# PATCH-FIX-OPENSUSE mercurial-locale-path-fix.patch saschpe@suse.de -- locales are found in /usr/share/locale
|
||||
Patch2: mercurial-locale-path-fix.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: python3
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-xml
|
||||
Requires: python3-curses
|
||||
Requires: python3-xml
|
||||
Recommends: %{name}-lang
|
||||
Provides: hg = %{version}
|
||||
%if 0%{?suse_version} < 1210
|
||||
BuildRequires: docutils
|
||||
%else
|
||||
BuildRequires: python3-docutils
|
||||
%endif
|
||||
%if 0%{?sles_version}
|
||||
Requires: openssl-certs
|
||||
%else
|
||||
Requires: ca-certificates
|
||||
%endif
|
||||
%if 0%{?with_tests}
|
||||
Source90: tests.blacklist
|
||||
BuildRequires: bzr
|
||||
BuildRequires: git
|
||||
BuildRequires: gpg
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: python3-Pygments
|
||||
BuildRequires: subversion-python
|
||||
BuildRequires: unzip
|
||||
#BuildRequires: python-pyflakes
|
||||
%endif
|
||||
|
||||
%description
|
||||
Mercurial is a fast, lightweight source control management system
|
||||
designed for efficient handling of very large distributed projects.
|
||||
|
||||
%lang_package
|
||||
|
||||
%package tests
|
||||
Summary: Mercurial tests
|
||||
Group: Development/Tools/Version Control
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%description tests
|
||||
Mercurial is a fast, lightweight source control management system
|
||||
designed for efficient handling of very large distributed projects.
|
||||
|
||||
This package contains its tests.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
|
||||
%patch1
|
||||
%endif
|
||||
%patch2 -p1
|
||||
|
||||
sed -i -e '1s@env @@' contrib/hgk
|
||||
|
||||
chmod 644 hgweb.cgi
|
||||
|
||||
%build
|
||||
%make_build all PYTHON=python3
|
||||
%make_build -C contrib/chg all
|
||||
|
||||
%install
|
||||
make install PREFIX="%{_prefix}" DESTDIR=%{buildroot} PYTHON=python3
|
||||
make -C contrib/chg install PREFIX="%{_prefix}" DESTDIR=%{buildroot}
|
||||
|
||||
# Move locales to proper location
|
||||
mkdir -p %{buildroot}%{_datadir}/locale
|
||||
mv %{buildroot}%{python3_sitearch}/mercurial/locale/* %{buildroot}%{_datadir}/locale
|
||||
%find_lang hg
|
||||
|
||||
# Install stuff in contrib
|
||||
install -m0755 contrib/hgk %{buildroot}%{_bindir}
|
||||
install -Dm0644 contrib/bash_completion %{buildroot}%{_datadir}/bash-completion/completions/hg
|
||||
install -Dm0644 contrib/zsh_completion %{buildroot}%{_datadir}/zsh/site-functions/_mercurial
|
||||
mkdir -p %{buildroot}%{_datadir}/{x,}emacs/site-lisp
|
||||
install -m0644 contrib/*.el %{buildroot}%{_datadir}/emacs/site-lisp
|
||||
install -m0644 contrib/*.el %{buildroot}%{_datadir}/xemacs/site-lisp
|
||||
install -Dm0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/mercurial/hgrc.d/cacerts.rc
|
||||
%fdupes -s %{buildroot}%{_prefix}
|
||||
|
||||
mkdir -p %{buildroot}%{_datadir}/mercurial
|
||||
cp -a tests/. %{buildroot}%{_datadir}/mercurial/tests
|
||||
|
||||
%if 0%{?with_tests}
|
||||
%check
|
||||
%make_build tests TESTFLAGS="-v --blacklist=%{SOURCE90}" PYTHON=python3
|
||||
%endif
|
||||
|
||||
%files lang -f hg.lang
|
||||
|
||||
%files tests
|
||||
%dir %{_datadir}/mercurial
|
||||
%{_datadir}/mercurial/tests
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc README.rst CONTRIBUTORS hgweb.cgi
|
||||
%{_bindir}/*
|
||||
%{_datadir}/bash-completion/completions/*
|
||||
%{_datadir}/zsh/
|
||||
%dir %{_sysconfdir}/mercurial
|
||||
%dir %{_sysconfdir}/mercurial/hgrc.d
|
||||
%config %{_sysconfdir}/mercurial/hgrc.d/*
|
||||
%{_datadir}/emacs
|
||||
%{_datadir}/xemacs
|
||||
%{_mandir}/man1/hg.1%{?ext_man}
|
||||
%{_mandir}/man1/chg.1%{?ext_man}
|
||||
%{_mandir}/man5/hgignore.5%{?ext_man}
|
||||
%{_mandir}/man5/hgrc.5%{?ext_man}
|
||||
%{_mandir}/man8/hg-ssh.8%{?ext_man}
|
||||
%{python3_sitearch}/*
|
||||
|
||||
%changelog
|
||||
2
tests.blacklist
Normal file
2
tests.blacklist
Normal file
@ -0,0 +1,2 @@
|
||||
test-i18n.t
|
||||
test-status-color.t
|
||||
Loading…
Reference in New Issue
Block a user