# HG changeset patch
# User mpm@selenic.com
# Date 2005-07-01 22:03:42
# Node ID 42a6a41ab76b3f95465ea441c7317f83f5f7539f
# Parent  be6233a2bfddd657b1c035aef3e9e6fb86dd17e7

[PATCH] clean up RPM spec file

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

[PATCH] clean up RPM spec file

From: Bryan O'Sullivan <bos@serpentine.com>

The current RPM spec file makes it impossible to split Mercurial into
multiple interdependent packages.  Here's a patch that fixes that
problem.

manifest hash: 4acc4c5cf4485d92a32d2259b83314b7167dece3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCxb2+ywK+sNU5EO8RAnrTAJ4tkAh6xnHvRHMxzrfqKb/SXYS2wwCeMfK1
PAr+1FFoSqUmA9rt8Yaw6f4=
=MaPn
-----END PGP SIGNATURE-----


diff --git a/contrib/mercurial.spec b/contrib/mercurial.spec
--- a/contrib/mercurial.spec
+++ b/contrib/mercurial.spec
@@ -10,6 +10,9 @@ Packager: Arun Sharma <arun@sharma-home.
 Prefix: /usr
 BuildRoot: /tmp/build.%{name}-%{version}-%{release}
 
+%define pythonver %(python -c 'import sys;print ".".join(map(str, sys.version_info[:2]))')
+%define pythonlib %{_libdir}/python%{pythonver}/site-packages/%{name}
+
 %description
 
 Mercurial is a fast, lightweight source control management system designed
@@ -29,20 +32,16 @@ python setup.py build
 
 python setup.py install --root $RPM_BUILD_ROOT
 
-cd $RPM_BUILD_ROOT
-find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > \
-	$RPM_BUILD_DIR/file.list.%{name}
-
-find . -type f | sed -e 's,^\.,\%attr(-\,root\,root) ,' \
-	-e '/\/config\//s|^|%config|' \
-	-e '/\/applnk\//s|^|%config|' >> \
-	$RPM_BUILD_DIR/file.list.%{name}
+%clean
+rm -rf $RPM_BUILD_ROOT
 
-find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> \
-	$RPM_BUILD_DIR/file.list.%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/file.list.%{name}
-
-%files -f ../file.list.%{name}
+%files
+%defattr(-,root,root,-)
 %doc doc
+%dir %{pythonlib}
+%{_bindir}/hgmerge
+%{_bindir}/hg
+%{pythonlib}/templates
+%{pythonlib}/*.pyc
+%{pythonlib}/*.py
+%{pythonlib}/*.so