rpms/mercurial/EL-4 .cvsignore, 1.10, 1.11 mercurial.spec, 1.20, 1.21 sources, 1.11, 1.12

[Dennis Gilmore]

Author: ausil

Update of /cvs/pkgs/rpms/mercurial/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17527

Modified Files:
	.cvsignore mercurial.spec sources 
Log Message:
update to 1.2 fixes bug 464633 CVE-2008-4297



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	8 Nov 2007 02:12:02 -0000	1.10
+++ .cvsignore	19 Mar 2009 19:09:40 -0000	1.11
@@ -1 +1 @@
-mercurial-0.9.5.tar.bz2
+mercurial-1.2.tar.gz


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/mercurial.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mercurial.spec	8 Nov 2007 02:12:02 -0000	1.20
+++ mercurial.spec	19 Mar 2009 19:09:40 -0000	1.21
@@ -1,13 +1,15 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 0.9.5
-Release: 2%{?dist}
+Version: 1.2
+Release: 2%{?dist}.1
 License: GPLv2
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
-Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.bz2
+Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: python-devel asciidoc xmlto
+BuildRequires: python python-devel
 Requires: python
 Provides: hg = %{version}-%{release}
 
@@ -15,18 +17,44 @@
 Mercurial is a fast, lightweight source control management system designed
 for efficient handling of very large distributed projects.
 
+Quick start: http://www.selenic.com/mercurial/wiki/index.cgi/QuickStart
+Tutorial: http://www.selenic.com/mercurial/wiki/index.cgi/Tutorial
+Extensions: http://www.selenic.com/mercurial/wiki/index.cgi/CategoryExtension
+
+%define pkg mercurial
+
+%package hgk
+Summary:	Hgk interface for mercurial
+Group:		Development/Tools
+Requires:	hg = %{version}-%{release}, tk
+
+
+%description hgk
+A Mercurial extension for displaying the change history graphically
+using Tcl/Tk.  Displays branches and merges in an easily
+understandable way and shows diffs for each revision.  Based on
+gitk for the git SCM.
+
+Adds the "hg view" command.  See 
+http://www.selenic.com/mercurial/wiki/index.cgi/UsingHgk for more
+documentation.
+
 %prep
-rm -rf $RPM_BUILD_ROOT
 %setup -q
+#%patch0 -p1
 
 %build
 make all
 
 %install
-python setup.py install -O1 --root $RPM_BUILD_ROOT --prefix %{_prefix} --record=%{name}.files
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT --prefix %{_prefix} --record=%{name}.files
 make install-doc DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir}
 
-install contrib/hgk          $RPM_BUILD_ROOT%{_bindir}
+grep -v 'hgk.py*' < %{name}.files > %{name}-base.files
+grep 'hgk.py*' < %{name}.files > %{name}-hgk.files
+
+install -D contrib/hgk       $RPM_BUILD_ROOT%{_libexecdir}/mercurial/hgk
 install contrib/convert-repo $RPM_BUILD_ROOT%{_bindir}/mercurial-convert-repo
 install contrib/hg-ssh       $RPM_BUILD_ROOT%{_bindir}
 install contrib/git-viz/{hg-viz,git-rev-tree} $RPM_BUILD_ROOT%{_bindir}
@@ -39,31 +67,191 @@
 mkdir -p $zsh_completion_dir
 install -m 644 contrib/zsh_completion $zsh_completion_dir/_mercurial
 
-lisp_dir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
-mkdir -p $lisp_dir
-install -m 644 contrib/mercurial.el $lisp_dir
-xlisp_dir=$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp
-mkdir -p $xlisp_dir
-install -m 644 contrib/mercurial.el $xlisp_dir
+
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
+
+
+cat >hgk.rc <<EOF
+[extensions]
+# enable hgk extension ('hg help' shows 'view' as a command)
+hgk=
+
+[hgk]
+path=%{_libexecdir}/mercurial/hgk
+EOF
+install hgk.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
+
+install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.files
+%files -f %{name}-base.files
 %defattr(-,root,root,-)
-%doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html doc/ja *.cgi
+%doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html doc/ja *.cgi contrib/*.fcgi
 %doc %attr(644,root,root) %{_mandir}/man?/hg*.gz
+%doc %attr(644,root,root) contrib/*.svg contrib/sample.hgrc
 %{_sysconfdir}/bash_completion.d/mercurial.sh
 %{_datadir}/zsh/site-functions/_mercurial
-%{_datadir}/emacs/site-lisp/mercurial.el
-%{_datadir}/xemacs/site-packages/lisp/mercurial.el
-%{_bindir}/hgk
 %{_bindir}/hg-ssh
 %{_bindir}/hg-viz
 %{_bindir}/git-rev-tree
 %{_bindir}/mercurial-convert-repo
+%dir %{_sysconfdir}/bash_completion.d/
+%dir %{_datadir}/zsh/site-functions/
+%dir %{_sysconfdir}/mercurial
+%dir %{_sysconfdir}/mercurial/hgrc.d
+%config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
+%dir %{python_sitearch}/mercurial
+%dir %{python_sitearch}/hgext
+
+%files hgk -f %{name}-hgk.files
+%{_libexecdir}/mercurial/
+%{_sysconfdir}/mercurial/hgrc.d/hgk.rc
+
+#%%check
+#cd tests && %{__python} run-tests.py
 
 %changelog
+* Thu Mar 19 2009 Dennis Gilmore <dennis at ausil.us> - 1.2-2.1
+- port over for EPEL 
+- fixes CVE's is current releases
+- remove emacs packages
+
+* Wed Mar  4 2009 Neal Becker <ndbecker2 at gmail.com> - 1.2-2
+- patch0 for filemerge bug should not be needed
+
+* Wed Mar  4 2009 Neal Becker <ndbecker2 at gmail.com> - 1.2-1
+- Update to 1.2
+
+* Tue Feb 24 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-7
+- Use noreplace option on config
+
+* Mon Feb 23 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-6
+- Fix typo
+
+* Mon Feb 23 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-5
+- Own directories bash_completion.d and zsh/site-functions
+  https://bugzilla.redhat.com/show_bug.cgi?id=487015
+
+* Mon Feb  9 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-4
+- Mark mergetools.rc as config
+
+* Sat Feb  7 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-3
+- Patch mergetools.rc to fix filemerge bug
+
+* Thu Jan  1 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-2
+- Rename mergetools.rc -> mergetools.rc.sample
+
+* Thu Jan  1 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-1
+- Update to 1.1.2
+
+* Wed Dec 24 2008 Neal Becker <ndbecker2 at gmail.com> - 1.1.1-3
+- Install mergetools.rc as mergetools.rc.sample
+
+* Sun Dec 21 2008 Neal Becker <ndbecker2 at gmail.com> - 1.1.1-2
+- Fix typo
+
+* Sun Dec 21 2008 Neal Becker <ndbecker2 at gmail.com> - 1.1.1-1
+- Update to 1.1.1
+
+* Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.1-2
+- Rebuild for Python 2.6
+
+* Tue Dec  2 2008 Neal Becker <ndbecker2 at gmail.com> - 1.1-1
+- Update to 1.1
+
+* Mon Dec  1 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.2-4
+- Bump tag
+
+* Mon Dec  1 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.2-3
+- Remove BR asciidoc
+- Use macro for python executable
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.0.2-2
+- Rebuild for Python 2.6
+
+* Fri Aug 15 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.2-1
+- Update to 1.0.2
+
+* Sun Jun 15 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.1-4
+- Bitten by expansion of commented out macro (again)
+
+* Sun Jun 15 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.1-3
+- Add BR pkgconfig
+
+* Sun Jun 15 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.1-2
+- Update to 1.0.1
+- Fix emacs_version, etc macros (need expand)
+- Remove patch0
+
+* Mon Jun  2 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-15
+- Bump release tag
+
+* Thu Apr 17 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-14
+- Oops, fix %%files due to last change
+
+* Wed Apr 16 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-13
+- install mergetools.hgrc as mergetools.rc
+
+* Sat Apr 12 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-12
+- Remove xemacs pkg - this is moved to xemacs-extras
+- Own %{python_sitearch}/{mercurial,hgext} dirs
+
+* Thu Apr 10 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-11
+- Use install -p to install .el{c} files
+- Don't (load mercurial) by default.
+
+* Wed Apr  9 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-10
+- Patch to hgk from Mads Kiilerich <mads at kiilerich.com>
+
+* Tue Apr  8 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-9
+- Add '-l mercurial.el' for emacs also
+
+* Tue Apr  8 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-8
+- BR xemacs-packages-extra
+
+* Tue Apr  8 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-7
+- Various fixes
+
+* Tue Apr  8 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-6
+- fix to comply with emacs packaging guidelines
+
+* Thu Mar 27 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-5
+- Move hgk-related py files to hgk
+- Put mergetools.hgrc in /etc/mercurial/hgrc.d
+- Add hgk.rc and put in /etc/mercurial/hgrc.d
+
+* Wed Mar 26 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-4
+- Rename mercurial-site-start -> mercurial-site-start.el
+
+* Wed Mar 26 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-3
+- Incorprate suggestions from hopper at omnifarious.org
+
+* Wed Mar 26 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-2
+- Add site-start
+
+* Tue Mar 25 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-1
+- Update to 1.0
+- Disable check for now - 1 test fails
+- Move emacs to separate package
+- Add check
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.5-7
+- Autorebuild for GCC 4.3
+
+* Fri Nov  9 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.5-6
+- rpmlint fixes
+
+* Fri Nov  9 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.5-5
+- /etc/mercurial/hgrc.d missing
+
+* Fri Nov  9 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.5-3
+- Fix to last change
+
+* Fri Nov  9 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.5-2
+- mkdir /etc/mercurial/hgrc.d for plugins
+
 * Tue Oct 23 2007  <ndbecker2 at gmail.com> - 0.9.5-2
 - Bump tag to fix confusion
 
@@ -81,10 +269,10 @@
 - Revert last change.
 
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-5
-- Use %ghost on contrib, otherwise EL-4 build fails
+- Use {ghost} on contrib, otherwise EL-4 build fails
 
 * Thu Sep 20 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.4-4
-- remove %{_datadir}/contrib stuff for now
+- remove {_datadir}/contrib stuff for now
 
 * 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)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Nov 2007 02:12:02 -0000	1.11
+++ sources	19 Mar 2009 19:09:41 -0000	1.12
@@ -1 +1 @@
-4b295d05336851ab606694e5481ffd40  mercurial-0.9.5.tar.bz2
+ac9d16b078f99f7a89d6865421570f05  mercurial-1.2.tar.gz