rpms/mercurial/EL-5 .cvsignore, 1.10, 1.11 mercurial.spec, 1.15, 1.16 sources, 1.11, 1.12

[Dennis Gilmore]

Author: ausil

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	2 Apr 2007 21:26:04 -0000	1.10
+++ .cvsignore	19 Mar 2009 19:25:19 -0000	1.11
@@ -1 +1 @@
-mercurial-0.9.3.tar.gz
+mercurial-1.2.tar.gz


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-5/mercurial.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mercurial.spec	4 Sep 2008 14:54:30 -0000	1.15
+++ mercurial.spec	19 Mar 2009 19:25:19 -0000	1.16
@@ -2,16 +2,14 @@
 
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 1.0.2
-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.gz
-Source1: mercurial-site-start.el
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python python-devel asciidoc xmlto
-BuildRequires: emacs emacs-el pkgconfig
 Requires: python
 Provides: hg = %{version}-%{release}
 
@@ -24,41 +22,6 @@
 Extensions: http://www.selenic.com/mercurial/wiki/index.cgi/CategoryExtension
 
 %define pkg mercurial
-#%define pkgname Foo
-
-# If the emacs-el package has installed a pkgconfig file, use that to determine
-# install locations and Emacs version at build time, otherwise set defaults.
-%if %($(pkg-config emacs) ; echo $?)
-%define emacs_version 22.1
-%define emacs_lispdir %{_datadir}/emacs/site-lisp
-%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
-%else
-%define emacs_version %{expand:%(pkg-config emacs --modversion)}
-%define emacs_lispdir %{expand:%(pkg-config emacs --variable sitepkglispdir)}
-%define emacs_startdir %{expand:%(pkg-config emacs --variable sitestartdir)}
-%endif
-
-%package -n emacs-%{pkg}
-Summary:	Mercurial version control system support for Emacs
-Group:		Applications/Editors
-Requires:	hg = %{version}-%{release}, emacs-common
-Requires:       emacs(bin) >= %{emacs_version}
-Obsoletes:	%{pkg}-emacs
-
-%description -n emacs-%{pkg}
-Contains byte compiled elisp packages for %{pkg}.
-To get started: start emacs, load hg-mode with M-x hg-mode, and show 
-help with C-c h h
-
-%package -n emacs-%{pkg}-el
-Summary:        Elisp source files for %{pkg} under GNU Emacs
-Group:          Applications/Editors
-Requires:       emacs-%{pkg} = %{version}-%{release}
-
-%description -n emacs-%{pkg}-el
-This package contains the elisp source files for %{pkg} under GNU Emacs. You
-do not need to install this package to run %{pkg}. Install the emacs-%{pkg}
-package to use %{pkg} with GNU Emacs.
 
 %package hgk
 Summary:	Hgk interface for mercurial
@@ -78,6 +41,7 @@
 
 %prep
 %setup -q
+#%patch0 -p1
 
 %build
 make all
@@ -103,21 +67,9 @@
 mkdir -p $zsh_completion_dir
 install -m 644 contrib/zsh_completion $zsh_completion_dir/_mercurial
 
-mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
-
-pushd contrib
-for file in mercurial.el mq.el; do
-  emacs -batch -l mercurial.el --no-site-file -f batch-byte-compile $file
-  install -p -m 644 $file ${file}c $RPM_BUILD_ROOT%{emacs_lispdir}
-  rm ${file}c
-done
-popd
-
-
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
 
-mkdir -p $RPM_BUILD_ROOT%{emacs_startdir} && install -m644 %SOURCE1 $RPM_BUILD_ROOT%{emacs_startdir}
 
 cat >hgk.rc <<EOF
 [extensions]
@@ -145,19 +97,14 @@
 %{_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
-%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
+%config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
 %dir %{python_sitearch}/mercurial
 %dir %{python_sitearch}/hgext
 
-%files -n emacs-%{pkg}
-%{emacs_lispdir}/*.elc
-%{emacs_startdir}/*.el
-
-%files -n emacs-%{pkg}-el
-%{emacs_lispdir}/*.el
-
 %files hgk -f %{name}-hgk.files
 %{_libexecdir}/mercurial/
 %{_sysconfdir}/mercurial/hgrc.d/hgk.rc
@@ -166,9 +113,64 @@
 #cd tests && %{__python} run-tests.py
 
 %changelog
-* Thu Aug 28 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0.2-2
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/EL-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	4 Sep 2008 14:54:30 -0000	1.11
+++ sources	19 Mar 2009 19:25:19 -0000	1.12
@@ -1 +1 @@
-32432616f517107e6582721c257cd1f4  mercurial-1.0.2.tar.gz
+ac9d16b078f99f7a89d6865421570f05  mercurial-1.2.tar.gz