[PATCH] Make contrib/buildrpm work on Fedora 9

[Mads Kiilerich]

# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1221468090 -7200
# Node ID bbef45d250e1dc151e004755672498a5ebc9e5fc
# Parent  0d513661d6c280fae68a96aea16231702959bfb6
Make contrib/buildrpm work on Fedora 9.
The spec had bitrotted, and only minimal changes has been made. There is room for improvement, but now it can build an rpm and it is usable.

diff -r 0d513661d6c2 -r bbef45d250e1 contrib/buildrpm
--- a/contrib/buildrpm	Sat Sep 13 10:46:47 2008 -0500
+++ b/contrib/buildrpm	Mon Sep 15 10:41:30 2008 +0200
@@ -12,7 +12,7 @@
     exit 1
 fi
 
-rpmdir=/tmp/"`basename $root | sed 's/ /_/'`"-rpm
+rpmdir=/tmp/"`basename $root | sed 's/ /_/'`"-rpm # FIXME: Insecure /tmp handling
 
 cd "$root"
 rm -rf $rpmdir
@@ -24,7 +24,7 @@
     exit 1
 fi
 
-tmpspec=/tmp/`basename "$specfile"`.$$
+tmpspec=/tmp/`basename "$specfile"`.$$ # FIXME: Insecure /tmp handling
 # Use the most recent tag as the version.
 version=`hg tags | perl -e 'while(<STDIN>){if(/^(\d\S+)/){print$1;exit}}'`
 # Compute the release number as the difference in revision numbers
diff -r 0d513661d6c2 -r bbef45d250e1 contrib/mercurial.spec
--- a/contrib/mercurial.spec	Sat Sep 13 10:46:47 2008 -0500
+++ b/contrib/mercurial.spec	Mon Sep 15 10:41:30 2008 +0200
@@ -55,6 +55,8 @@
 mkdir -p $lisp_dir
 install contrib/mercurial.el $lisp_dir
 
+rm -f $RPM_BUILD_ROOT%{pythonlib}/../mercurial-*-py2.5.egg-info
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,7 +71,6 @@
 %{_datadir}/emacs/site-lisp/mercurial.el
 %{_bindir}/hg
 %{_bindir}/hgk
-%{_bindir}/hgmerge
 %{_bindir}/hg-ssh
 %{_bindir}/hg-viz
 %{_bindir}/git-rev-tree
@@ -80,3 +81,5 @@
 %{pythonlib}/*.so
 %{hgext}/*.py*
 %{hgext}/convert/*.py*
+%{hgext}/inotify/*.py*
+%{hgext}/inotify/linux/