From b362101eb420c94fb1c2401b9e0100db6c4cdaef Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 05:29:32 +0000 Subject: [PATCH 01/26] Initialize branch F-12 for mercurial --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From ac28b3fa6f2e55a59f20be623fe44008dbcbd904 Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Mon, 16 Nov 2009 21:56:15 +0000 Subject: [PATCH 02/26] update to 1.4 --- .cvsignore | 2 +- mercurial.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 57cfb07..c3b02c9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mercurial-1.3.1.tar.gz +mercurial-1.4.tar.gz diff --git a/mercurial.spec b/mercurial.spec index 48a5f1b..09ce6cf 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,8 +2,8 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.3.1 -Release: 3%{?dist} +Version: 1.4 +Release: 1%{?dist} License: GPLv2 Group: Development/Tools URL: http://www.selenic.com/mercurial/ @@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Mon Nov 16 2009 Neal Becker - 1.4-1 +- Update to 1.4 + * Fri Jul 24 2009 Neal Becker - 1.3.1-3 - Disable self-tests diff --git a/sources b/sources index 2ca888e..7965018 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6504f0dc32bd7ecf59a9f7f719432e76 mercurial-1.3.1.tar.gz +951ebd4a8153eaa3c56fc0ce2575ab70 mercurial-1.4.tar.gz From 1fc0ac499758700af7b3f7cfeb1fbd99606c5466 Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Mon, 16 Nov 2009 23:47:04 +0000 Subject: [PATCH 03/26] bump to 1.4-1.1 --- mercurial.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mercurial.spec b/mercurial.spec index 09ce6cf..0b1dc9c 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -3,7 +3,7 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial Version: 1.4 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: GPLv2 Group: Development/Tools URL: http://www.selenic.com/mercurial/ @@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Mon Nov 16 2009 Neal Becker - 1.4-1.1 +- Bump to 1.4-1.1 + * Mon Nov 16 2009 Neal Becker - 1.4-1 - Update to 1.4 From b5611fa351404ed52243fd426428bcfb0caa2075 Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Mon, 16 Nov 2009 23:48:44 +0000 Subject: [PATCH 04/26] bump to 1.4-1.2 --- mercurial.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mercurial.spec b/mercurial.spec index 0b1dc9c..f655282 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -3,7 +3,7 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial Version: 1.4 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 License: GPLv2 Group: Development/Tools URL: http://www.selenic.com/mercurial/ From 89a02252571148e817a84de11cdbb6e8ba114982 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:15 +0000 Subject: [PATCH 05/26] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index be30153..17b3095 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := mercurial SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From ed784cfb37f789282d454efb3a52908baf43bc2b Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Wed, 2 Dec 2009 12:41:02 +0000 Subject: [PATCH 06/26] update to 1.4.1 --- .cvsignore | 2 +- mercurial.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index c3b02c9..b837891 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mercurial-1.4.tar.gz +mercurial-1.4.1.tar.gz diff --git a/mercurial.spec b/mercurial.spec index f655282..1005a25 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,8 +2,8 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.4 -Release: 1%{?dist}.2 +Version: 1.4.1 +Release: 1%{?dist} License: GPLv2 Group: Development/Tools URL: http://www.selenic.com/mercurial/ @@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Wed Dec 2 2009 Neal Becker - 1.4.1-1 +- Update to 1.4.1 + * Mon Nov 16 2009 Neal Becker - 1.4-1.1 - Bump to 1.4-1.1 diff --git a/sources b/sources index 7965018..f6f2d33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -951ebd4a8153eaa3c56fc0ce2575ab70 mercurial-1.4.tar.gz +eacffecad59ec145e61a1edf332b3f1f mercurial-1.4.1.tar.gz From 2c4d3c4ea857895410affd9251c07199b6509d9f Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Sat, 2 Jan 2010 15:37:16 +0000 Subject: [PATCH 07/26] update to 1.4.1 --- .cvsignore | 2 +- mercurial.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b837891..090ed10 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mercurial-1.4.1.tar.gz +mercurial-1.4.2.tar.gz diff --git a/mercurial.spec b/mercurial.spec index 1005a25..88e771c 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,7 +2,7 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.4.1 +Version: 1.4.2 Release: 1%{?dist} License: GPLv2 Group: Development/Tools @@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Sat Jan 2 2010 Neal Becker - 1.4.2-1 +- Update to 1.4.2 + * Wed Dec 2 2009 Neal Becker - 1.4.1-1 - Update to 1.4.1 diff --git a/sources b/sources index f6f2d33..cf9a7e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eacffecad59ec145e61a1edf332b3f1f mercurial-1.4.1.tar.gz +cf23b0887f0437c8601d5b89ae4663a6 mercurial-1.4.2.tar.gz From c9be0d11a73557145b03b72cee4559d77f07e2be Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Tue, 2 Feb 2010 00:00:17 +0000 Subject: [PATCH 08/26] update to 1.4.1 --- .cvsignore | 2 +- mercurial.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 090ed10..8d52afa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mercurial-1.4.2.tar.gz +mercurial-1.4.3.tar.gz diff --git a/mercurial.spec b/mercurial.spec index 88e771c..6e9fddf 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,7 +2,7 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} License: GPLv2 Group: Development/Tools @@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Mon Feb 1 2010 Neal Becker - 1.4.3-1 +- Update to 1.4.3 + * Sat Jan 2 2010 Neal Becker - 1.4.2-1 - Update to 1.4.2 diff --git a/sources b/sources index cf9a7e5..d2fb6eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cf23b0887f0437c8601d5b89ae4663a6 mercurial-1.4.2.tar.gz +b075a2a6a08c10405ef3483aecb1a991 mercurial-1.4.3.tar.gz From 359b8d5d11bab18f384e029ef49438e20d840292 Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Sun, 7 Feb 2010 16:04:27 +0000 Subject: [PATCH 09/26] update to 1.4.3 --- mercurial.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mercurial.spec b/mercurial.spec index 6e9fddf..b416583 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -3,8 +3,8 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial Version: 1.4.3 -Release: 1%{?dist} -License: GPLv2 +Release: 2%{?dist} +License: GPLv2+ Group: Development/Tools URL: http://www.selenic.com/mercurial/ Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz @@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Fri Feb 5 2010 Neal Becker - 1.4.3-2 +- License changed to gplv2+ + * Mon Feb 1 2010 Neal Becker - 1.4.3-1 - Update to 1.4.3 From 478fb98a33f42229492c5db86d83100c40c9655b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 02:02:35 +0000 Subject: [PATCH 10/26] Initialize branch F-13 for mercurial --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 1dfbe833d1103c654652cbd69e047b4eb4b751fd Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Sun, 7 Mar 2010 12:03:03 +0000 Subject: [PATCH 11/26] update to 1.5 --- .cvsignore | 2 +- mercurial.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8d52afa..21df41e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mercurial-1.4.3.tar.gz +mercurial-1.5.tar.gz diff --git a/mercurial.spec b/mercurial.spec index b416583..599cc30 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,7 +2,7 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.4.3 +Version: 1.5 Release: 2%{?dist} License: GPLv2+ Group: Development/Tools @@ -138,7 +138,7 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}-base.files %defattr(-,root,root,-) -%doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html doc/ja *.cgi contrib/*.fcgi +%doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html *.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 @@ -170,6 +170,12 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Sat Mar 6 2010 Neal Becker - 1.5-2 +- doc/ja seems to be gone + +* Sat Mar 6 2010 Neal Becker - 1.5-1 +- Update to 1.5 + * Fri Feb 5 2010 Neal Becker - 1.4.3-2 - License changed to gplv2+ diff --git a/sources b/sources index d2fb6eb..e7d77ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b075a2a6a08c10405ef3483aecb1a991 mercurial-1.4.3.tar.gz +6e31357ada35fe20557f08a4e89f9c42 mercurial-1.5.tar.gz From c5c00bacea60283170f9d663382c6d93129080d5 Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Sun, 7 Mar 2010 21:27:36 +0000 Subject: [PATCH 12/26] update to 1.5 --- .cvsignore | 2 +- mercurial.spec | 17 +++++++++++++---- sources | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8d52afa..21df41e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mercurial-1.4.3.tar.gz +mercurial-1.5.tar.gz diff --git a/mercurial.spec b/mercurial.spec index 6e9fddf..599cc30 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,9 +2,9 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.4.3 -Release: 1%{?dist} -License: GPLv2 +Version: 1.5 +Release: 2%{?dist} +License: GPLv2+ Group: Development/Tools URL: http://www.selenic.com/mercurial/ Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz @@ -138,7 +138,7 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}-base.files %defattr(-,root,root,-) -%doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html doc/ja *.cgi contrib/*.fcgi +%doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html *.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 @@ -170,6 +170,15 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Sat Mar 6 2010 Neal Becker - 1.5-2 +- doc/ja seems to be gone + +* Sat Mar 6 2010 Neal Becker - 1.5-1 +- Update to 1.5 + +* Fri Feb 5 2010 Neal Becker - 1.4.3-2 +- License changed to gplv2+ + * Mon Feb 1 2010 Neal Becker - 1.4.3-1 - Update to 1.4.3 diff --git a/sources b/sources index d2fb6eb..e7d77ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b075a2a6a08c10405ef3483aecb1a991 mercurial-1.4.3.tar.gz +6e31357ada35fe20557f08a4e89f9c42 mercurial-1.5.tar.gz From 98eaa66135a9d025961631e8cad94e1c5a5bfa55 Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Mon, 5 Apr 2010 14:47:06 +0000 Subject: [PATCH 13/26] update to 1.5.1 --- .cvsignore | 2 +- mercurial.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 21df41e..4666aef 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mercurial-1.5.tar.gz +mercurial-1.5.1.tar.gz diff --git a/mercurial.spec b/mercurial.spec index 599cc30..3156c41 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,8 +2,8 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.5 -Release: 2%{?dist} +Version: 1.5.1 +Release: 1%{?dist} License: GPLv2+ Group: Development/Tools URL: http://www.selenic.com/mercurial/ @@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Mon Apr 5 2010 Neal Becker - 1.5.1-1 +- Update to 1.5.1 + * Sat Mar 6 2010 Neal Becker - 1.5-2 - doc/ja seems to be gone diff --git a/sources b/sources index e7d77ee..0f9f6bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6e31357ada35fe20557f08a4e89f9c42 mercurial-1.5.tar.gz +22eac5602d777f9601e23700e641503f mercurial-1.5.1.tar.gz From 772f7e429aa1ff38c0c432a815058f38d3db7eda Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Mon, 5 Apr 2010 15:00:50 +0000 Subject: [PATCH 14/26] update to 1.5.1 --- .cvsignore | 2 +- mercurial.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 21df41e..4666aef 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mercurial-1.5.tar.gz +mercurial-1.5.1.tar.gz diff --git a/mercurial.spec b/mercurial.spec index 599cc30..3156c41 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,8 +2,8 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.5 -Release: 2%{?dist} +Version: 1.5.1 +Release: 1%{?dist} License: GPLv2+ Group: Development/Tools URL: http://www.selenic.com/mercurial/ @@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Mon Apr 5 2010 Neal Becker - 1.5.1-1 +- Update to 1.5.1 + * Sat Mar 6 2010 Neal Becker - 1.5-2 - doc/ja seems to be gone diff --git a/sources b/sources index e7d77ee..0f9f6bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6e31357ada35fe20557f08a4e89f9c42 mercurial-1.5.tar.gz +22eac5602d777f9601e23700e641503f mercurial-1.5.1.tar.gz From d15629f1b4eb842b9d04211ae4b7b33df2f2adc9 Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Mon, 3 May 2010 11:58:37 +0000 Subject: [PATCH 15/26] update to 1.5.2 --- .cvsignore | 2 +- mercurial.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4666aef..3a01cd8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mercurial-1.5.1.tar.gz +mercurial-1.5.2.tar.gz diff --git a/mercurial.spec b/mercurial.spec index 3156c41..43863cd 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,7 +2,7 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.5.1 +Version: 1.5.2 Release: 1%{?dist} License: GPLv2+ Group: Development/Tools @@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Mon May 3 2010 Neal Becker - 1.5.2-1 +- update to 1.5.2 + * Mon Apr 5 2010 Neal Becker - 1.5.1-1 - Update to 1.5.1 diff --git a/sources b/sources index 0f9f6bf..2057195 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -22eac5602d777f9601e23700e641503f mercurial-1.5.1.tar.gz +deafaaf017fc3c8a9deef39e566aec80 mercurial-1.5.2.tar.gz From 7792493f94594da6b789b5fb00fd96d5e8d6c01e Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Mon, 3 May 2010 12:08:29 +0000 Subject: [PATCH 16/26] update to 1.5.2 --- .cvsignore | 2 +- mercurial.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4666aef..3a01cd8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mercurial-1.5.1.tar.gz +mercurial-1.5.2.tar.gz diff --git a/mercurial.spec b/mercurial.spec index 3156c41..43863cd 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,7 +2,7 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.5.1 +Version: 1.5.2 Release: 1%{?dist} License: GPLv2+ Group: Development/Tools @@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Mon May 3 2010 Neal Becker - 1.5.2-1 +- update to 1.5.2 + * Mon Apr 5 2010 Neal Becker - 1.5.1-1 - Update to 1.5.1 diff --git a/sources b/sources index 0f9f6bf..2057195 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -22eac5602d777f9601e23700e641503f mercurial-1.5.1.tar.gz +deafaaf017fc3c8a9deef39e566aec80 mercurial-1.5.2.tar.gz From 5eae6cadfb0379655eb8e869830e4bfff85434fd Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Fri, 14 May 2010 11:39:32 +0000 Subject: [PATCH 17/26] update to 1.5.3 --- .cvsignore | 2 +- mercurial.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3a01cd8..3498873 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mercurial-1.5.2.tar.gz +mercurial-1.5.3.tar.gz diff --git a/mercurial.spec b/mercurial.spec index 43863cd..992ff95 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,7 +2,7 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.5.2 +Version: 1.5.3 Release: 1%{?dist} License: GPLv2+ Group: Development/Tools @@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Fri May 14 2010 Neal Becker - 1.5.3-1 +- Update to 1.5.3 + * Mon May 3 2010 Neal Becker - 1.5.2-1 - update to 1.5.2 diff --git a/sources b/sources index 2057195..89704fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -deafaaf017fc3c8a9deef39e566aec80 mercurial-1.5.2.tar.gz +0969b8109f1b5a9c4debf985cca938f9 mercurial-1.5.3.tar.gz From 475477e46c741b30b2a2365a6427dd4aeeea347e Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Fri, 14 May 2010 11:57:49 +0000 Subject: [PATCH 18/26] update to 1.5.3 --- .cvsignore | 2 +- mercurial.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3a01cd8..3498873 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mercurial-1.5.2.tar.gz +mercurial-1.5.3.tar.gz diff --git a/mercurial.spec b/mercurial.spec index 43863cd..992ff95 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,7 +2,7 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.5.2 +Version: 1.5.3 Release: 1%{?dist} License: GPLv2+ Group: Development/Tools @@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Fri May 14 2010 Neal Becker - 1.5.3-1 +- Update to 1.5.3 + * Mon May 3 2010 Neal Becker - 1.5.2-1 - update to 1.5.2 diff --git a/sources b/sources index 2057195..89704fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -deafaaf017fc3c8a9deef39e566aec80 mercurial-1.5.2.tar.gz +0969b8109f1b5a9c4debf985cca938f9 mercurial-1.5.3.tar.gz From d620daa74c99363a76768f83a3817369275a68ac Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Wed, 2 Jun 2010 20:45:31 +0000 Subject: [PATCH 19/26] update to 1.5.4 --- .cvsignore | 2 +- mercurial.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3498873..72670bf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mercurial-1.5.3.tar.gz +mercurial-1.5.4.tar.gz diff --git a/mercurial.spec b/mercurial.spec index 992ff95..bf76336 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,7 +2,7 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.5.3 +Version: 1.5.4 Release: 1%{?dist} License: GPLv2+ Group: Development/Tools @@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Wed Jun 2 2010 Neal Becker - 1.5.4-1 +- Update to 1.5.4 + * Fri May 14 2010 Neal Becker - 1.5.3-1 - Update to 1.5.3 diff --git a/sources b/sources index 89704fb..afe9e9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0969b8109f1b5a9c4debf985cca938f9 mercurial-1.5.3.tar.gz +db0d673000463fae1ca5cb8a202315ae mercurial-1.5.4.tar.gz From 59f2f65e14e91f2d24d83001cebda0d7fbf88a30 Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Wed, 2 Jun 2010 20:51:47 +0000 Subject: [PATCH 20/26] update to 1.5.4 --- .cvsignore | 2 +- mercurial.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3498873..72670bf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mercurial-1.5.3.tar.gz +mercurial-1.5.4.tar.gz diff --git a/mercurial.spec b/mercurial.spec index 992ff95..bf76336 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,7 +2,7 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.5.3 +Version: 1.5.4 Release: 1%{?dist} License: GPLv2+ Group: Development/Tools @@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Wed Jun 2 2010 Neal Becker - 1.5.4-1 +- Update to 1.5.4 + * Fri May 14 2010 Neal Becker - 1.5.3-1 - Update to 1.5.3 diff --git a/sources b/sources index 89704fb..afe9e9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0969b8109f1b5a9c4debf985cca938f9 mercurial-1.5.3.tar.gz +db0d673000463fae1ca5cb8a202315ae mercurial-1.5.4.tar.gz From dd8cc6a3598dcfa64996f59a387c3c6b843529bb Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Sun, 4 Jul 2010 19:31:05 +0000 Subject: [PATCH 21/26] update to 1.6 --- mercurial.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/mercurial.spec b/mercurial.spec index bf76336..af5a562 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,8 +2,8 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.5.4 -Release: 1%{?dist} +Version: 1.6 +Release: 3%{?dist} License: GPLv2+ Group: Development/Tools URL: http://www.selenic.com/mercurial/ @@ -93,9 +93,7 @@ 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} bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d mkdir -p $bash_completion_dir @@ -144,9 +142,6 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/bash_completion.d/mercurial.sh %{_datadir}/zsh/site-functions/_mercurial %{_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 @@ -170,6 +165,16 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Sun Jul 4 2010 Neal Becker - 1.6-2 +- Remove hg-viz, git-rev-tree + +* Sun Jul 4 2010 Neal Becker - 1.6-1 +- Update to 1.6 +- git-viz is removed + +* Fri Jun 25 2010 Neal Becker - 1.5.4-1 +- Don't install mercurial-convert-repo (use hg convert instead) + * Wed Jun 2 2010 Neal Becker - 1.5.4-1 - Update to 1.5.4 From fc76cae261ec08a91624cb11203a0748d5eed60e Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Sun, 4 Jul 2010 19:32:48 +0000 Subject: [PATCH 22/26] update to 1.6 --- mercurial.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/mercurial.spec b/mercurial.spec index bf76336..af5a562 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,8 +2,8 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 1.5.4 -Release: 1%{?dist} +Version: 1.6 +Release: 3%{?dist} License: GPLv2+ Group: Development/Tools URL: http://www.selenic.com/mercurial/ @@ -93,9 +93,7 @@ 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} bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d mkdir -p $bash_completion_dir @@ -144,9 +142,6 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/bash_completion.d/mercurial.sh %{_datadir}/zsh/site-functions/_mercurial %{_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 @@ -170,6 +165,16 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Sun Jul 4 2010 Neal Becker - 1.6-2 +- Remove hg-viz, git-rev-tree + +* Sun Jul 4 2010 Neal Becker - 1.6-1 +- Update to 1.6 +- git-viz is removed + +* Fri Jun 25 2010 Neal Becker - 1.5.4-1 +- Don't install mercurial-convert-repo (use hg convert instead) + * Wed Jun 2 2010 Neal Becker - 1.5.4-1 - Update to 1.5.4 From 90432e2eb65999ea24d96ad75c8571832ef65300 Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Sun, 4 Jul 2010 19:37:28 +0000 Subject: [PATCH 23/26] Update to 1.6 --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 72670bf..a06fe5e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mercurial-1.5.4.tar.gz +mercurial-1.6.tar.gz diff --git a/sources b/sources index afe9e9d..98f3741 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db0d673000463fae1ca5cb8a202315ae mercurial-1.5.4.tar.gz +e97772cb424d29d9382c41daafa6f92d mercurial-1.6.tar.gz From 205a752a57251ad81c652ba18cf641c5494c19d5 Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Sun, 4 Jul 2010 19:43:26 +0000 Subject: [PATCH 24/26] Update to 1.6 --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 72670bf..a06fe5e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mercurial-1.5.4.tar.gz +mercurial-1.6.tar.gz diff --git a/sources b/sources index afe9e9d..98f3741 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db0d673000463fae1ca5cb8a202315ae mercurial-1.5.4.tar.gz +e97772cb424d29d9382c41daafa6f92d mercurial-1.6.tar.gz From f6a7cf079114f92d9518444a76fe5f4654e695ec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 03:09:40 +0000 Subject: [PATCH 25/26] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 17b3095..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: mercurial -# $Id$ -NAME := mercurial -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From 31204cbf72e62402a551836f684e359d3f6e2b91 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 03:09:46 +0000 Subject: [PATCH 26/26] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 17b3095..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: mercurial -# $Id$ -NAME := mercurial -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12