From 15e55762b9195482ba21ff910804049478533fb8 Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Thu, 21 Oct 2010 13:09:31 -0400 Subject: [PATCH 1/4] Try another method to fix unowned dirs --- mercurial.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mercurial.spec b/mercurial.spec index 67fed7b..655d64d 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -3,7 +3,7 @@ Summary: Mercurial -- a distributed SCM Name: mercurial Version: 1.6.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Development/Tools URL: http://www.selenic.com/mercurial/ @@ -86,7 +86,7 @@ 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} -grep -v 'hgk.py*' < %{name}.files > %{name}-base.files +grep -v -e 'hgk.py*' -e %{python_sitearch}/mercurial/ -e %{python_sitearch}/hgext/ < %{name}.files > %{name}-base.files grep 'hgk.py*' < %{name}.files > %{name}-hgk.files install -D -m 755 contrib/hgk $RPM_BUILD_ROOT%{_libexecdir}/mercurial/hgk @@ -135,8 +135,6 @@ rm -rf $RPM_BUILD_ROOT%{python_sitearch}/mercurial/locale %find_lang hg grep -v locale %{name}-base.files > %{name}-base-filtered.files -find $RPM_BUILD_ROOT%{python_sitearch}/{mercurial,hgext} -type d \ -| sed -e "s|^$RPM_BUILD_ROOT\(.*\)|%%dir \1|" >> %{name}-base-filtered.files %clean rm -rf $RPM_BUILD_ROOT @@ -153,6 +151,8 @@ rm -rf $RPM_BUILD_ROOT %dir %{_datadir}/zsh/site-functions/ %dir %{_sysconfdir}/mercurial %dir %{_sysconfdir}/mercurial/hgrc.d +%{python_sitearch}/mercurial +%{python_sitearch}/hgext %config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/mergetools.rc %files -n emacs-%{pkg} @@ -173,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Thu Oct 21 2010 Neal Becker - 1.6.4-4 +- Try another way to own directories + * Wed Oct 20 2010 Neal Becker - 1.6.4-3 - Fixup unowned directories From a6e3220c6d30df22a744deffb88172add96526d1 Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Mon, 1 Nov 2010 19:31:43 -0400 Subject: [PATCH 2/4] Update to 1.7.0 --- .gitignore | 1 + mercurial.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bd84d80..c28bf38 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ mercurial-1.6.2.tar.gz *~ /mercurial-1.6.3.tar.gz /mercurial-1.6.4.tar.gz +/mercurial-1.7.tar.gz diff --git a/mercurial.spec b/mercurial.spec index 655d64d..14c36fd 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,8 +2,8 @@ Summary: Mercurial -- a distributed SCM Name: mercurial -Version: 1.6.4 -Release: 5%{?dist} +Version: 1.7.0 +Release: 1%{?dist} License: GPLv2+ Group: Development/Tools URL: http://www.selenic.com/mercurial/ @@ -173,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Mon Nov 1 2010 Neal Becker - 1.7.0-1 +- Update to 1.7.0 + * Thu Oct 21 2010 Neal Becker - 1.6.4-4 - Try another way to own directories diff --git a/sources b/sources index da2b347..2284f59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -657dd6aff80aa9a3b187652a635544d0 mercurial-1.6.4.tar.gz +698948ff128d265db55bee8149445556 mercurial-1.7.tar.gz From 1fecbaf63ea3d025b831cfaba4d0995d1952589c Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Mon, 1 Nov 2010 19:33:24 -0400 Subject: [PATCH 3/4] Make that 1.7 --- mercurial.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mercurial.spec b/mercurial.spec index 14c36fd..5eea67b 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,8 +2,8 @@ Summary: Mercurial -- a distributed SCM Name: mercurial -Version: 1.7.0 -Release: 1%{?dist} +Version: 1.7 +Release: 2%{?dist} License: GPLv2+ Group: Development/Tools URL: http://www.selenic.com/mercurial/ @@ -173,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Mon Nov 1 2010 Neal Becker - 1.7-2 +- Make that 1.7 + * Mon Nov 1 2010 Neal Becker - 1.7.0-1 - Update to 1.7.0 From f14a59610b6633d7e7cfeedfea526de63b19da83 Mon Sep 17 00:00:00 2001 From: Neal Becker Date: Mon, 1 Nov 2010 19:45:06 -0400 Subject: [PATCH 4/4] BR python-docutils --- mercurial.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mercurial.spec b/mercurial.spec index 5eea67b..2dd5c6d 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -3,7 +3,7 @@ Summary: Mercurial -- a distributed SCM Name: mercurial Version: 1.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Development/Tools URL: http://www.selenic.com/mercurial/ @@ -12,7 +12,7 @@ Source1: mercurial-site-start.el Patch0: mercurial-i18n.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: python python-devel -BuildRequires: emacs emacs-el pkgconfig gettext +BuildRequires: emacs emacs-el pkgconfig gettext python-docutils Requires: python Provides: hg = %{version}-%{release} @@ -173,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT ##cd tests && %{__python} run-tests.py %changelog +* Mon Nov 1 2010 Neal Becker - 1.7-3 +- BR python-docutils + * Mon Nov 1 2010 Neal Becker - 1.7-2 - Make that 1.7