rpms/mercurial/F-9 .cvsignore, 1.16, 1.17 mercurial.spec, 1.45, 1.46 sources, 1.18, 1.19

[Neal Becker (nbecker)]

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24779

Modified Files:
	.cvsignore mercurial.spec sources 
Log Message:
update to 1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-9/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	16 Apr 2008 11:10:59 -0000	1.16
+++ .cvsignore	15 Jun 2008 14:55:25 -0000	1.17
@@ -1,3 +1 @@
-mercurial-1.0.tar.gz
-mercurial-site-start.el
-mercurial-mergetools.hgrc.patch
+mercurial-1.0.1.tar.gz


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-9/mercurial.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- mercurial.spec	2 Jun 2008 23:29:24 -0000	1.45
+++ mercurial.spec	15 Jun 2008 14:55:25 -0000	1.46
@@ -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 @@
 %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 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 make all
@@ -164,10 +162,21 @@
 %{_libexecdir}/mercurial/
 %{_sysconfdir}/mercurial/hgrc.d/hgk.rc
 
-#%check
+#%%check
 #cd tests && python run-tests.py
 
 %changelog
+* Sun Jun 15 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.1-4
+- Bitten by expansion of commented out macro (again)
+
+* Sun Jun 15 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.1-3
+- Add BR pkgconfig
+
+* Sun Jun 15 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.1-2
+- Update to 1.0.1
+- Fix emacs_version, etc macros (need expand)
+- Remove patch0
+
 * Mon Jun  2 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-15
 - Bump release tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	16 Apr 2008 11:10:59 -0000	1.18
+++ sources	15 Jun 2008 14:55:25 -0000	1.19
@@ -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