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

Patch mergetools.rc for filemerge bug

Browse Source
This commit is contained in:
Neal Becker 2009-02-07 12:20:32 +00:00
parent 118e315cf3
commit ba1ea22221
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mercurial.spec
View File

@ -9,6 +9,8 @@ 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-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 BuildRequires: emacs emacs-el pkgconfig
@ -24,7 +26,6 @@ Tutorial: http://www.selenic.com/mercurial/wiki/index.cgi/Tutorial
Extensions: http://www.selenic.com/mercurial/wiki/index.cgi/CategoryExtension Extensions: http://www.selenic.com/mercurial/wiki/index.cgi/CategoryExtension
%define pkg mercurial %define pkg mercurial
#%define pkgname Foo
# If the emacs-el package has installed a pkgconfig file, use that to determine # If the emacs-el package has installed a pkgconfig file, use that to determine
# install locations and Emacs version at build time, otherwise set defaults. # install locations and Emacs version at build time, otherwise set defaults.
@ -78,6 +79,7 @@ documentation.
%prep %prep
%setup -q %setup -q
%patch0 -p0
%build %build
make all make all
@ -129,7 +131,7 @@ path=%{_libexecdir}/mercurial/hgk
EOF EOF
install hgk.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d install hgk.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc.sample install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT