rpms/mercurial
5
0
Fork 0
Code Issues Pull Requests Releases Activity

add patch mercurial-i18n.patch for locale

Browse Source
This commit is contained in:
Neal Becker 2010-10-06 08:39:14 -04:00
parent 3f69f4d719
commit 0a9c455979
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mercurial-i18n.patch Normal file
View File

@ -0,0 +1,19 @@
*** /tmp/ediff2864wKI 2010-10-06 08:30:42.639138469 -0400
--- mercurial/i18n.py 2010-10-06 08:29:26.720138409 -0400
***************
*** 15,21 ****
module = __file__
base = os.path.dirname(module)
! for dir in ('.', '..'):
localedir = os.path.join(base, dir, 'locale')
if os.path.isdir(localedir):
break
--- 15,21 ----
module = __file__
base = os.path.dirname(module)
! for dir in ('.', '..', '/usr/share'):
localedir = os.path.join(base, dir, 'locale')
if os.path.isdir(localedir):
break

7
mercurial.spec
View File

@ -9,8 +9,7 @@ Group: Development/Tools
URL: http://www.selenic.com/mercurial/ URL: http://www.selenic.com/mercurial/
Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
Source1: mercurial-site-start.el Source1: mercurial-site-start.el
# temporary fix for filemerge bug Patch0: mercurial-i18n.patch
#Patch0: mercurial-mergetools.hgrc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: python python-devel BuildRequires: python python-devel
BuildRequires: emacs emacs-el pkgconfig gettext BuildRequires: emacs emacs-el pkgconfig gettext
@ -77,7 +76,7 @@ documentation.
%prep %prep
%setup -q %setup -q
#%patch0 -p1 %patch0 -p0
%build %build
make all make all
@ -130,6 +129,8 @@ install -m 644 hgk.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
install -m 644 contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc install -m 644 contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
mv $RPM_BUILD_ROOT%{python_sitearch}/mercurial/locale $RPM_BUILD_ROOT%{_datadir}/locale mv $RPM_BUILD_ROOT%{python_sitearch}/mercurial/locale $RPM_BUILD_ROOT%{_datadir}/locale
rm -rf $RPM_BUILD_ROOT%{python_sitearch}/mercurial/locale
%find_lang hg %find_lang hg