rpms/mercurial/F-7 mercurial-install-contrib.patch, NONE, 1.1 mercurial.spec, 1.18, 1.19

[Neal Becker (nbecker)]

Author: nbecker

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

Modified Files:
	mercurial.spec 
Added Files:
	mercurial-install-contrib.patch 
Log Message:
Update to 0.9.4-3


mercurial-install-contrib.patch:

--- NEW FILE mercurial-install-contrib.patch ---
diff -ruN mercurial-0.9.4.orig/setup.py mercurial-0.9.4.new/setup.py
--- mercurial-0.9.4.orig/setup.py	2007-06-25 22:18:18.000000000 -0400
+++ mercurial-0.9.4.new/setup.py	2007-08-29 19:17:36.000000000 -0400
@@ -54,6 +54,21 @@
 mercurial.version.remember_version(version)
 cmdclass = {'install_data': install_package_data}
 
+# We want to install the contrib/ directory, but it isn't immediately
+# clear where to do that on some platforms. As a temporary expedient,
+# assemble that part of the setup manifest only if we are running on
+# a posix platform. This is no worse than the current state, and people
+# who understand the respective target platforms can improve it over
+# time.
+
+contrib_files = []  # default
+if os.name in ['posix']:
+    contrib_files = [(os.path.join('/usr/share/mercurial', root),
+                      [os.path.join(root, file_) for file_ in files])
+                     for root, dirs, files in os.walk('contrib')]
+    contrib_files = contrib_files + [('/usr/share/mercurial/contrib',
+                                      ['hgwebdir.cgi', 'hgweb.cgi'])]
+
 setup(name='mercurial',
       version=mercurial.version.get_version(),
       author='Matt Mackall',
@@ -67,7 +82,8 @@
                    Extension('mercurial.base85', ['mercurial/base85.c'])],
       data_files=[(os.path.join('mercurial', root),
                    [os.path.join(root, file_) for file_ in files])
-                  for root, dirs, files in os.walk('templates')],
+                  for root, dirs, files in os.walk('templates')] +
+                 contrib_files,
       cmdclass=cmdclass,
       scripts=['hg', 'hgmerge'],
       options=dict(py2exe=dict(packages=['hgext']),


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-7/mercurial.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mercurial.spec	24 Aug 2007 00:00:47 -0000	1.18
+++ mercurial.spec	20 Sep 2007 19:03:30 -0000	1.19
@@ -1,11 +1,12 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 0.9.4
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
+Patch0: mercurial-install-contrib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel asciidoc xmlto
 Provides: hg = %{version}-%{release}
@@ -16,6 +17,7 @@
  
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 python ./setup.py build
@@ -32,7 +34,14 @@
 install -m 0644 doc/hg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hg.1
 install -m 0644 doc/hgmerge.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hgmerge.1
 install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
+install -m 0644 doc/hgignore.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgignore.5
 
+# Set up a system-wide hgrc that says where the hgk script went:
+mkdir -p $RPM_BUILD_ROOT/etc/mercurial
+cat - >$RPM_BUILD_ROOT/etc/mercurial/hgrc << EOF
+[hgk]
+path=/usr/share/mercurial/contrib/hgk
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -41,10 +50,20 @@
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README contrib/sample.hgrc
+%{_sysconfdir}/mercurial
 %{_mandir}/man*/*
-
+%{_datadir}/mercurial/contrib/*.py[co]
 
 %changelog
+* Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-3
+- Fix mercurial-install-contrib.patch (/usr/share/mercurial->/usr/share/mercurial/contrib)
+
+* Wed Aug 29 2007 Jonathan Shapiro <shap at eros-os.com> - 0.9.4-2
+- update to 0.9.4-2
+- install contrib directory
+- set up required path for hgk
+- install man5 man pages
+
 * Thu Aug 23 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-1
 - update to 0.9.4