[PATCH 1 of 2] contrib/buildrpm: Support python 2.4 and 2.6

Mads Kiilerich mads at kiilerich.com
Sat Jun 20 08:54:13 CDT 2009


# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1245505840 -7200
# Node ID aa0ed7f3348578a88e35e595fdae5726a5db7cd8
# Parent  7951f385fcb71f9b684ceb467d37aa43ddecefda
contrib/buildrpm: Support python 2.4 and 2.6

diff --git a/contrib/buildrpm b/contrib/buildrpm
--- a/contrib/buildrpm
+++ b/contrib/buildrpm
@@ -1,11 +1,13 @@
 #!/bin/sh
 #
 # Build a Mercurial RPM in place.
-# Known to work on:
-# - Fedora 9
-# - Fedora 10
 #
 # Bryan O'Sullivan <bos at serpentine.com>
+#
+# Tested on
+# - Fedora 10
+# - Fedora 11
+# - Centos 5.3 (with Fedora EPEL repo for asciidoc)
 
 if hg --version > /dev/null 2>&1; then :
 else
diff --git a/contrib/mercurial.spec b/contrib/mercurial.spec
--- a/contrib/mercurial.spec
+++ b/contrib/mercurial.spec
@@ -71,6 +71,8 @@
 %{_bindir}/hg-viz
 %{_bindir}/git-rev-tree
 %{_bindir}/mercurial-convert-repo
-%{_libdir}/python%{pythonver}/site-packages/%{name}-*-py2.5.egg-info
+%if "%{?pythonver}" != "2.4"
+%{_libdir}/python%{pythonver}/site-packages/%{name}-*-py%{pythonver}.egg-info
+%endif
 %{pythonlib}
 %{hgext}


More information about the Mercurial-devel mailing list