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

patch for filemerge bug should (hopefully) not be needed

Browse Source
This commit is contained in:
Neal Becker 2009-03-05 01:52:29 +00:00
parent 4c4848fc13
commit 72340f9f97
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mercurial.spec
View File

@ -3,14 +3,14 @@
Summary: A fast, lightweight distributed source control management system Summary: A fast, lightweight distributed source control management system
Name: mercurial Name: mercurial
Version: 1.2 Version: 1.2
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2 License: GPLv2
Group: Development/Tools 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 # temporary fix for filemerge bug
Patch0: mercurial-mergetools.hgrc.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 BuildRequires: emacs emacs-el pkgconfig
@ -79,7 +79,7 @@ documentation.
%prep %prep
%setup -q %setup -q
%patch0 -p1 #%patch0 -p1
%build %build
make all make all
@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT
#cd tests && %{__python} run-tests.py #cd tests && %{__python} run-tests.py
%changelog %changelog
* Wed Mar 4 2009 Neal Becker <ndbecker2@gmail.com> - 1.2-2
- patch0 for filemerge bug should not be needed
* Wed Mar 4 2009 Neal Becker <ndbecker2@gmail.com> - 1.2-1 * Wed Mar 4 2009 Neal Becker <ndbecker2@gmail.com> - 1.2-1
- Update to 1.2 - Update to 1.2