[svn] r5514 - trunk/rpms/mercurial

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-06-15 17:27:01 +0200 (Fri, 15 Jun 2007)
New Revision: 5514

Modified:
   trunk/rpms/mercurial/mercurial.spec
Log:
Fix for x86_64 and added contrib/

Modified: trunk/rpms/mercurial/mercurial.spec
===================================================================
--- trunk/rpms/mercurial/mercurial.spec	2007-06-14 21:25:49 UTC (rev 5513)
+++ trunk/rpms/mercurial/mercurial.spec	2007-06-15 15:27:01 UTC (rev 5514)
@@ -3,9 +3,7 @@
 # Upstream: Matt Mackall <mpm$selenic,com>
 
 %define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
-%define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
 
-
 Summary: Fast lightweight source control management system
 Name: mercurial
 Version: 0.9.3
@@ -32,7 +30,7 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root="%{buildroot}" --prefix="%{_prefix}"
-%{__make} install-doc PREFIX=%{buildroot}%{_prefix} MANDIR=%{buildroot}%{_mandir}
+%{__make} install-doc PREFIX="%{buildroot}%{_prefix}" MANDIR="%{buildroot}%{_mandir}"
 # TODO: also install contrib, maybe in subpackage
 
 %clean
@@ -40,14 +38,20 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc CONTRIBUTORS COPYING README 
-%doc %{_mandir}/man1/hg*.1*
-%doc %{_mandir}/man5/hg*.5*
+%doc CONTRIBUTORS COPYING README contrib/
+%doc %{_mandir}/man1/hg.1*
+%doc %{_mandir}/man1/hgmerge.1*
+%doc %{_mandir}/man5/hgignore.5*
+%doc %{_mandir}/man5/hgrc.5*
 %{_bindir}/hg
 %{_bindir}/hgmerge
-%{python_sitelib}/mercurial/
-%{python_sitelib}/hgext/
+%{python_sitearch}/hgext/
+%{python_sitearch}/mercurial/
 
 %changelog
+* Fri Jun 15 2007 Dag Wieers <dag at wieers.com> - 0.9.3-2
+- Use %%{python_sitearch} to build for x86_64. (Tong Ho)
+- Added contrib/.
+
 * Tue Jun 05 2007 Dries Verachtert <dries at ulyssis.org> - 0.9.3-1
 - Initial package.