diff --git a/.cvsignore b/.cvsignore index 15f1911..721c89a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -mercurial-1.0.tar.gz -mercurial-site-start.el -mercurial-mergetools.hgrc.patch +mercurial-1.0.1.tar.gz diff --git a/mercurial.spec b/mercurial.spec index ca0ccfe..d37e5ac 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,17 +2,16 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.0 -Release: 15%{?dist} +Version: 1.0.1 +Release: 4%{?dist} License: GPLv2 Group: Development/Tools URL: http://www.selenic.com/mercurial/ Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz Source1: mercurial-site-start.el -Patch0: mercurial-mergetools.hgrc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: python-devel asciidoc xmlto -BuildRequires: emacs emacs-el +BuildRequires: python python-devel asciidoc xmlto +BuildRequires: emacs emacs-el pkgconfig Requires: python Provides: hg = %{version}-%{release} @@ -34,9 +33,9 @@ Extensions: http://www.selenic.com/mercurial/wiki/index.cgi/CategoryExtension %define emacs_lispdir %{_datadir}/emacs/site-lisp %define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d %else -%define emacs_version %(pkg-config emacs --modversion) -%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir) -%define emacs_startdir %(pkg-config emacs --variable sitestartdir) +%define emacs_version %{expand:%(pkg-config emacs --modversion)} +%define emacs_lispdir %{expand:%(pkg-config emacs --variable sitepkglispdir)} +%define emacs_startdir %{expand:%(pkg-config emacs --variable sitestartdir)} %endif %package -n emacs-%{pkg} @@ -79,7 +78,6 @@ documentation. %prep %setup -q -%patch0 -p0 %build make all @@ -164,10 +162,21 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/mercurial/ %{_sysconfdir}/mercurial/hgrc.d/hgk.rc -#%check +#%%check #cd tests && python run-tests.py %changelog +* Sun Jun 15 2008 Neal Becker - 1.0.1-4 +- Bitten by expansion of commented out macro (again) + +* Sun Jun 15 2008 Neal Becker - 1.0.1-3 +- Add BR pkgconfig + +* Sun Jun 15 2008 Neal Becker - 1.0.1-2 +- Update to 1.0.1 +- Fix emacs_version, etc macros (need expand) +- Remove patch0 + * Mon Jun 2 2008 Neal Becker - 1.0-15 - Bump release tag diff --git a/sources b/sources index b616775..517697b 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -9f8dd7fa6f8886f77be9b923f008504c mercurial-1.0.tar.gz -04d22d401ce507989137d7171c2502f0 mercurial-site-start.el -48afc53e60fff52d2283a8c028436abd mercurial-mergetools.hgrc.patch +a4ef7eb2c8818404a459e3be05feff6f mercurial-1.0.1.tar.gz