From d22aa95b519a2de423a26fa971b29584714abc2e Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 6 Nov 2006 15:35:52 +0000 Subject: [PATCH 001/114] - rebuild against the new curl --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 692f7e4..3895f77 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.4.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Mon Nov 6 2006 Jindrich Novy 1.4.2.4-2 +- rebuild against the new curl + * Tue Oct 17 2006 Chris Wright 1.4.2.4-1 - git-1.4.2.4 From d8f9dac0cc9ace3dbd6baac30956b2c82bb40ac3 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Sun, 10 Dec 2006 22:33:20 +0000 Subject: [PATCH 002/114] Update to git-1.4.4.2 --- .cvsignore | 2 +- git.spec | 42 ++++++++++++++++++++++++++++++++---------- sources | 2 +- 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6e343b5..ca2ed08 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.4.2.4.tar.gz +git-1.4.4.2.tar.gz diff --git a/git.spec b/git.spec index 3895f77..7726355 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.4.2.4 -Release: 2%{?dist} +Version: 1.4.4.2 +Release: 1%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -9,7 +9,7 @@ URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, perl-Git %description This is a stupid (but extremely fast) directory content manager. It @@ -70,6 +70,16 @@ Requires: git-core = %{version}-%{release}, tk >= 8.4 %description -n gitk Git revision tree visualiser ('gitk') +%package -n perl-Git +Summary: Perl interface to Git +Group: Development/Libraries +Requires: git-core = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl(Error) + +%description -n perl-Git +Perl interface to Git + %prep %setup -q @@ -80,12 +90,18 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ %install rm -rf $RPM_BUILD_ROOT make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ - prefix=%{_prefix} mandir=%{_mandir} \ + prefix=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor \ install %{!?_without_docs: install-doc} +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +%else +rm -rf $RPM_BUILD_ROOT%{_mandir} %endif %clean @@ -110,10 +126,10 @@ rm -rf $RPM_BUILD_ROOT %files arch %defattr(-,root,root) -%doc Documentation/*arch*.txt -%{_bindir}/*arch* -%{!?_without_docs: %{_mandir}/man1/*arch*.1*} -%{!?_without_docs: %doc Documentation/*arch*.html } +%doc Documentation/git-archimport.txt +%{_bindir}/git-archimport +%{!?_without_docs: %{_mandir}/man1/git-archimport.1*} +%{!?_without_docs: %doc Documentation/git-archimport.html } %files email %defattr(-,root,root) @@ -129,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %{_mandir}/man1/*gitk*.1*} %{!?_without_docs: %doc Documentation/*gitk*.html } +%files -n perl-Git -f perl-files +%defattr(-,root,root) + %files core -f bin-man-doc-files %defattr(-,root,root) %{_datadir}/git-core/ @@ -136,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Sun Dec 10 2006 Chris Wright 1.4.4.2-1 +- git-1.4.4.2 + * Mon Nov 6 2006 Jindrich Novy 1.4.2.4-2 - rebuild against the new curl diff --git a/sources b/sources index d885a62..4046dd8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -285f8b7a57f3062217e9fb5fb53836a5 git-1.4.2.4.tar.gz +e659d672930ed5144ab20df4d6958007 git-1.4.4.2.tar.gz From ae67d257ac7778c79eee5b47b6523ff66161f039 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 11 Dec 2006 09:06:32 +0000 Subject: [PATCH 003/114] couple minor git fixes --- ...oid-miscounting-bytes-in-Perl-v5.8.x.patch | 32 +++++++++++++++++++ git-install-non-executable-doc-files.patch | 22 +++++++++++++ git.spec | 10 +++++- 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch create mode 100644 git-install-non-executable-doc-files.patch diff --git a/cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch b/cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch new file mode 100644 index 0000000..ef01f4d --- /dev/null +++ b/cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch @@ -0,0 +1,32 @@ +From 4f88d3e0cbf443cd309c2c881209f3366f14023d Mon Sep 17 00:00:00 2001 +From: Martin Langhoff +Date: Thu, 7 Dec 2006 16:38:50 +1300 +Subject: [PATCH] cvsserver: Avoid miscounting bytes in Perl v5.8.x + +At some point between v5.6 and 5.8 Perl started to assume its input, +output and filehandles are UTF-8. This breaks the counting of bytes +for the CVS protocol, resulting in the client expecting less data +than we actually send, and storing truncated files. + +Signed-off-by: Martin Langhoff +Signed-off-by: Junio C Hamano +Signed-off-by: Chris Wright +--- + git-cvsserver.perl | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/git-cvsserver.perl b/git-cvsserver.perl +index ca519b7..197014d 100755 +--- a/git-cvsserver.perl ++++ b/git-cvsserver.perl +@@ -17,6 +17,7 @@ + + use strict; + use warnings; ++use bytes; + + use Fcntl; + use File::Temp qw/tempdir tempfile/; +-- +1.4.4.2 + diff --git a/git-install-non-executable-doc-files.patch b/git-install-non-executable-doc-files.patch new file mode 100644 index 0000000..4f19f23 --- /dev/null +++ b/git-install-non-executable-doc-files.patch @@ -0,0 +1,22 @@ +No need to install documentation files as executable. + +Signed-off-by: Chris Wright +--- + Documentation/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Documentation/Makefile b/Documentation/Makefile +index c00f5f6..d68bc4a 100644 +--- a/Documentation/Makefile ++++ b/Documentation/Makefile +@@ -56,8 +56,8 @@ man7: $(DOC_MAN7) + + install: man + $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir) +- $(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1dir) +- $(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7dir) ++ $(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir) ++ $(INSTALL) -m644 $(DOC_MAN7) $(DESTDIR)$(man7dir) + + + # diff --git a/git.spec b/git.spec index 7726355..bc7db6e 100644 --- a/git.spec +++ b/git.spec @@ -1,12 +1,14 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.4.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz +Patch0: git-install-non-executable-doc-files.patch +Patch1: cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, perl-Git @@ -82,6 +84,8 @@ Perl interface to Git %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ @@ -155,6 +159,10 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Sun Dec 10 2006 Chris Wright 1.4.4.2-2 +- no need to install manpages executable (bz 216790) +- use bytes for git-cvsserver + * Sun Dec 10 2006 Chris Wright 1.4.4.2-1 - git-1.4.4.2 From 8a7ece38d18d18595c1eb107ed60621b4ffde635 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 26 Feb 2007 22:41:39 +0000 Subject: [PATCH 004/114] Update to git-1.5.0.2 --- .cvsignore | 2 +- ...oid-miscounting-bytes-in-Perl-v5.8.x.patch | 32 ---------- git-install-non-executable-doc-files.patch | 22 ------- git.spec | 63 ++++++++++++------- sources | 2 +- 5 files changed, 42 insertions(+), 79 deletions(-) delete mode 100644 cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch delete mode 100644 git-install-non-executable-doc-files.patch diff --git a/.cvsignore b/.cvsignore index ca2ed08..ca282a9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.4.4.2.tar.gz +git-1.5.0.2.tar.gz diff --git a/cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch b/cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch deleted file mode 100644 index ef01f4d..0000000 --- a/cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4f88d3e0cbf443cd309c2c881209f3366f14023d Mon Sep 17 00:00:00 2001 -From: Martin Langhoff -Date: Thu, 7 Dec 2006 16:38:50 +1300 -Subject: [PATCH] cvsserver: Avoid miscounting bytes in Perl v5.8.x - -At some point between v5.6 and 5.8 Perl started to assume its input, -output and filehandles are UTF-8. This breaks the counting of bytes -for the CVS protocol, resulting in the client expecting less data -than we actually send, and storing truncated files. - -Signed-off-by: Martin Langhoff -Signed-off-by: Junio C Hamano -Signed-off-by: Chris Wright ---- - git-cvsserver.perl | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/git-cvsserver.perl b/git-cvsserver.perl -index ca519b7..197014d 100755 ---- a/git-cvsserver.perl -+++ b/git-cvsserver.perl -@@ -17,6 +17,7 @@ - - use strict; - use warnings; -+use bytes; - - use Fcntl; - use File::Temp qw/tempdir tempfile/; --- -1.4.4.2 - diff --git a/git-install-non-executable-doc-files.patch b/git-install-non-executable-doc-files.patch deleted file mode 100644 index 4f19f23..0000000 --- a/git-install-non-executable-doc-files.patch +++ /dev/null @@ -1,22 +0,0 @@ -No need to install documentation files as executable. - -Signed-off-by: Chris Wright ---- - Documentation/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Documentation/Makefile b/Documentation/Makefile -index c00f5f6..d68bc4a 100644 ---- a/Documentation/Makefile -+++ b/Documentation/Makefile -@@ -56,8 +56,8 @@ man7: $(DOC_MAN7) - - install: man - $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir) -- $(INSTALL) $(DOC_MAN1) $(DESTDIR)$(man1dir) -- $(INSTALL) $(DOC_MAN7) $(DESTDIR)$(man7dir) -+ $(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir) -+ $(INSTALL) -m644 $(DOC_MAN7) $(DESTDIR)$(man7dir) - - - # diff --git a/git.spec b/git.spec index bc7db6e..f0fe843 100644 --- a/git.spec +++ b/git.spec @@ -1,39 +1,31 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.4.4.2 -Release: 2%{?dist} +Version: 1.5.0.2 +Release: 1%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz -Patch0: git-install-non-executable-doc-files.patch -Patch1: cvsserver-Avoid-miscounting-bytes-in-Perl-v5.8.x.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, perl-Git +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git %description -This is a stupid (but extremely fast) directory content manager. It -doesn't do a whole lot, but what it _does_ do is track directory -contents efficiently. It is intended to be the base of an efficient, -distributed source code management system. This package includes -rudimentary tools that can be used as a SCM, but you should look -elsewhere for tools for ordinary humans layered on top of this. +Git is a fast, scalable, distributed revision control system with an +unusually rich command set that provides both high-level operations +and full access to internals. This is a dummy package which brings in all subpackages. %package core Summary: Core git tools Group: Development/Tools -Requires: zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, expat +Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat %description core -This is a stupid (but extremely fast) directory content manager. It -doesn't do a whole lot, but what it _does_ do is track directory -contents efficiently. It is intended to be the base of an efficient, -distributed source code management system. This package includes -rudimentary tools that can be used as a SCM, but you should look -elsewhere for tools for ordinary humans layered on top of this. +Git is a fast, scalable, distributed revision control system with an +unusually rich command set that provides both high-level operations +and full access to internals. These are the core tools with minimal dependencies. @@ -65,6 +57,13 @@ Requires: git-core = %{version}-%{release} %description email Git tools for sending email. +%package gui +Summary: Git GUI tool +Group: Development/Tools +Requires: git-core = %{version}-%{release}, tk >= 8.4 +%description gui +Git GUI tool + %package -n gitk Summary: Git revision tree visualiser ('gitk') Group: Development/Tools @@ -84,8 +83,6 @@ Perl interface to Git %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ @@ -93,17 +90,18 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ %install rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ + WITH_OWN_SUBPROCESS_PY=YesPlease \ prefix=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor \ install %{!?_without_docs: install-doc} find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf $RPM_BUILD_ROOT%{_mandir} %endif @@ -142,6 +140,16 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } +%files gui +%defattr(-,root,root) +%{_bindir}/git-gui +%{_bindir}/git-citool +# Not Yet... +# %{!?_without_docs: %{_mandir}/man1/git-gui.1} +# %{!?_without_docs: %doc Documentation/git-gui.html} +# %{!?_without_docs: %{_mandir}/man1/git-citool.1} +# %{!?_without_docs: %doc Documentation/git-citool.html} + %files -n gitk %defattr(-,root,root) %doc Documentation/*gitk*.txt @@ -159,6 +167,15 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Mon Feb 26 2007 Chris Wright 1.5.0.2-1 +- git-1.5.0.2 + +* Mon Feb 13 2007 Nicolas Pitre +- Update core package description (Git isn't as stupid as it used to be) + +* Mon Feb 12 2007 Junio C Hamano +- Add git-gui and git-citool. + * Sun Dec 10 2006 Chris Wright 1.4.4.2-2 - no need to install manpages executable (bz 216790) - use bytes for git-cvsserver diff --git a/sources b/sources index 4046dd8..4b18025 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e659d672930ed5144ab20df4d6958007 git-1.4.4.2.tar.gz +7bdc4894ece40e0219f259f64750978d git-1.5.0.2.tar.gz From 29dba59fb4ed65693a2371d24d96b3ab4d3f5f8c Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Fri, 2 Mar 2007 21:53:30 +0000 Subject: [PATCH 005/114] Fix BuildRequires for new perl --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index f0fe843..611709d 100644 --- a/git.spec +++ b/git.spec @@ -1,13 +1,13 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz -BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +BuildRequires: perl-devel, zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git @@ -167,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Fri Mar 2 2007 Chris Wright 1.5.0.2-2 +- BuildRequires perl-devel as of perl-5.8.8-14 (bz 230680) + * Mon Feb 26 2007 Chris Wright 1.5.0.2-1 - git-1.5.0.2 From f0090ff29ee08c69a170a3394a69b0adfea4e94f Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 13 Mar 2007 21:02:08 +0000 Subject: [PATCH 006/114] Update to git-1.5.0.3 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index ca282a9..eb468e3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.0.2.tar.gz +git-1.5.0.3.tar.gz diff --git a/git.spec b/git.spec index 611709d..c99d6d0 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.0.2 -Release: 2%{?dist} +Version: 1.5.0.3 +Release: 1%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -167,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Tue Mar 13 2007 Chris Wright 1.5.0.3-1 +- git-1.5.0.3 + * Fri Mar 2 2007 Chris Wright 1.5.0.2-2 - BuildRequires perl-devel as of perl-5.8.8-14 (bz 230680) diff --git a/sources b/sources index 4b18025..1459854 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7bdc4894ece40e0219f259f64750978d git-1.5.0.2.tar.gz +eed1b888334310bb0e7f3f7e4f074963 git-1.5.0.3.tar.gz From ac210a5ddd09d9dbc3f0cc86fcdb975e36ef8a47 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 19 Mar 2007 21:50:01 +0000 Subject: [PATCH 007/114] Update to git-1.5.0.5 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index eb468e3..23afead 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.0.3.tar.gz +git-1.5.0.5.tar.gz diff --git a/git.spec b/git.spec index c99d6d0..2230f27 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.0.3 +Version: 1.5.0.5 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -167,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Mon Mar 19 2007 Chris Wright 1.5.0.5-1 +- git-1.5.0.5 + * Tue Mar 13 2007 Chris Wright 1.5.0.3-1 - git-1.5.0.3 diff --git a/sources b/sources index 1459854..cf42138 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eed1b888334310bb0e7f3f7e4f074963 git-1.5.0.3.tar.gz +f7e6406f27464517cf9b718f8541dcb1 git-1.5.0.5.tar.gz From 9fc60a6f1af39c4bf5ff820a1614982845aca96b Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Fri, 30 Mar 2007 17:50:32 +0000 Subject: [PATCH 008/114] Update to git-1.5.0.6 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 23afead..e8e0fe7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.0.5.tar.gz +git-1.5.0.6.tar.gz diff --git a/git.spec b/git.spec index 2230f27..0738653 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.0.5 +Version: 1.5.0.6 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -167,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html } %changelog +* Fri Mar 30 2007 Chris Wright 1.5.0.6-1 +- git-1.5.0.6 + * Mon Mar 19 2007 Chris Wright 1.5.0.5-1 - git-1.5.0.5 diff --git a/sources b/sources index cf42138..43c7921 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f7e6406f27464517cf9b718f8541dcb1 git-1.5.0.5.tar.gz +d9564417eadc424d4dd7616339fa9b2f git-1.5.0.6.tar.gz From a034ecc3617ee90df0933f0141e701d1b125d1f4 Mon Sep 17 00:00:00 2001 From: jbowes Date: Fri, 8 Jun 2007 16:22:14 +0000 Subject: [PATCH 009/114] git-1.5.2.1-1 for rawhide --- .cvsignore | 2 +- git.spec | 25 +++++++++++++++++++------ sources | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index e8e0fe7..8239acc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.0.6.tar.gz +git-1.5.2.1.tar.gz diff --git a/git.spec b/git.spec index 0738653..44a488b 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.0.6 +Version: 1.5.2.1 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -85,15 +85,16 @@ Perl interface to Git %setup -q %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ + ETC_GITCONFIG=/etc/gitconfig \ prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ - WITH_OWN_SUBPROCESS_PY=YesPlease \ - prefix=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor \ - install %{!?_without_docs: install-doc} + prefix=%{_prefix} mandir=%{_mandir} \ + ETC_GITCONFIG=/etc/gitconfig \ + INSTALLDIRS=vendor install %{!?_without_docs: install-doc} find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' @@ -144,6 +145,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_bindir}/git-gui %{_bindir}/git-citool +%{_datadir}/git-gui/ # Not Yet... # %{!?_without_docs: %{_mandir}/man1/git-gui.1} # %{!?_without_docs: %doc Documentation/git-gui.html} @@ -164,9 +166,20 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_datadir}/git-core/ %doc README COPYING Documentation/*.txt -%{!?_without_docs: %doc Documentation/*.html } +%{!?_without_docs: %doc Documentation/*.html Documentation/howto} +%{!?_without_docs: %doc Documentation/technical} %changelog +* Fri Jun 08 2007 James Bowes 1.5.2.1-1 +- git-1.5.2.1 + +* Tue May 13 2007 Quy Tonthat +- Added lib files for git-gui +- Added Documentation/technical (As needed by Git Users Manual) + +* Tue May 8 2007 Quy Tonthat +- Added howto files + * Fri Mar 30 2007 Chris Wright 1.5.0.6-1 - git-1.5.0.6 diff --git a/sources b/sources index 43c7921..943574d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d9564417eadc424d4dd7616339fa9b2f git-1.5.0.6.tar.gz +e65b08c2e1a4112c3139c15ac5a13e71 git-1.5.2.1.tar.gz From 847e262a5424899b958d6640451d6cfcbfcb3756 Mon Sep 17 00:00:00 2001 From: jbowes Date: Mon, 18 Jun 2007 17:22:45 +0000 Subject: [PATCH 010/114] git-1.5.2.2 for rawhide --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8239acc..d6e9e55 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.2.1.tar.gz +git-1.5.2.2.tar.gz diff --git a/git.spec b/git.spec index 44a488b..dcc759f 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.2.1 +Version: 1.5.2.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Mon Jun 18 2007 James Bowes 1.5.2.2-1 +- git-1.5.2.2 + * Fri Jun 08 2007 James Bowes 1.5.2.1-1 - git-1.5.2.1 diff --git a/sources b/sources index 943574d..c3c97df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e65b08c2e1a4112c3139c15ac5a13e71 git-1.5.2.1.tar.gz +6a0f39577cbfbb575edb3c45d8f5d528 git-1.5.2.2.tar.gz From e46bac574f5e9290432d418039cfe6a314daa59a Mon Sep 17 00:00:00 2001 From: jwboyer Date: Fri, 22 Jun 2007 13:21:35 +0000 Subject: [PATCH 011/114] Add emacs-git package from Ville (#235431) --- git-init.el | 2 ++ git.spec | 42 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 git-init.el diff --git a/git-init.el b/git-init.el new file mode 100644 index 0000000..5b7eb3e --- /dev/null +++ b/git-init.el @@ -0,0 +1,2 @@ +;; Git VC backend +(add-to-list 'vc-handled-backends 'GIT t) diff --git a/git.spec b/git.spec index dcc759f..70fc502 100644 --- a/git.spec +++ b/git.spec @@ -1,15 +1,16 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz -BuildRequires: perl-devel, zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +Source1: git-init.el +BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git +Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git, emacs-git %description Git is a fast, scalable, distributed revision control system with an @@ -62,24 +63,32 @@ Summary: Git GUI tool Group: Development/Tools Requires: git-core = %{version}-%{release}, tk >= 8.4 %description gui -Git GUI tool +Git GUI tool. %package -n gitk -Summary: Git revision tree visualiser ('gitk') +Summary: Git revision tree visualiser Group: Development/Tools Requires: git-core = %{version}-%{release}, tk >= 8.4 %description -n gitk -Git revision tree visualiser ('gitk') +Git revision tree visualiser. %package -n perl-Git Summary: Perl interface to Git Group: Development/Libraries Requires: git-core = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildRequires: perl(Error) +BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) %description -n perl-Git -Perl interface to Git +Perl interface to Git. + +%package -n emacs-git +Summary: Git version control system support for Emacs +Group: Applications/Editors +Requires: git-core = %{version}-%{release}, emacs-common + +%description -n emacs-git +%{summary}. %prep %setup -q @@ -88,6 +97,7 @@ Perl interface to Git make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ ETC_GITCONFIG=/etc/gitconfig \ prefix=%{_prefix} all %{!?_without_docs: doc} +make -C contrib/emacs %install rm -rf $RPM_BUILD_ROOT @@ -95,6 +105,14 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ prefix=%{_prefix} mandir=%{_mandir} \ ETC_GITCONFIG=/etc/gitconfig \ INSTALLDIRS=vendor install %{!?_without_docs: install-doc} +make -C contrib/emacs install \ + emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp +for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do + install -pm 644 contrib/emacs/$(basename $elc .elc).el \ + $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp +done +install -Dpm 644 %{SOURCE1} \ + $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/git-init.el find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' @@ -162,6 +180,11 @@ rm -rf $RPM_BUILD_ROOT %files -n perl-Git -f perl-files %defattr(-,root,root) +%files -n emacs-git +%defattr(-,root,root) +%{_datadir}/emacs/site-lisp/*git*.el* +%{_datadir}/emacs/site-lisp/site-start.d/git-init.el + %files core -f bin-man-doc-files %defattr(-,root,root) %{_datadir}/git-core/ @@ -170,6 +193,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Thu Jun 21 2007 Josh Boyer 1.5.2.2-2 +- Add emacs-git package (#235431) + * Mon Jun 18 2007 James Bowes 1.5.2.2-1 - git-1.5.2.2 From aed6e3618e843b99fe053dc8ede65d6803fb8968 Mon Sep 17 00:00:00 2001 From: jwboyer Date: Tue, 26 Jun 2007 11:27:51 +0000 Subject: [PATCH 012/114] Add git-status and git-blame autoloads for emacs --- git-init.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git-init.el b/git-init.el index 5b7eb3e..d2a96a7 100644 --- a/git-init.el +++ b/git-init.el @@ -1,2 +1,5 @@ ;; Git VC backend (add-to-list 'vc-handled-backends 'GIT t) +(autoload 'git-status "git" "GIT mode." t) +(autoload 'git-blame-mode "git-blame" + "Minor mode for incremental blame for Git." t) From c97cf8e11f90a5954396b5e9d7f2f3563009c3dc Mon Sep 17 00:00:00 2001 From: jwboyer Date: Sat, 4 Aug 2007 02:05:22 +0000 Subject: [PATCH 013/114] Add git-daemon and gitweb packages --- git-1.5-gitweb-home-link.patch | 11 ++++++++ git.conf.httpd | 6 +++++ git.spec | 47 ++++++++++++++++++++++++++++++++-- git.xinetd | 16 ++++++++++++ 4 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 git-1.5-gitweb-home-link.patch create mode 100644 git.conf.httpd create mode 100644 git.xinetd diff --git a/git-1.5-gitweb-home-link.patch b/git-1.5-gitweb-home-link.patch new file mode 100644 index 0000000..cd36563 --- /dev/null +++ b/git-1.5-gitweb-home-link.patch @@ -0,0 +1,11 @@ +--- git-1.5.0.6/gitweb/gitweb.perl~ 2007-03-30 01:37:05.000000000 +0100 ++++ git-1.5.0.6/gitweb/gitweb.perl 2007-05-07 08:31:37.000000000 +0100 +@@ -39,7 +39,7 @@ our $projectroot = "++GITWEB_PROJECTROOT + our $home_link = $my_uri || "/"; + + # string of the home link on top of all pages +-our $home_link_str = "++GITWEB_HOME_LINK_STR++"; ++our $home_link_str = $ENV{'SERVER_NAME'} ? "git://" . $ENV{'SERVER_NAME'} : "projects"; + + # name of your site or organization to appear in page titles + # replace this with something more descriptive for clearer bookmarks diff --git a/git.conf.httpd b/git.conf.httpd new file mode 100644 index 0000000..3611943 --- /dev/null +++ b/git.conf.httpd @@ -0,0 +1,6 @@ +Alias /git /var/www/git + + + Options +ExecCGI + AddHandler cgi-script .cgi + diff --git a/git.spec b/git.spec index 70fc502..0f484ab 100644 --- a/git.spec +++ b/git.spec @@ -1,13 +1,16 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz Source1: git-init.el +Source2: git.xinetd +Source3: git.conf.httpd +Patch0: git-1.5-gitweb-home-link.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git, emacs-git @@ -30,6 +33,22 @@ and full access to internals. These are the core tools with minimal dependencies. +%package daemon +Summary: Git protocol dæmon +Group: Development/Tools +Requires: git-core = %{version}-%{release} +%description daemon +The git dæmon for supporting git:// access to git repositories + +%package -n gitweb +Summary: Simple web interface to git repositories +Group: Development/Tools +Requires: git-core = %{version}-%{release} + +%description -n gitweb +Simple web interface to track changes in git repositories + + %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools @@ -92,6 +111,7 @@ Requires: git-core = %{version}-%{release}, emacs-common %prep %setup -q +%patch0 -p1 %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ @@ -113,17 +133,26 @@ for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do done install -Dpm 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/git-init.el +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d +install -m 644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/git +mkdir -p $RPM_BUILD_ROOT/var/www/git +install -m 644 -t $RPM_BUILD_ROOT/var/www/git gitweb/*.png gitweb/*.css +install -m 755 -t $RPM_BUILD_ROOT/var/www/git gitweb/gitweb.cgi +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d +install -m 0644 %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf + find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files %if %{!?_without_docs:1}0 (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf $RPM_BUILD_ROOT%{_mandir} %endif +mkdir -p $RPM_BUILD_ROOT/srv/git %clean rm -rf $RPM_BUILD_ROOT @@ -189,10 +218,24 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_datadir}/git-core/ %doc README COPYING Documentation/*.txt + +%files daemon +%defattr(-,root,root) +%{_bindir}/git-daemon +%config(noreplace)%{_sysconfdir}/xinetd.d/git +/srv/git + +%files -n gitweb +%defattr(-,root,root) +/var/www/git/ +%{_sysconfdir}/httpd/conf.d/git.conf %{!?_without_docs: %doc Documentation/*.html Documentation/howto} %{!?_without_docs: %doc Documentation/technical} %changelog +* Tue Jul 03 2007 Josh Boyer 1.5.2.2-3 +- Add git-daemon and gitweb packages + * Thu Jun 21 2007 Josh Boyer 1.5.2.2-2 - Add emacs-git package (#235431) diff --git a/git.xinetd b/git.xinetd new file mode 100644 index 0000000..dcfae91 --- /dev/null +++ b/git.xinetd @@ -0,0 +1,16 @@ +# default: off +# description: The git dæmon allows git repositories to be exported using +# the git:// protocol. + +service git +{ + disable = yes + socket_type = stream + wait = no + user = nobody + server = /usr/bin/git-daemon + server_args = --base-path=/srv/git --export-all --user-path=public_git --syslog --inetd --verbose + log_on_failure += USERID +# xinetd doesn't do this by default. bug #195265 + flags = IPv6 +} From c9ad777f80fcaecfeb567632a3b63df6f99bf0b8 Mon Sep 17 00:00:00 2001 From: jwboyer Date: Sat, 4 Aug 2007 02:43:05 +0000 Subject: [PATCH 014/114] Update to latest stable git release --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index d6e9e55..3a031f1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.2.2.tar.gz +git-1.5.2.4.tar.gz diff --git a/git.spec b/git.spec index 0f484ab..152232e 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.2.2 -Release: 3%{?dist} +Version: 1.5.2.4 +Release: 1%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Fri Aug 03 2007 Josh Boyer 1.5.2.4-1 +- git-1.5.2.4-1 + * Tue Jul 03 2007 Josh Boyer 1.5.2.2-3 - Add git-daemon and gitweb packages diff --git a/sources b/sources index c3c97df..5ae257c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a0f39577cbfbb575edb3c45d8f5d528 git-1.5.2.2.tar.gz +a8537d8707c6e852d19545bc16d1afb8 git-1.5.2.4.tar.gz From d107cac9e2d439fdbccabd5ea9308730b846da3e Mon Sep 17 00:00:00 2001 From: jbowes Date: Fri, 24 Aug 2007 00:28:24 +0000 Subject: [PATCH 015/114] git 1.5.2.5 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3a031f1..c8ba9c8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.2.4.tar.gz +git-1.5.2.5.tar.gz diff --git a/git.spec b/git.spec index 152232e..2996b69 100644 --- a/git.spec +++ b/git.spec @@ -1,9 +1,9 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.2.4 +Version: 1.5.2.5 Release: 1%{?dist} Summary: Git core and tools -License: GPL +License: GPLv2 Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz @@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Thu Aug 23 2007 James Bowes 1.5.2.5-1 +- git-1.5.2.5-1 + * Fri Aug 03 2007 Josh Boyer 1.5.2.4-1 - git-1.5.2.4-1 diff --git a/sources b/sources index 5ae257c..d208348 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a8537d8707c6e852d19545bc16d1afb8 git-1.5.2.4.tar.gz +4e8de9e56882f3214a92f6d7dc3c49ec git-1.5.2.5.tar.gz From 61201b75f4bb78703c64a3c6583791b9963e789e Mon Sep 17 00:00:00 2001 From: jwboyer Date: Thu, 6 Sep 2007 15:48:06 +0000 Subject: [PATCH 016/114] - git-1.5.3.1-1 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index c8ba9c8..b029088 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.2.5.tar.gz +git-1.5.3.1.tar.gz diff --git a/git.spec b/git.spec index 2996b69..076ab85 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.2.5 +Version: 1.5.3.1 Release: 1%{?dist} Summary: Git core and tools License: GPLv2 @@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Thu Sep 06 2007 Josh Boyer 1.5.3.1-1 +- git-1.5.3.1-1 + * Thu Aug 23 2007 James Bowes 1.5.2.5-1 - git-1.5.2.5-1 diff --git a/sources b/sources index d208348..58f25fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e8de9e56882f3214a92f6d7dc3c49ec git-1.5.2.5.tar.gz +afef243b2d271004d13b0381ac2ee580 git-1.5.3.1.tar.gz From 882051a633e122cae882d24ebb85da10fd287d4b Mon Sep 17 00:00:00 2001 From: jwboyer Date: Thu, 6 Sep 2007 17:35:42 +0000 Subject: [PATCH 017/114] - Include git-gui and git-citool docs --- git.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/git.spec b/git.spec index 076ab85..88753e2 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -194,10 +194,10 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/git-citool %{_datadir}/git-gui/ # Not Yet... -# %{!?_without_docs: %{_mandir}/man1/git-gui.1} -# %{!?_without_docs: %doc Documentation/git-gui.html} -# %{!?_without_docs: %{_mandir}/man1/git-citool.1} -# %{!?_without_docs: %doc Documentation/git-citool.html} +%{!?_without_docs: %{_mandir}/man1/git-gui.1*} +%{!?_without_docs: %doc Documentation/git-gui.html} +%{!?_without_docs: %{_mandir}/man1/git-citool.1*} +%{!?_without_docs: %doc Documentation/git-citool.html} %files -n gitk %defattr(-,root,root) @@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Thu Sep 06 2007 Josh Boyer 1.5.3.1-2 +- Include git-gui and git-citool docs + * Thu Sep 06 2007 Josh Boyer 1.5.3.1-1 - git-1.5.3.1-1 From d28bb9e265ad1bd59724f3892b796ed238772250 Mon Sep 17 00:00:00 2001 From: jbowes Date: Thu, 27 Sep 2007 01:34:46 +0000 Subject: [PATCH 018/114] git-1.5.3.2 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index b029088..0d1f766 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.3.1.tar.gz +git-1.5.3.2.tar.gz diff --git a/git.spec b/git.spec index 88753e2..88dcc37 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.1 -Release: 2%{?dist} +Version: 1.5.3.2 +Release: 1%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Wed Sep 26 2007 James Bowes 1.5.3.2-1 +- git-1.5.3.2 + * Thu Sep 06 2007 Josh Boyer 1.5.3.1-2 - Include git-gui and git-citool docs diff --git a/sources b/sources index 58f25fe..421d631 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -afef243b2d271004d13b0381ac2ee580 git-1.5.3.1.tar.gz +9930f19e22c121b8a803337cbda1e661 git-1.5.3.2.tar.gz From fa07213ef8f9daf66458f834dbdb81ef5177c110 Mon Sep 17 00:00:00 2001 From: jbowes Date: Sun, 30 Sep 2007 15:17:23 +0000 Subject: [PATCH 019/114] git 1.5.3.3 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0d1f766..7cff24f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.3.2.tar.gz +git-1.5.3.3.tar.gz diff --git a/git.spec b/git.spec index 88dcc37..6a5d88b 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.2 +Version: 1.5.3.3 Release: 1%{?dist} Summary: Git core and tools License: GPLv2 @@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Sun Sep 30 2007 James Bowes 1.5.3.3-1 +- git-1.5.3.3 + * Wed Sep 26 2007 James Bowes 1.5.3.2-1 - git-1.5.3.2 diff --git a/sources b/sources index 421d631..557dc24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9930f19e22c121b8a803337cbda1e661 git-1.5.3.2.tar.gz +978bda72a636d805dd3058efec5e6f2e git-1.5.3.3.tar.gz From a2aec494f7d33d80df53270481babfbfc13963a4 Mon Sep 17 00:00:00 2001 From: jbowes Date: Tue, 9 Oct 2007 12:16:42 +0000 Subject: [PATCH 020/114] git 1.5.3.4 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7cff24f..1725bcd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.3.3.tar.gz +git-1.5.3.4.tar.gz diff --git a/git.spec b/git.spec index 6a5d88b..140adb1 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.3 +Version: 1.5.3.4 Release: 1%{?dist} Summary: Git core and tools License: GPLv2 @@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Tue Oct 09 2007 James Bowes 1.5.3.4-1 +- git-1.5.3.4 + * Sun Sep 30 2007 James Bowes 1.5.3.3-1 - git-1.5.3.3 diff --git a/sources b/sources index 557dc24..3012073 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -978bda72a636d805dd3058efec5e6f2e git-1.5.3.3.tar.gz +863235e36f5e4922c7f7a8459e0f8910 git-1.5.3.4.tar.gz From 7b295a34fcd4c18e4f06e6fce9ba4c7e8d1b7784 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 23 Oct 2007 22:35:14 +0000 Subject: [PATCH 021/114] Added dependency on Perl(Error) to perl-Git --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 140adb1..c799a06 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -94,7 +94,7 @@ Git revision tree visualiser. %package -n perl-Git Summary: Perl interface to Git Group: Development/Libraries -Requires: git-core = %{version}-%{release} +Requires: git-core = %{version}-%{release}, perl(Error) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) @@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Wed Oct 24 2007 Lubomir Kundrak 1.5.3.4-2 +- git-Perl requires Error package + * Tue Oct 09 2007 James Bowes 1.5.3.4-1 - git-1.5.3.4 From edddb8398d8c721be9d6b04432677ebcae29a8e7 Mon Sep 17 00:00:00 2001 From: jwboyer Date: Tue, 27 Nov 2007 16:27:59 +0000 Subject: [PATCH 022/114] Update to latest upstream release. Fix some bugs at the same time --- .cvsignore | 2 +- git.spec | 16 +++++++++++----- sources | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1725bcd..c6a071e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.3.4.tar.gz +git-1.5.3.6.tar.gz diff --git a/git.spec b/git.spec index c799a06..772477a 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.4 -Release: 2%{?dist} +Version: 1.5.3.6 +Release: 1%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -25,7 +25,7 @@ This is a dummy package which brings in all subpackages. %package core Summary: Core git tools Group: Development/Tools -Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat +Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat, perl(Error) %description core Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations @@ -52,7 +52,7 @@ Simple web interface to track changes in git repositories %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools -Requires: git-core = %{version}-%{release}, subversion +Requires: git-core = %{version}-%{release}, subversion, perl(Term::ReadKey) %description svn Git tools for importing Subversion repositories. @@ -73,7 +73,7 @@ Git tools for importing Arch repositories. %package email Summary: Git tools for sending email Group: Development/Tools -Requires: git-core = %{version}-%{release} +Requires: git-core = %{version}-%{release}, perl-Git = %{version}-%{release} %description email Git tools for sending email. @@ -233,6 +233,12 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Tue Nov 27 2007 Josh Boyer 1.5.3.6-1 +- git-1.5.3.6 +- git-core requires perl(Error) (bug 367861) +- git-svn requires perl(Term:ReadKey) (bug 261361) +- git-email requires perl-Git (bug 333061) + * Wed Oct 24 2007 Lubomir Kundrak 1.5.3.4-2 - git-Perl requires Error package diff --git a/sources b/sources index 3012073..31bf148 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -863235e36f5e4922c7f7a8459e0f8910 git-1.5.3.4.tar.gz +37126a4eb247b491b29e768fd25bfee8 git-1.5.3.6.tar.gz From 345ffe2b741c1a91d538c604f14b6d90f8a33ec1 Mon Sep 17 00:00:00 2001 From: jwboyer Date: Mon, 3 Dec 2007 21:36:52 +0000 Subject: [PATCH 023/114] - git-1.5.3.7 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index c6a071e..7b50fde 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.3.6.tar.gz +git-1.5.3.7.tar.gz diff --git a/git.spec b/git.spec index 772477a..c7b5b97 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.6 +Version: 1.5.3.7 Release: 1%{?dist} Summary: Git core and tools License: GPLv2 @@ -233,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Mon Dec 03 2007 Josh Boyer 1.5.3.7-1 +- git-1.5.3.7 + * Tue Nov 27 2007 Josh Boyer 1.5.3.6-1 - git-1.5.3.6 - git-core requires perl(Error) (bug 367861) diff --git a/sources b/sources index 31bf148..2a0b639 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -37126a4eb247b491b29e768fd25bfee8 git-1.5.3.6.tar.gz +1dc83cf9e529abceb4d65ff018da60a2 git-1.5.3.7.tar.gz From e39a013e4ac4aad131f762bb8b1ba3f4917e60b6 Mon Sep 17 00:00:00 2001 From: jbowes Date: Fri, 21 Dec 2007 15:40:35 +0000 Subject: [PATCH 024/114] Have git metapackage require explicit versions --- git.spec | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index c7b5b97..874b085 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.3.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -13,7 +13,17 @@ Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git, emacs-git + +Requires: git-core = %{version}-%{release} +Requires: git-svn = %{version}-%{release} +Requires: git-cvs = %{version}-%{release} +Requires: git-arch = %{version}-%{release} +Requires: git-email = %{version}-%{release} +Requires: gitk = %{version}-%{release} +Requires: git-gui = %{version}-%{release} +Requires: perl-Git = %{version}-%{release} +Requires: emacs-git = %{version}-%{release} + %description Git is a fast, scalable, distributed revision control system with an @@ -233,6 +243,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Fri Dec 21 2007 James Bowes 1.5.3.7-2 +- Have git metapackage require explicit versions (bug 247214) + * Mon Dec 03 2007 Josh Boyer 1.5.3.7-1 - git-1.5.3.7 From d054635f73ad25bc0afb117ee6b7e87b1ebf1a52 Mon Sep 17 00:00:00 2001 From: jbowes Date: Tue, 8 Jan 2008 12:43:50 +0000 Subject: [PATCH 025/114] git-1.5.3.8 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7b50fde..214eefd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.3.7.tar.gz +git-1.5.3.8.tar.gz diff --git a/git.spec b/git.spec index 874b085..5059488 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.7 -Release: 2%{?dist} +Version: 1.5.3.8 +Release: 1%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -243,6 +243,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Tue Jan 08 2008 James Bowes 1.5.3.8-1 +- git-1.5.3.8 + * Fri Dec 21 2007 James Bowes 1.5.3.7-2 - Have git metapackage require explicit versions (bug 247214) diff --git a/sources b/sources index 2a0b639..88cf747 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1dc83cf9e529abceb4d65ff018da60a2 git-1.5.3.7.tar.gz +95a79b889cfdb6e33388058f9a188e66 git-1.5.3.8.tar.gz From 6e9300fbf84e1649dd1ea7f3e986d85f9e078d67 Mon Sep 17 00:00:00 2001 From: jbowes Date: Sat, 2 Feb 2008 19:18:23 +0000 Subject: [PATCH 026/114] git 1.5.4 --- .cvsignore | 2 +- git.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 214eefd..c699025 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.3.8.tar.gz +git-1.5.4.tar.gz diff --git a/git.spec b/git.spec index 5059488..04aee76 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.3.8 +Version: 1.5.4 Release: 1%{?dist} Summary: Git core and tools License: GPLv2 @@ -213,6 +213,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc Documentation/*gitk*.txt %{_bindir}/*gitk* +%{_datadir}/gitk %{!?_without_docs: %{_mandir}/man1/*gitk*.1*} %{!?_without_docs: %doc Documentation/*gitk*.html } @@ -243,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Sat Feb 02 2008 James Bowes 1.5.4-1 +- git-1.5.4 + * Tue Jan 08 2008 James Bowes 1.5.3.8-1 - git-1.5.3.8 diff --git a/sources b/sources index 88cf747..11a9cc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95a79b889cfdb6e33388058f9a188e66 git-1.5.3.8.tar.gz +22725d00bf2006bc9464873b7ae85e28 git-1.5.4.tar.gz From 70ebaedb54660321beae9c779c8930031db1cd8f Mon Sep 17 00:00:00 2001 From: jbowes Date: Sun, 3 Feb 2008 20:49:30 +0000 Subject: [PATCH 027/114] Add BR on gettext --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 04aee76..318d4cd 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -11,7 +11,7 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch -BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: git-core = %{version}-%{release} @@ -244,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Sun Feb 03 2008 James Bowes 1.5.4-1 +- Add BuidRequires on gettext. + * Sat Feb 02 2008 James Bowes 1.5.4-1 - git-1.5.4 From 20408359cc021e8abb0565733f63ea4341edc470 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 6 Feb 2008 02:17:10 +0000 Subject: [PATCH 028/114] Rebuild for new perl --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 318d4cd..d418315 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -244,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Tue Feb 05 2008 Tom "spot" Callaway 1.5.4-3 +- rebuild for new perl + * Sun Feb 03 2008 James Bowes 1.5.4-1 - Add BuidRequires on gettext. From 9e5f7a30de54d86f954598538f40e06c46b601c1 Mon Sep 17 00:00:00 2001 From: jbowes Date: Sun, 10 Feb 2008 14:24:31 +0000 Subject: [PATCH 029/114] git 1.5.4.1 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index c699025..f198e31 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.4.tar.gz +git-1.5.4.1.tar.gz diff --git a/git.spec b/git.spec index d418315..1ef5018 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.4 -Release: 3%{?dist} +Version: 1.5.4.1 +Release: 1%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -244,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Sun Feb 10 2008 James Bowes 1.5.4.1-1 +- git-1.5.4.1 + * Tue Feb 05 2008 Tom "spot" Callaway 1.5.4-3 - rebuild for new perl diff --git a/sources b/sources index 11a9cc9..3b6a520 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -22725d00bf2006bc9464873b7ae85e28 git-1.5.4.tar.gz +b9f43605fad1543597ed85dc7c7af86e git-1.5.4.1.tar.gz From 32c593e37d834dc2a152617cc3993747d268eb96 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 11 Feb 2008 18:07:33 +0000 Subject: [PATCH 030/114] - Add upstream patch (e62a641de17b172ffc4d3a803085c8afbfbec3d1) to have gitweb rss feeds point be commitdiffs instead of commit --- git-gitweb-commitdiff.patch | 34 ++++++++++++++++++++++++++++++++++ git.spec | 8 +++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 git-gitweb-commitdiff.patch diff --git a/git-gitweb-commitdiff.patch b/git-gitweb-commitdiff.patch new file mode 100644 index 0000000..0dc90e9 --- /dev/null +++ b/git-gitweb-commitdiff.patch @@ -0,0 +1,34 @@ +commit e62a641de17b172ffc4d3a803085c8afbfbec3d1 +Author: Florian La Roche +Date: Sun Feb 3 12:38:46 2008 +0100 + + gitweb: Make feed entries point to commitdiff view + + Change feeds entries (feeds items) from pointing (linking) to 'commit' + view to pointing to 'commitdiff' view. + + First, feed entries have whatchanged-like list of files which were + modified in a commit, so 'commitdiff' view more naturally reflects + feed entry (is more naturally alternate / extended version of a feed + item). Second, this way the patches are shown directly and code review + is done more easily via watching feeds. + + [jn: Rewritten commit message] + + Signed-off-by: Florian La Roche + Signed-off-by: Jakub Narebski + Signed-off-by: Junio C Hamano + +diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl +index ae2d057..8ef2735 100755 +--- a/gitweb/gitweb.perl ++++ b/gitweb/gitweb.perl +@@ -5565,7 +5565,7 @@ XML + or next; + + # print element (entry, item) +- my $co_url = href(-full=>1, action=>"commit", hash=>$commit); ++ my $co_url = href(-full=>1, action=>"commitdiff", hash=>$commit); + if ($format eq 'rss') { + print "\n" . + "" . esc_html($co{'title'}) . "\n" . diff --git a/git.spec b/git.spec index 1ef5018..a657db4 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -11,6 +11,7 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch +Patch1: git-gitweb-commitdiff.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -122,6 +123,7 @@ Requires: git-core = %{version}-%{release}, emacs-common %prep %setup -q %patch0 -p1 +%patch1 -p1 %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ @@ -244,6 +246,10 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Mon Feb 11 2008 Jeremy Katz - 1.5.4.1-2 +- Add upstream patch (e62a641de17b172ffc4d3a803085c8afbfbec3d1) to have + gitweb rss feeds point be commitdiffs instead of commit + * Sun Feb 10 2008 James Bowes 1.5.4.1-1 - git-1.5.4.1 From 1ba7c1adf13290d34aa790bcbd288364364eb08f Mon Sep 17 00:00:00 2001 From: jbowes Date: Sun, 17 Feb 2008 16:12:31 +0000 Subject: [PATCH 031/114] 1.5.4.2 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index f198e31..e9cc810 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.4.1.tar.gz +git-1.5.4.2.tar.gz diff --git a/git.spec b/git.spec index a657db4..3514cb5 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.4.1 -Release: 2%{?dist} +Version: 1.5.4.2 +Release: 1%{?dist} Summary: Git core and tools License: GPLv2 Group: Development/Tools @@ -246,6 +246,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Sun Feb 17 2008 James Bowes 1.5.4.2-1 +- git-1.5.4.2 + * Mon Feb 11 2008 Jeremy Katz - 1.5.4.1-2 - Add upstream patch (e62a641de17b172ffc4d3a803085c8afbfbec3d1) to have gitweb rss feeds point be commitdiffs instead of commit diff --git a/sources b/sources index 3b6a520..5857469 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9f43605fad1543597ed85dc7c7af86e git-1.5.4.1.tar.gz +32a1f5d94bb0cea5e987d854007b21a4 git-1.5.4.2.tar.gz From 0c4a11cad2c5d6c007147b1fcb84d4bccc6531ac Mon Sep 17 00:00:00 2001 From: jbowes Date: Sat, 23 Feb 2008 22:44:40 +0000 Subject: [PATCH 032/114] git 1.5.4.3 and include krh's change to rename git-core to git --- .cvsignore | 2 +- git.spec | 82 +++++++++++++++++++++++++++++++----------------------- sources | 2 +- 3 files changed, 49 insertions(+), 37 deletions(-) diff --git a/.cvsignore b/.cvsignore index e9cc810..924d482 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.4.2.tar.gz +git-1.5.4.3.tar.gz diff --git a/git.spec b/git.spec index 3514cb5..3a8f403 100644 --- a/git.spec +++ b/git.spec @@ -1,8 +1,8 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.4.2 +Version: 1.5.4.3 Release: 1%{?dist} -Summary: Git core and tools +Summary: Core git tools License: GPLv2 Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ @@ -11,38 +11,44 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch -Patch1: git-gitweb-commitdiff.patch +Patch1: git-gitweb-commitdiff.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: git-core = %{version}-%{release} -Requires: git-svn = %{version}-%{release} -Requires: git-cvs = %{version}-%{release} -Requires: git-arch = %{version}-%{release} -Requires: git-email = %{version}-%{release} -Requires: gitk = %{version}-%{release} -Requires: git-gui = %{version}-%{release} -Requires: perl-Git = %{version}-%{release} -Requires: emacs-git = %{version}-%{release} - +Requires: perl-Git = %{version}-%{release} +Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat, perl(Error) +Provides: git-core = %{version}-%{release} +Obsoletes: git-core <= 1.5.4.2 %description Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals. -This is a dummy package which brings in all subpackages. +The git rpm installs the core tools with minimal dependencies. To +install all git packages, including tools for integrating with other +SCMs, install the git-all meta-package. -%package core -Summary: Core git tools +%package all +Summary: Meta-package to pull in all git tools Group: Development/Tools -Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat, perl(Error) -%description core +Requires: git = %{version}-%{release} +Requires: git-svn = %{version}-%{release} +Requires: git-cvs = %{version}-%{release} +Requires: git-arch = %{version}-%{release} +Requires: git-email = %{version}-%{release} +Requires: gitk = %{version}-%{release} +Requires: git-gui = %{version}-%{release} +Requires: perl-Git = %{version}-%{release} +Requires: emacs-git = %{version}-%{release} +Obsoletes: git <= 1.5.4.2 + +%description all Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals. -These are the core tools with minimal dependencies. +This is a dummy package which brings in all subpackages. %package daemon Summary: Git protocol dæmon @@ -63,49 +69,49 @@ Simple web interface to track changes in git repositories %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools -Requires: git-core = %{version}-%{release}, subversion, perl(Term::ReadKey) +Requires: git = %{version}-%{release}, subversion, perl(Term::ReadKey) %description svn Git tools for importing Subversion repositories. %package cvs Summary: Git tools for importing CVS repositories Group: Development/Tools -Requires: git-core = %{version}-%{release}, cvs, cvsps +Requires: git = %{version}-%{release}, cvs, cvsps %description cvs Git tools for importing CVS repositories. %package arch Summary: Git tools for importing Arch repositories Group: Development/Tools -Requires: git-core = %{version}-%{release}, tla +Requires: git = %{version}-%{release}, tla %description arch Git tools for importing Arch repositories. %package email Summary: Git tools for sending email Group: Development/Tools -Requires: git-core = %{version}-%{release}, perl-Git = %{version}-%{release} +Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} %description email Git tools for sending email. %package gui Summary: Git GUI tool Group: Development/Tools -Requires: git-core = %{version}-%{release}, tk >= 8.4 +Requires: git = %{version}-%{release}, tk >= 8.4 %description gui Git GUI tool. %package -n gitk Summary: Git revision tree visualiser Group: Development/Tools -Requires: git-core = %{version}-%{release}, tk >= 8.4 +Requires: git = %{version}-%{release}, tk >= 8.4 %description -n gitk Git revision tree visualiser. %package -n perl-Git Summary: Perl interface to Git Group: Development/Libraries -Requires: git-core = %{version}-%{release}, perl(Error) +Requires: git = %{version}-%{release}, perl(Error) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) @@ -115,7 +121,7 @@ Perl interface to Git. %package -n emacs-git Summary: Git version control system support for Emacs Group: Applications/Editors -Requires: git-core = %{version}-%{release}, emacs-common +Requires: git = %{version}-%{release}, emacs-common %description -n emacs-git %{summary}. @@ -169,8 +175,12 @@ mkdir -p $RPM_BUILD_ROOT/srv/git %clean rm -rf $RPM_BUILD_ROOT -%files -# These are no files in the root package +%files -f bin-man-doc-files +%defattr(-,root,root) +%{_datadir}/git-core/ +%doc README COPYING Documentation/*.txt +%{!?_without_docs: %doc Documentation/*.html Documentation/howto} +%{!?_without_docs: %doc Documentation/technical} %files svn %defattr(-,root,root) @@ -205,7 +215,6 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/git-gui %{_bindir}/git-citool %{_datadir}/git-gui/ -# Not Yet... %{!?_without_docs: %{_mandir}/man1/git-gui.1*} %{!?_without_docs: %doc Documentation/git-gui.html} %{!?_without_docs: %{_mandir}/man1/git-citool.1*} @@ -227,11 +236,6 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/emacs/site-lisp/*git*.el* %{_datadir}/emacs/site-lisp/site-start.d/git-init.el -%files core -f bin-man-doc-files -%defattr(-,root,root) -%{_datadir}/git-core/ -%doc README COPYING Documentation/*.txt - %files daemon %defattr(-,root,root) %{_bindir}/git-daemon @@ -245,7 +249,15 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/*.html Documentation/howto} %{!?_without_docs: %doc Documentation/technical} +%files all +# No files for you! + %changelog +* Sat Feb 23 2008 James Bowes 1.5.4.3-1 +- git-1.5.4.3 +- Include Kristian Høgsberg's changes to rename git-core to + git and git to git-all. + * Sun Feb 17 2008 James Bowes 1.5.4.2-1 - git-1.5.4.2 diff --git a/sources b/sources index 5857469..45cae7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -32a1f5d94bb0cea5e987d854007b21a4 git-1.5.4.2.tar.gz +6311a711eb780b1fbae29e0fd28836bd git-1.5.4.3.tar.gz From ba45fbb45c77026b0079446a096fd1033befd43d Mon Sep 17 00:00:00 2001 From: Bernie Innocenti Date: Sun, 24 Feb 2008 14:57:54 +0000 Subject: [PATCH 033/114] - Do not silently overwrite /etc/httpd/conf.d/git.conf --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 3a8f403..9c44a19 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -245,7 +245,7 @@ rm -rf $RPM_BUILD_ROOT %files -n gitweb %defattr(-,root,root) /var/www/git/ -%{_sysconfdir}/httpd/conf.d/git.conf +%config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf %{!?_without_docs: %doc Documentation/*.html Documentation/howto} %{!?_without_docs: %doc Documentation/technical} @@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sun Feb 24 2008 Bernardo Innocenti 1.5.4.3-2 +- Do not silently overwrite /etc/httpd/conf.d/git.conf + * Sat Feb 23 2008 James Bowes 1.5.4.3-1 - git-1.5.4.3 - Include Kristian Høgsberg's changes to rename git-core to From eb64d17febfd507a4ca4562de8a6446ea6535227 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 3 Mar 2008 20:30:21 +0000 Subject: [PATCH 034/114] new perl --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 9c44a19..764dffe 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon Mar 3 2008 Tom "spot" Callaway 1.5.4.3-3 +- rebuild for new perl (again) + * Sun Feb 24 2008 Bernardo Innocenti 1.5.4.3-2 - Do not silently overwrite /etc/httpd/conf.d/git.conf From 364f1ec04b3879f2a2fce09b00ec4ebeb3a33abc Mon Sep 17 00:00:00 2001 From: jbowes Date: Thu, 13 Mar 2008 16:03:14 +0000 Subject: [PATCH 035/114] git 1.5.4.4 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 924d482..078e7a4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.4.3.tar.gz +git-1.5.4.4.tar.gz diff --git a/git.spec b/git.spec index 764dffe..6d08bd9 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.4.3 -Release: 3%{?dist} +Version: 1.5.4.4 +Release: 1%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Thu Mar 13 2008 James Bowes 1.5.4.4-1 +- git-1.5.4.4 + * Mon Mar 3 2008 Tom "spot" Callaway 1.5.4.3-3 - rebuild for new perl (again) diff --git a/sources b/sources index 45cae7f..1710ce1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6311a711eb780b1fbae29e0fd28836bd git-1.5.4.3.tar.gz +08816904bc7fd0b79a380da04ee787e0 git-1.5.4.4.tar.gz From 8e04882e3c34ad2689d673c566e6dbc2c350ea88 Mon Sep 17 00:00:00 2001 From: jbowes Date: Wed, 19 Mar 2008 13:07:11 +0000 Subject: [PATCH 036/114] Fix obsoletes version for updating from F8 --- git.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 6d08bd9..5d62442 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl-Git = %{version}-%{release} Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat, perl(Error) Provides: git-core = %{version}-%{release} -Obsoletes: git-core <= 1.5.4.2 +Obsoletes: git-core <= 1.5.4.3 %description Git is a fast, scalable, distributed revision control system with an @@ -41,7 +41,7 @@ Requires: gitk = %{version}-%{release} Requires: git-gui = %{version}-%{release} Requires: perl-Git = %{version}-%{release} Requires: emacs-git = %{version}-%{release} -Obsoletes: git <= 1.5.4.2 +Obsoletes: git <= 1.5.4.3 %description all Git is a fast, scalable, distributed revision control system with an @@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed Mar 19 2008 James Bowes 1.5.4.4-2 +- Obsolete git <= 1.5.4.3, to catch going from F8 to rawhide/F9 + * Thu Mar 13 2008 James Bowes 1.5.4.4-1 - git-1.5.4.4 From 758b1eb860c88ed1bd92c55e941c91aa6da9c773 Mon Sep 17 00:00:00 2001 From: jbowes Date: Wed, 26 Mar 2008 11:52:54 +0000 Subject: [PATCH 037/114] Assorted bug fixes: - Include the sample hooks from contrib/hooks as docs (bug 321151). - Install the bash completion script from contrib (bug 433255). - Include the html docs in the 'core' package again (bug 434271). --- git.spec | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/git.spec b/git.spec index 5d62442..bf778b9 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -172,15 +172,22 @@ rm -rf $RPM_BUILD_ROOT%{_mandir} %endif mkdir -p $RPM_BUILD_ROOT/srv/git +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d +install -m 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git + + %clean rm -rf $RPM_BUILD_ROOT + %files -f bin-man-doc-files %defattr(-,root,root) %{_datadir}/git-core/ -%doc README COPYING Documentation/*.txt -%{!?_without_docs: %doc Documentation/*.html Documentation/howto} -%{!?_without_docs: %doc Documentation/technical} +%doc README COPYING Documentation/*.txt contrib/hooks +%{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} +%{!?_without_docs: %doc Documentation/howto Documentation/technical} +%{_sysconfdir}/bash_completion.d/git + %files svn %defattr(-,root,root) @@ -246,13 +253,17 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) /var/www/git/ %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf -%{!?_without_docs: %doc Documentation/*.html Documentation/howto} -%{!?_without_docs: %doc Documentation/technical} + %files all # No files for you! %changelog +* Tue Mar 25 2008 James Bowes 1.5.4.4-3 +- Include the sample hooks from contrib/hooks as docs (bug 321151). +- Install the bash completion script from contrib (bug 433255). +- Include the html docs in the 'core' package again (bug 434271). + * Wed Mar 19 2008 James Bowes 1.5.4.4-2 - Obsolete git <= 1.5.4.3, to catch going from F8 to rawhide/F9 From 5730de22f2f181d934ad8dfeef4d1063e95944ad Mon Sep 17 00:00:00 2001 From: jbowes Date: Thu, 27 Mar 2008 00:06:43 +0000 Subject: [PATCH 038/114] Own the bash completion dir in case bash-completion isn't installed --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index bf778b9..1c17e01 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -186,7 +186,7 @@ rm -rf $RPM_BUILD_ROOT %doc README COPYING Documentation/*.txt contrib/hooks %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} -%{_sysconfdir}/bash_completion.d/git +%{_sysconfdir}/bash_completion.d %files svn @@ -259,6 +259,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed Mar 26 2008 James Bowes 1.5.4.4-4 +- Own /etc/bash_completion.d in case bash-completion isn't installed. + * Tue Mar 25 2008 James Bowes 1.5.4.4-3 - Include the sample hooks from contrib/hooks as docs (bug 321151). - Install the bash completion script from contrib (bug 433255). From c2080dd3aa0f1623b03674f5e0fb93ff70afffbf Mon Sep 17 00:00:00 2001 From: jbowes Date: Fri, 28 Mar 2008 13:47:49 +0000 Subject: [PATCH 039/114] update to 1.5.4.5 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 078e7a4..1458352 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.4.4.tar.gz +git-1.5.4.5.tar.gz diff --git a/git.spec b/git.spec index 1c17e01..ecafa1e 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.4.4 -Release: 4%{?dist} +Version: 1.5.4.5 +Release: 1%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -259,6 +259,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Mar 28 2008 James Bowes 1.5.4.5-1 +- git-1.5.4.5 + * Wed Mar 26 2008 James Bowes 1.5.4.4-4 - Own /etc/bash_completion.d in case bash-completion isn't installed. diff --git a/sources b/sources index 1710ce1..d8c9a79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -08816904bc7fd0b79a380da04ee787e0 git-1.5.4.4.tar.gz +9f83d18be41c88e5df6a2718c081520c git-1.5.4.5.tar.gz From 977b81323fe5bdbb0e30e80353c61d75ddefafe8 Mon Sep 17 00:00:00 2001 From: jbowes Date: Wed, 2 Apr 2008 12:24:12 +0000 Subject: [PATCH 040/114] Remove the commitdiff patch, it's upstream already --- git-gitweb-commitdiff.patch | 34 ---------------------------------- git.spec | 7 ++++--- 2 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 git-gitweb-commitdiff.patch diff --git a/git-gitweb-commitdiff.patch b/git-gitweb-commitdiff.patch deleted file mode 100644 index 0dc90e9..0000000 --- a/git-gitweb-commitdiff.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit e62a641de17b172ffc4d3a803085c8afbfbec3d1 -Author: Florian La Roche -Date: Sun Feb 3 12:38:46 2008 +0100 - - gitweb: Make feed entries point to commitdiff view - - Change feeds entries (feeds items) from pointing (linking) to 'commit' - view to pointing to 'commitdiff' view. - - First, feed entries have whatchanged-like list of files which were - modified in a commit, so 'commitdiff' view more naturally reflects - feed entry (is more naturally alternate / extended version of a feed - item). Second, this way the patches are shown directly and code review - is done more easily via watching feeds. - - [jn: Rewritten commit message] - - Signed-off-by: Florian La Roche - Signed-off-by: Jakub Narebski - Signed-off-by: Junio C Hamano - -diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl -index ae2d057..8ef2735 100755 ---- a/gitweb/gitweb.perl -+++ b/gitweb/gitweb.perl -@@ -5565,7 +5565,7 @@ XML - or next; - - # print element (entry, item) -- my $co_url = href(-full=>1, action=>"commit", hash=>$commit); -+ my $co_url = href(-full=>1, action=>"commitdiff", hash=>$commit); - if ($format eq 'rss') { - print "\n" . - "" . esc_html($co{'title'}) . "\n" . diff --git a/git.spec b/git.spec index ecafa1e..1d357df 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -11,7 +11,6 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch -Patch1: git-gitweb-commitdiff.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -129,7 +128,6 @@ Requires: git = %{version}-%{release}, emacs-common %prep %setup -q %patch0 -p1 -%patch1 -p1 %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ @@ -259,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed Apr 02 2008 James Bowes 1.5.4.5-2 +- Remove a patch that's already upstream. + * Fri Mar 28 2008 James Bowes 1.5.4.5-1 - git-1.5.4.5 From 4243f59168a0556d9ae900582ad76f6cafdc1dd8 Mon Sep 17 00:00:00 2001 From: jbowes Date: Sat, 5 Apr 2008 13:26:07 +0000 Subject: [PATCH 041/114] Remove the remaining requires on git-core --- git.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 1d357df..5fdf8fb 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -52,14 +52,14 @@ This is a dummy package which brings in all subpackages. %package daemon Summary: Git protocol dæmon Group: Development/Tools -Requires: git-core = %{version}-%{release} +Requires: git = %{version}-%{release} %description daemon The git dæmon for supporting git:// access to git repositories %package -n gitweb Summary: Simple web interface to git repositories Group: Development/Tools -Requires: git-core = %{version}-%{release} +Requires: git = %{version}-%{release} %description -n gitweb Simple web interface to track changes in git repositories @@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Apr 04 2008 James Bowes 1.5.4.5-3 +- Remove the last two requires on git-core. + * Wed Apr 02 2008 James Bowes 1.5.4.5-2 - Remove a patch that's already upstream. From 42eb2e04dc5b6ed2f6188674a52e25b1faf4d327 Mon Sep 17 00:00:00 2001 From: jbowes Date: Wed, 9 Apr 2008 14:19:55 +0000 Subject: [PATCH 042/114] git 1.5.5 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1458352..e058737 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.4.5.tar.gz +git-1.5.5.tar.gz diff --git a/git.spec b/git.spec index 5fdf8fb..fbb0378 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.4.5 -Release: 3%{?dist} +Version: 1.5.5 +Release: 1%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed Apr 09 2008 James Bowes 1.5.5-1 +- git-1.5.5 + * Fri Apr 04 2008 James Bowes 1.5.4.5-3 - Remove the last two requires on git-core. diff --git a/sources b/sources index d8c9a79..f37bdad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9f83d18be41c88e5df6a2718c081520c git-1.5.4.5.tar.gz +978e50ddefeeb2e0c55b3f1c7fca2e16 git-1.5.5.tar.gz From 0036192d72092fd3746cc00203b45dabbd9863ba Mon Sep 17 00:00:00 2001 From: jbowes Date: Tue, 22 Apr 2008 18:22:18 +0000 Subject: [PATCH 043/114] 1.5.5.1 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index e058737..cdf93b1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.5.tar.gz +git-1.5.5.1.tar.gz diff --git a/git.spec b/git.spec index fbb0378..62b54f0 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.5 +Version: 1.5.5.1 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon Apr 21 2008 James Bowes 1.5.5.1-1 +- git-1.5.5.1 + * Wed Apr 09 2008 James Bowes 1.5.5-1 - git-1.5.5 diff --git a/sources b/sources index f37bdad..c62e723 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -978e50ddefeeb2e0c55b3f1c7fca2e16 git-1.5.5.tar.gz +863df5545e3496d9f29688ab25b6a53d git-1.5.5.1.tar.gz From 47a8f73b270c10827c44253cdbc6e1698f2dd9b9 Mon Sep 17 00:00:00 2001 From: jbowes Date: Mon, 26 May 2008 10:40:50 +0000 Subject: [PATCH 044/114] git 1.5.5.2 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index cdf93b1..4e963f7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.5.1.tar.gz +git-1.5.5.2.tar.gz diff --git a/git.spec b/git.spec index 62b54f0..3bfd775 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.5.1 +Version: 1.5.5.2 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon May 26 2008 James Bowes 1.5.5.2-1 +- git-1.5.5.2 + * Mon Apr 21 2008 James Bowes 1.5.5.1-1 - git-1.5.5.1 diff --git a/sources b/sources index c62e723..7a14cff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -863df5545e3496d9f29688ab25b6a53d git-1.5.5.1.tar.gz +3ae18e7f6e23b698be03260ebdcd4f15 git-1.5.5.2.tar.gz From e2c8759419f7607d4a203843615099164ab968d5 Mon Sep 17 00:00:00 2001 From: jbowes Date: Wed, 28 May 2008 12:17:49 +0000 Subject: [PATCH 045/114] git 1.5.5.3 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4e963f7..2ad20d3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.5.2.tar.gz +git-1.5.5.3.tar.gz diff --git a/git.spec b/git.spec index 3bfd775..ad93010 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.5.2 +Version: 1.5.5.3 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed May 28 2008 James Bowes 1.5.5.3-1 +- git-1.5.5.3 + * Mon May 26 2008 James Bowes 1.5.5.2-1 - git-1.5.5.2 diff --git a/sources b/sources index 7a14cff..272fde3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3ae18e7f6e23b698be03260ebdcd4f15 git-1.5.5.2.tar.gz +fd7a2d4b25fc82ec9f9312e6d954f442 git-1.5.5.3.tar.gz From c894294501387303e709d1d6be814a696292ebdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Tue, 3 Jun 2008 12:40:38 +0000 Subject: [PATCH 046/114] - use tar.bz2 instead of tar.gz --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index ad93010..1412f64 100644 --- a/git.spec +++ b/git.spec @@ -1,12 +1,12 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ -Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz +Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd @@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Tue Jun 3 2008 Stepan Kasal 1.5.5.3-2 +- use tar.bz2 instead of tar.gz + * Wed May 28 2008 James Bowes 1.5.5.3-1 - git-1.5.5.3 From 32525d99788a357aeed5ec1f88e080d20b89705c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Tue, 3 Jun 2008 15:39:56 +0000 Subject: [PATCH 047/114] - use tar.bz2 instead of tar.gz --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2ad20d3..812fb30 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.5.3.tar.gz +git-1.5.5.3.tar.bz2 diff --git a/sources b/sources index 272fde3..593658f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd7a2d4b25fc82ec9f9312e6d954f442 git-1.5.5.3.tar.gz +022ce5772b900243ef5d289deb7a3667 git-1.5.5.3.tar.bz2 From a0598d9a30fa821d191acddf904b5da0d6081017 Mon Sep 17 00:00:00 2001 From: jbowes Date: Thu, 19 Jun 2008 12:38:47 +0000 Subject: [PATCH 048/114] update to 1.5.6 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 812fb30..60f3874 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.5.3.tar.bz2 +git-1.5.6.tar.bz2 diff --git a/git.spec b/git.spec index 1412f64..6fc6567 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.5.3 -Release: 2%{?dist} +Version: 1.5.6 +Release: 1%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Thu Jun 19 2008 James Bowes 1.5.6-1 +- git-1.5.6 + * Tue Jun 3 2008 Stepan Kasal 1.5.5.3-2 - use tar.bz2 instead of tar.gz diff --git a/sources b/sources index 593658f..5722e82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -022ce5772b900243ef5d289deb7a3667 git-1.5.5.3.tar.bz2 +76c4efaaa5470a5385e22d99349a97b3 git-1.5.6.tar.bz2 From ec200a81382a5483af3052af430cbb0a17fae078 Mon Sep 17 00:00:00 2001 From: jbowes Date: Thu, 24 Jul 2008 14:03:40 +0000 Subject: [PATCH 049/114] git-1.5.6.4 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 60f3874..2d8c288 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.6.tar.bz2 +git-1.5.6.4.tar.bz2 diff --git a/git.spec b/git.spec index 6fc6567..4ab0248 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.6 +Version: 1.5.6.4 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Thu Jul 24 2008 James Bowes 1.5.6-4 +- git-1.5.6.4 + * Thu Jun 19 2008 James Bowes 1.5.6-1 - git-1.5.6 diff --git a/sources b/sources index 5722e82..e38b97c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76c4efaaa5470a5385e22d99349a97b3 git-1.5.6.tar.bz2 +b5f248c71d32921ff0ff7e35f7770003 git-1.5.6.4.tar.bz2 From 95feff0f38aa10a6cce1cbff39a00fb907741997 Mon Sep 17 00:00:00 2001 From: jbowes Date: Thu, 28 Aug 2008 12:16:58 +0000 Subject: [PATCH 050/114] git 1.6.0.1 --- .cvsignore | 2 +- git.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2d8c288..e4b6d52 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.6.4.tar.bz2 +git-1.6.0.1.tar.bz2 diff --git a/git.spec b/git.spec index 4ab0248..fb66416 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.5.6.4 +Version: 1.6.0.1 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -132,6 +132,7 @@ Requires: git = %{version}-%{release}, emacs-common %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ ETC_GITCONFIG=/etc/gitconfig \ + gitexecdir=%{_bindir} \ prefix=%{_prefix} all %{!?_without_docs: doc} make -C contrib/emacs @@ -140,6 +141,7 @@ rm -rf $RPM_BUILD_ROOT make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ prefix=%{_prefix} mandir=%{_mandir} \ ETC_GITCONFIG=/etc/gitconfig \ + gitexecdir=%{_bindir} \ INSTALLDIRS=vendor install %{!?_without_docs: install-doc} make -C contrib/emacs install \ emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp @@ -257,6 +259,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Thu Aug 28 2008 James Bowes 1.6.0.1-1 +- git-1.6.0.1 + * Thu Jul 24 2008 James Bowes 1.5.6-4 - git-1.5.6.4 diff --git a/sources b/sources index e38b97c..ce81aef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5f248c71d32921ff0ff7e35f7770003 git-1.5.6.4.tar.bz2 +264701ebd9036ca2458358f01aa6c093 git-1.6.0.1.tar.bz2 From 5a18ae4d9107cde5545cc65abff605b8f0fd116d Mon Sep 17 00:00:00 2001 From: jwboyer Date: Wed, 22 Oct 2008 12:18:50 +0000 Subject: [PATCH 051/114] - git-1.6.0.3 - Drop curl requirement in favor of libcurl (bug 449388) - Add requires for SMTP-SSL perl module to make git-send-email work (bug 443615) --- .cvsignore | 2 +- git.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index e4b6d52..99abeff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.0.1.tar.bz2 +git-1.6.0.3.tar.bz2 diff --git a/git.spec b/git.spec index fb66416..43cdbc7 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.0.1 +Version: 1.6.0.3 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -11,11 +11,11 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch -BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl-Git = %{version}-%{release} -Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat, perl(Error) +Requires: zlib >= 1.2, rsync, libcurl, less, openssh-clients, expat, perl(Error) Provides: git-core = %{version}-%{release} Obsoletes: git-core <= 1.5.4.3 @@ -90,6 +90,7 @@ Git tools for importing Arch repositories. Summary: Git tools for sending email Group: Development/Tools Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} +Requires: perl(Net::SMTP::SSL) %description email Git tools for sending email. @@ -259,6 +260,11 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed Oct 22 2008 Josh Boyer 1.6.0.3-1 +- git-1.6.0.3 +- Drop curl requirement in favor of libcurl (bug 449388) +- Add requires for SMTP-SSL perl module to make git-send-email work (bug 443615) + * Thu Aug 28 2008 James Bowes 1.6.0.1-1 - git-1.6.0.1 diff --git a/sources b/sources index ce81aef..f2fb1e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -264701ebd9036ca2458358f01aa6c093 git-1.6.0.1.tar.bz2 +d7178b0b0eaaa07538149bb231902796 git-1.6.0.3.tar.bz2 From 985c13cd2da858cb7d1688fa1107725049e7a194 Mon Sep 17 00:00:00 2001 From: jwboyer Date: Fri, 14 Nov 2008 13:54:36 +0000 Subject: [PATCH 052/114] - git-1.6.0.4 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 99abeff..38b8d8f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.0.3.tar.bz2 +git-1.6.0.4.tar.bz2 diff --git a/git.spec b/git.spec index 43cdbc7..839b452 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.0.3 +Version: 1.6.0.4 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -260,6 +260,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Nov 14 2008 Josh Boyer 1.6.0.4-1 +- git-1.6.0.4 + * Wed Oct 22 2008 Josh Boyer 1.6.0.3-1 - git-1.6.0.3 - Drop curl requirement in favor of libcurl (bug 449388) diff --git a/sources b/sources index f2fb1e9..6391dc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7178b0b0eaaa07538149bb231902796 git-1.6.0.3.tar.bz2 +ed8c4fa007a44d51b646865c35461ce8 git-1.6.0.4.tar.bz2 From 514ce7172ba7829c338c3bae6e14af2df5741320 Mon Sep 17 00:00:00 2001 From: jwboyer Date: Thu, 11 Dec 2008 16:47:39 +0000 Subject: [PATCH 053/114] - git-1.6.0.5 --- .cvsignore | 2 +- git.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 38b8d8f..69ce87c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.0.4.tar.bz2 +git-1.6.0.5.tar.bz2 diff --git a/git.spec b/git.spec index 839b452..e741afa 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.0.4 +Version: 1.6.0.5 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -171,7 +171,7 @@ find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' %else rm -rf $RPM_BUILD_ROOT%{_mandir} %endif -mkdir -p $RPM_BUILD_ROOT/srv/git +mkdir -p $RPM_BUILD_ROOT/var/lib/git-daemon mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d install -m 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git @@ -248,7 +248,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_bindir}/git-daemon %config(noreplace)%{_sysconfdir}/xinetd.d/git -/srv/git +/var/lib/git-daemon %files -n gitweb %defattr(-,root,root) @@ -260,6 +260,12 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Thu Dec 11 2008 Josh Boyer 1.6.0.5-1 +- git-1.6.0.5 + +* Mon Nov 17 2008 Seth Vidal +- switch from /srv/git to /var/lib/git-daemon for packaging rules compliance + * Fri Nov 14 2008 Josh Boyer 1.6.0.4-1 - git-1.6.0.4 diff --git a/sources b/sources index 6391dc7..69eade4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ed8c4fa007a44d51b646865c35461ce8 git-1.6.0.4.tar.bz2 +899172ebeac65f7a09a8e204d4f87d8c git-1.6.0.5.tar.bz2 From 413c55e528463fab93f6682a5d38f968c6fad48d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 20 Dec 2008 17:26:02 +0000 Subject: [PATCH 054/114] - git-1.6.0.6 - Fixes a local privilege escalation bug in gitweb (http://article.gmane.org/gmane.comp.version-control.git/103624) - Add gitk Requires to git-gui (bug 476308) --- .cvsignore | 2 +- git.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 69ce87c..3db4196 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.0.5.tar.bz2 +git-1.6.0.6.tar.bz2 diff --git a/git.spec b/git.spec index e741afa..040d620 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.0.5 +Version: 1.6.0.6 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -98,6 +98,7 @@ Git tools for sending email. Summary: Git GUI tool Group: Development/Tools Requires: git = %{version}-%{release}, tk >= 8.4 +Requires: gitk = %{version}-%{release} %description gui Git GUI tool. @@ -260,6 +261,12 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sat Dec 20 2008 Todd Zullinger 1.6.0.6-1 +- git-1.6.0.6 +- Fixes a local privilege escalation bug in gitweb + (http://article.gmane.org/gmane.comp.version-control.git/103624) +- Add gitk Requires to git-gui (bug 476308) + * Thu Dec 11 2008 Josh Boyer 1.6.0.5-1 - git-1.6.0.5 diff --git a/sources b/sources index 69eade4..383d999 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -899172ebeac65f7a09a8e204d4f87d8c git-1.6.0.5.tar.bz2 +b5be9b34b441cb57f92086bfaf59f255 git-1.6.0.6.tar.bz2 From f1f8cabac8c7dd4890995fd94a4d91440ad992ad Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 3 Jan 2009 16:36:21 +0000 Subject: [PATCH 055/114] - Install git-* commands in %{_libexecdir}/git-core, the upstream default - Remove libcurl from Requires, rpm will pick this up automatically - Consolidate build/install options in %make_git (Roland McGrath) - Include DirectoryIndex in gitweb httpd-config (bug 471692) - Define DOCBOOK_XSL_172 to fix minor manpage issues - Rename %{_var}/lib/git-daemon to %{_var}/lib/git - Preserve timestamps on installed files - Quiet some rpmlint complaints - Use macros more consistently --- .cvsignore | 2 +- git.conf.httpd | 1 + git.spec | 167 ++++++++++++++++++++++++++++--------------------- git.xinetd | 4 +- sources | 2 +- 5 files changed, 100 insertions(+), 76 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3db4196..a78fd3d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.0.6.tar.bz2 +git-1.6.1.tar.bz2 diff --git a/git.conf.httpd b/git.conf.httpd index 3611943..4f4eac7 100644 --- a/git.conf.httpd +++ b/git.conf.httpd @@ -3,4 +3,5 @@ Alias /git /var/www/git Options +ExecCGI AddHandler cgi-script .cgi + DirectoryIndex gitweb.cgi diff --git a/git.spec b/git.spec index 040d620..599d4e0 100644 --- a/git.spec +++ b/git.spec @@ -1,23 +1,23 @@ # Pass --without docs to rpmbuild if you don't want the documentation -Name: git -Version: 1.6.0.6 -Release: 1%{?dist} -Summary: Core git tools -License: GPLv2 -Group: Development/Tools -URL: http://kernel.org/pub/software/scm/git/ -Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 -Source1: git-init.el -Source2: git.xinetd -Source3: git.conf.httpd -Patch0: git-1.5-gitweb-home-link.patch -BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Name: git +Version: 1.6.1 +Release: 1%{?dist} +Summary: Core git tools +License: GPLv2 +Group: Development/Tools +URL: http://kernel.org/pub/software/scm/git/ +Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 +Source1: git-init.el +Source2: git.xinetd +Source3: git.conf.httpd +Patch0: git-1.5-gitweb-home-link.patch +BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: perl-Git = %{version}-%{release} -Requires: zlib >= 1.2, rsync, libcurl, less, openssh-clients, expat, perl(Error) -Provides: git-core = %{version}-%{release} -Obsoletes: git-core <= 1.5.4.3 +Requires: perl-Git = %{version}-%{release} +Requires: zlib >= 1.2, rsync, less, openssh-clients, expat, perl(Error) +Provides: git-core = %{version}-%{release} +Obsoletes: git-core <= 1.5.4.3 %description Git is a fast, scalable, distributed revision control system with an @@ -29,18 +29,18 @@ install all git packages, including tools for integrating with other SCMs, install the git-all meta-package. %package all -Summary: Meta-package to pull in all git tools -Group: Development/Tools -Requires: git = %{version}-%{release} -Requires: git-svn = %{version}-%{release} -Requires: git-cvs = %{version}-%{release} -Requires: git-arch = %{version}-%{release} -Requires: git-email = %{version}-%{release} -Requires: gitk = %{version}-%{release} -Requires: git-gui = %{version}-%{release} -Requires: perl-Git = %{version}-%{release} -Requires: emacs-git = %{version}-%{release} -Obsoletes: git <= 1.5.4.3 +Summary: Meta-package to pull in all git tools +Group: Development/Tools +Requires: git = %{version}-%{release} +Requires: git-svn = %{version}-%{release} +Requires: git-cvs = %{version}-%{release} +Requires: git-arch = %{version}-%{release} +Requires: git-email = %{version}-%{release} +Requires: gitk = %{version}-%{release} +Requires: git-gui = %{version}-%{release} +Requires: perl-Git = %{version}-%{release} +Requires: emacs-git = %{version}-%{release} +Obsoletes: git <= 1.5.4.3 %description all Git is a fast, scalable, distributed revision control system with an @@ -50,9 +50,9 @@ and full access to internals. This is a dummy package which brings in all subpackages. %package daemon -Summary: Git protocol dæmon -Group: Development/Tools -Requires: git = %{version}-%{release} +Summary: Git protocol dæmon +Group: Development/Tools +Requires: git = %{version}-%{release} %description daemon The git dæmon for supporting git:// access to git repositories @@ -89,8 +89,8 @@ Git tools for importing Arch repositories. %package email Summary: Git tools for sending email Group: Development/Tools -Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} -Requires: perl(Net::SMTP::SSL) +Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} +Requires: perl(Net::SMTP::SSL) %description email Git tools for sending email. @@ -120,9 +120,9 @@ BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) Perl interface to Git. %package -n emacs-git -Summary: Git version control system support for Emacs -Group: Applications/Editors -Requires: git = %{version}-%{release}, emacs-common +Summary: Git version control system support for Emacs +Group: Applications/Editors +Requires: git = %{version}-%{release}, emacs-common %description -n emacs-git %{summary}. @@ -131,51 +131,61 @@ Requires: git = %{version}-%{release}, emacs-common %setup -q %patch0 -p1 +# Use these same options for every invocation of 'make'. +# Otherwise it will rebuild in %%install due to flags changes. +%define make_git \ +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \\\ + ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ + DESTDIR=$RPM_BUILD_ROOT \\\ + DOCBOOK_XSL_172=YesPlease \\\ + INSTALL="install -p" \\\ + INSTALLDIRS=vendor \\\ + prefix=%{_prefix} + %build -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ - ETC_GITCONFIG=/etc/gitconfig \ - gitexecdir=%{_bindir} \ - prefix=%{_prefix} all %{!?_without_docs: doc} +%{make_git} all %{!?_without_docs: doc} make -C contrib/emacs %install rm -rf $RPM_BUILD_ROOT -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ - prefix=%{_prefix} mandir=%{_mandir} \ - ETC_GITCONFIG=/etc/gitconfig \ - gitexecdir=%{_bindir} \ - INSTALLDIRS=vendor install %{!?_without_docs: install-doc} +%{make_git} install %{!?_without_docs: install-doc} make -C contrib/emacs install \ - emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp + emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do - install -pm 644 contrib/emacs/$(basename $elc .elc).el \ - $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp + install -pm 644 contrib/emacs/$(basename $elc .elc).el \ + $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp done install -Dpm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/git-init.el -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d -install -m 644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/git -mkdir -p $RPM_BUILD_ROOT/var/www/git -install -m 644 -t $RPM_BUILD_ROOT/var/www/git gitweb/*.png gitweb/*.css -install -m 755 -t $RPM_BUILD_ROOT/var/www/git gitweb/gitweb.cgi + $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/git-init.el +mkdir -p $RPM_BUILD_ROOT%{_var}/www/git +install -pm 644 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/*.png gitweb/*.css +install -pm 755 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/gitweb.cgi mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d -install -m 0644 %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf +install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf $RPM_BUILD_ROOT%{_mandir} %endif -mkdir -p $RPM_BUILD_ROOT/var/lib/git-daemon + +mkdir -p $RPM_BUILD_ROOT%{_var}/lib/git +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d +install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/git mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d -install -m 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git +install -pm 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git + +# quiet some rpmlint complaints +chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/git-core/* +rm -f Documentation/technical/.gitignore +chmod a-x Documentation/technical/api-index.sh %clean @@ -185,6 +195,7 @@ rm -rf $RPM_BUILD_ROOT %files -f bin-man-doc-files %defattr(-,root,root) %{_datadir}/git-core/ +%dir %{_libexecdir}/git-core/ %doc README COPYING Documentation/*.txt contrib/hooks %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} @@ -193,7 +204,7 @@ rm -rf $RPM_BUILD_ROOT %files svn %defattr(-,root,root) -%{_bindir}/*svn* +%{_libexecdir}/git-core/*svn* %doc Documentation/*svn*.txt %{!?_without_docs: %{_mandir}/man1/*svn*.1*} %{!?_without_docs: %doc Documentation/*svn*.html } @@ -201,28 +212,29 @@ rm -rf $RPM_BUILD_ROOT %files cvs %defattr(-,root,root) %doc Documentation/*git-cvs*.txt -%{_bindir}/*cvs* +%{_bindir}/git-cvsserver +%{_libexecdir}/git-core/*cvs* %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %doc Documentation/*git-cvs*.html } %files arch %defattr(-,root,root) %doc Documentation/git-archimport.txt -%{_bindir}/git-archimport +%{_libexecdir}/git-core/git-archimport %{!?_without_docs: %{_mandir}/man1/git-archimport.1*} %{!?_without_docs: %doc Documentation/git-archimport.html } %files email %defattr(-,root,root) %doc Documentation/*email*.txt -%{_bindir}/*email* +%{_libexecdir}/git-core/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } %files gui %defattr(-,root,root) -%{_bindir}/git-gui -%{_bindir}/git-citool +%{_libexecdir}/git-core/git-gui* +%{_libexecdir}/git-core/git-citool %{_datadir}/git-gui/ %{!?_without_docs: %{_mandir}/man1/git-gui.1*} %{!?_without_docs: %doc Documentation/git-gui.html} @@ -247,13 +259,13 @@ rm -rf $RPM_BUILD_ROOT %files daemon %defattr(-,root,root) -%{_bindir}/git-daemon +%{_libexecdir}/git-core/git-daemon %config(noreplace)%{_sysconfdir}/xinetd.d/git -/var/lib/git-daemon +%{_var}/lib/git %files -n gitweb %defattr(-,root,root) -/var/www/git/ +%{_var}/www/git/ %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf @@ -261,6 +273,17 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sat Jan 03 2009 Todd Zullinger 1.6.1-1 +- Install git-* commands in %%{_libexecdir}/git-core, the upstream default +- Remove libcurl from Requires, rpm will pick this up automatically +- Consolidate build/install options in %%make_git (Roland McGrath) +- Include DirectoryIndex in gitweb httpd-config (bug 471692) +- Define DOCBOOK_XSL_172 to fix minor manpage issues +- Rename %%{_var}/lib/git-daemon to %%{_var}/lib/git +- Preserve timestamps on installed files +- Quiet some rpmlint complaints +- Use macros more consistently + * Sat Dec 20 2008 Todd Zullinger 1.6.0.6-1 - git-1.6.0.6 - Fixes a local privilege escalation bug in gitweb @@ -514,7 +537,7 @@ rm -rf $RPM_BUILD_ROOT * Tue Jan 10 2006 Chris Wright 1.1.0-1 - Update to latest git-1.1.0 (drop git-email for now) - Now creates multiple packages: -- git-core, git-svn, git-cvs, git-arch, gitk +- git-core, git-svn, git-cvs, git-arch, gitk * Mon Nov 14 2005 H. Peter Anvin 0.99.9j-1 - Change subpackage names to git- instead of git-core- @@ -551,7 +574,7 @@ rm -rf $RPM_BUILD_ROOT * Wed Aug 17 2005 Tom "spot" Callaway 0.99.4-3 - use dist tag to differentiate between branches - use rpm optflags by default (patch0) -- own %{_datadir}/git-core/ +- own %%{_datadir}/git-core/ * Mon Aug 15 2005 Chris Wright - update spec file to fix Buildroot, Requires, and drop Vendor diff --git a/git.xinetd b/git.xinetd index dcfae91..52365ce 100644 --- a/git.xinetd +++ b/git.xinetd @@ -8,8 +8,8 @@ service git socket_type = stream wait = no user = nobody - server = /usr/bin/git-daemon - server_args = --base-path=/srv/git --export-all --user-path=public_git --syslog --inetd --verbose + server = /usr/bin/git + server_args = daemon --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose log_on_failure += USERID # xinetd doesn't do this by default. bug #195265 flags = IPv6 diff --git a/sources b/sources index 383d999..004c7dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5be9b34b441cb57f92086bfaf59f255 git-1.6.0.6.tar.bz2 +66265d85593473b23290232b9dccef77 git-1.6.1.tar.bz2 From 3ff74b9f170c983cf520436756fa779c4fabf4d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Fri, 16 Jan 2009 15:16:36 +0000 Subject: [PATCH 056/114] - rebuild with new openssl --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 599d4e0..6919ba9 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -273,6 +273,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Jan 16 2009 Tomas Mraz 1.6.1-2 +- rebuild with new openssl + * Sat Jan 03 2009 Todd Zullinger 1.6.1-1 - Install git-* commands in %%{_libexecdir}/git-core, the upstream default - Remove libcurl from Requires, rpm will pick this up automatically From c97202cde7b9a9e6049d712131176779718b3e57 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 27 Jan 2009 01:25:02 +0000 Subject: [PATCH 057/114] Update to git-1.6.1.1 Also, make the compile more verbose. --- .cvsignore | 2 +- git.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index a78fd3d..f3e021c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.1.tar.bz2 +git-1.6.1.1.tar.bz2 diff --git a/git.spec b/git.spec index 6919ba9..44c02bf 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.1 -Release: 2%{?dist} +Version: 1.6.1.1 +Release: 1%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -134,7 +134,7 @@ Requires: git = %{version}-%{release}, emacs-common # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. %define make_git \ -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \\\ +make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ DESTDIR=$RPM_BUILD_ROOT \\\ DOCBOOK_XSL_172=YesPlease \\\ @@ -273,6 +273,10 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon Jan 26 2009 Todd Zullinger 1.6.1.1-1 +- git-1.6.1.1 +- Make compile more verbose + * Fri Jan 16 2009 Tomas Mraz 1.6.1-2 - rebuild with new openssl diff --git a/sources b/sources index 004c7dd..4c1352f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -66265d85593473b23290232b9dccef77 git-1.6.1.tar.bz2 +d2b6925cb03e1e33911fdf9392946747 git-1.6.1.1.tar.bz2 From 3bdf7d67a6ed67f511eb60eab1381f83bc10d62e Mon Sep 17 00:00:00 2001 From: jwboyer Date: Thu, 29 Jan 2009 13:10:58 +0000 Subject: [PATCH 058/114] - git-1.6.1.2 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index f3e021c..428e000 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.1.1.tar.bz2 +git-1.6.1.2.tar.bz2 diff --git a/git.spec b/git.spec index 44c02bf..8911467 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.1.1 +Version: 1.6.1.2 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -273,6 +273,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Thu Jan 29 2009 Josh Boyer 1.6.1.2-1 +- git-1.6.1.2 + * Mon Jan 26 2009 Todd Zullinger 1.6.1.1-1 - git-1.6.1.1 - Make compile more verbose diff --git a/sources b/sources index 4c1352f..c22d282 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d2b6925cb03e1e33911fdf9392946747 git-1.6.1.1.tar.bz2 +72a9d88932190ff3523678eec88844ae git-1.6.1.2.tar.bz2 From a72ee4cc9ceacf85e3cc583250bc90e545776647 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 9 Feb 2009 06:39:19 +0000 Subject: [PATCH 059/114] Update to git-1.6.1.3 - Set htmldir so "git help -w " works - Patch git-web--browse to not use "/sbin/start" to browse - Include git-daemon documentation in the git-daemon package --- .cvsignore | 2 +- git.spec | 19 ++++++++++++++++--- sources | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 428e000..486f016 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.1.2.tar.bz2 +git-1.6.1.3.tar.bz2 diff --git a/git.spec b/git.spec index 8911467..83d1a79 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.1.2 +Version: 1.6.1.3 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -11,6 +11,8 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch +# Submitted upstream on 2009-02-08, tmz +Patch1: 0001-git-web-browse-Fix-check-for-bin-start.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -130,6 +132,7 @@ Requires: git = %{version}-%{release}, emacs-common %prep %setup -q %patch0 -p1 +%patch1 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -140,6 +143,7 @@ make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ DOCBOOK_XSL_172=YesPlease \\\ INSTALL="install -p" \\\ INSTALLDIRS=vendor \\\ + htmldir=%{_docdir}/%{name}-%{version} \\\ prefix=%{_prefix} %build @@ -170,7 +174,7 @@ find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' (find $RPM_BUILD_ROOT{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %else rm -rf $RPM_BUILD_ROOT%{_mandir} %endif @@ -259,9 +263,12 @@ rm -rf $RPM_BUILD_ROOT %files daemon %defattr(-,root,root) -%{_libexecdir}/git-core/git-daemon +%doc Documentation/*daemon*.txt %config(noreplace)%{_sysconfdir}/xinetd.d/git +%{_libexecdir}/git-core/git-daemon %{_var}/lib/git +%{!?_without_docs: %{_mandir}/man1/*daemon*.1*} +%{!?_without_docs: %doc Documentation/*daemon*.html} %files -n gitweb %defattr(-,root,root) @@ -273,6 +280,12 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon Feb 09 2009 Todd Zullinger 1.6.1.3-1 +- git-1.6.1.3 +- Set htmldir so "git help -w " works +- Patch git-web--browse to not use "/sbin/start" to browse +- Include git-daemon documentation in the git-daemon package + * Thu Jan 29 2009 Josh Boyer 1.6.1.2-1 - git-1.6.1.2 diff --git a/sources b/sources index c22d282..1fc3d6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -72a9d88932190ff3523678eec88844ae git-1.6.1.2.tar.bz2 +e31ea5ce9b076f5745056f01465e9602 git-1.6.1.3.tar.bz2 From 59f9f439edbbe21c76316eb21dd9edd04b3c0c03 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 9 Feb 2009 06:40:44 +0000 Subject: [PATCH 060/114] Add git-web--browse patch --- ...t-web-browse-Fix-check-for-bin-start.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 0001-git-web-browse-Fix-check-for-bin-start.patch diff --git a/0001-git-web-browse-Fix-check-for-bin-start.patch b/0001-git-web-browse-Fix-check-for-bin-start.patch new file mode 100644 index 0000000..70a8487 --- /dev/null +++ b/0001-git-web-browse-Fix-check-for-bin-start.patch @@ -0,0 +1,33 @@ +From e44161a223e7ec2cfb1f1b71399b995626c2d208 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Todd Zullinger +Date: Sun, 8 Feb 2009 14:04:20 -0500 +Subject: [PATCH 1/2] git-web--browse: Fix check for /bin/start + +The previous check in git-web--browse for /bin/start used test -n +/bin/start, which was always true. This lead to "start" being tried +first in the browser list. On systems with upstart installed, "start" +exists and might be in the PATH, but it makes a poor choice for a web +browser. Instead, test that /bin/start exists and is executable. + +Signed-off-by: Todd Zullinger +--- + git-web--browse.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/git-web--browse.sh b/git-web--browse.sh +index 78d236b..7ed0fad 100755 +--- a/git-web--browse.sh ++++ b/git-web--browse.sh +@@ -115,7 +115,7 @@ if test -z "$browser" ; then + browser_candidates="open $browser_candidates" + fi + # /bin/start indicates MinGW +- if test -n /bin/start; then ++ if test -x /bin/start; then + browser_candidates="start $browser_candidates" + fi + +-- +1.6.1.3 + From 96ee310620a0cecf5bdbe29bfc124639ef0a2a66 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 23 Feb 2009 19:58:18 +0000 Subject: [PATCH 061/114] Some git's subpackages should be noarch. We'll do that and rebuild manually. --- noautobuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 noautobuild diff --git a/noautobuild b/noautobuild new file mode 100644 index 0000000..716a23a --- /dev/null +++ b/noautobuild @@ -0,0 +1 @@ +Some git's subpackages should be noarch. We'll do that and rebuild manually. From 33cd3a66841f598fbb3f6354bd459610467f0623 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 25 Feb 2009 02:22:19 +0000 Subject: [PATCH 062/114] - Require perl(Authen::SASL) in git-email (bug 483062) - Build many of the subpackages as noarch - Update URL field --- git.spec | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index 83d1a79..99e025d 100644 --- a/git.spec +++ b/git.spec @@ -1,17 +1,17 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.6.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools -URL: http://kernel.org/pub/software/scm/git/ +URL: http://git-scm.com/ Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch -# Submitted upstream on 2009-02-08, tmz +# Included upstream as f6b98e4, tmz Patch1: 0001-git-web-browse-Fix-check-for-bin-start.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -33,6 +33,7 @@ SCMs, install the git-all meta-package. %package all Summary: Meta-package to pull in all git tools Group: Development/Tools +BuildArch: noarch Requires: git = %{version}-%{release} Requires: git-svn = %{version}-%{release} Requires: git-cvs = %{version}-%{release} @@ -61,6 +62,7 @@ The git dæmon for supporting git:// access to git repositories %package -n gitweb Summary: Simple web interface to git repositories Group: Development/Tools +BuildArch: noarch Requires: git = %{version}-%{release} %description -n gitweb @@ -70,6 +72,7 @@ Simple web interface to track changes in git repositories %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools +BuildArch: noarch Requires: git = %{version}-%{release}, subversion, perl(Term::ReadKey) %description svn Git tools for importing Subversion repositories. @@ -77,6 +80,7 @@ Git tools for importing Subversion repositories. %package cvs Summary: Git tools for importing CVS repositories Group: Development/Tools +BuildArch: noarch Requires: git = %{version}-%{release}, cvs, cvsps %description cvs Git tools for importing CVS repositories. @@ -84,6 +88,7 @@ Git tools for importing CVS repositories. %package arch Summary: Git tools for importing Arch repositories Group: Development/Tools +BuildArch: noarch Requires: git = %{version}-%{release}, tla %description arch Git tools for importing Arch repositories. @@ -91,14 +96,16 @@ Git tools for importing Arch repositories. %package email Summary: Git tools for sending email Group: Development/Tools +BuildArch: noarch Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} -Requires: perl(Net::SMTP::SSL) +Requires: perl(Net::SMTP::SSL), perl(Authen::SASL) %description email Git tools for sending email. %package gui Summary: Git GUI tool Group: Development/Tools +BuildArch: noarch Requires: git = %{version}-%{release}, tk >= 8.4 Requires: gitk = %{version}-%{release} %description gui @@ -107,6 +114,7 @@ Git GUI tool. %package -n gitk Summary: Git revision tree visualiser Group: Development/Tools +BuildArch: noarch Requires: git = %{version}-%{release}, tk >= 8.4 %description -n gitk Git revision tree visualiser. @@ -114,6 +122,7 @@ Git revision tree visualiser. %package -n perl-Git Summary: Perl interface to Git Group: Development/Libraries +BuildArch: noarch Requires: git = %{version}-%{release}, perl(Error) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) @@ -124,6 +133,7 @@ Perl interface to Git. %package -n emacs-git Summary: Git version control system support for Emacs Group: Applications/Editors +BuildArch: noarch Requires: git = %{version}-%{release}, emacs-common %description -n emacs-git @@ -280,6 +290,11 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Tue Feb 24 2009 Todd Zullinger - 1.6.1.3-2 +- Require perl(Authen::SASL) in git-email (bug 483062) +- Build many of the subpackages as noarch +- Update URL field + * Mon Feb 09 2009 Todd Zullinger 1.6.1.3-1 - git-1.6.1.3 - Set htmldir so "git help -w " works From 33e67f8a54e9b7884ef212c8072ca944cfd5aaf9 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 3 Mar 2009 13:35:13 +0000 Subject: [PATCH 063/114] Remove unneeded noautobuild file now that the F11 mass rebuild is done --- noautobuild | 1 - 1 file changed, 1 deletion(-) delete mode 100644 noautobuild diff --git a/noautobuild b/noautobuild deleted file mode 100644 index 716a23a..0000000 --- a/noautobuild +++ /dev/null @@ -1 +0,0 @@ -Some git's subpackages should be noarch. We'll do that and rebuild manually. From 3fb48f5afaa275d50e3bfdeb0db126bb67ba1923 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 9 Mar 2009 20:36:41 +0000 Subject: [PATCH 064/114] Update to git-1.6.2 - Include contrib/emacs/README in emacs subpackage - Drop upstreamed git-web--browse patch --- .cvsignore | 2 +- ...t-web-browse-Fix-check-for-bin-start.patch | 33 ------------------- git.spec | 13 +++++--- sources | 2 +- 4 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 0001-git-web-browse-Fix-check-for-bin-start.patch diff --git a/.cvsignore b/.cvsignore index 486f016..e8c0c3f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.1.3.tar.bz2 +git-1.6.2.tar.bz2 diff --git a/0001-git-web-browse-Fix-check-for-bin-start.patch b/0001-git-web-browse-Fix-check-for-bin-start.patch deleted file mode 100644 index 70a8487..0000000 --- a/0001-git-web-browse-Fix-check-for-bin-start.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e44161a223e7ec2cfb1f1b71399b995626c2d208 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Todd Zullinger -Date: Sun, 8 Feb 2009 14:04:20 -0500 -Subject: [PATCH 1/2] git-web--browse: Fix check for /bin/start - -The previous check in git-web--browse for /bin/start used test -n -/bin/start, which was always true. This lead to "start" being tried -first in the browser list. On systems with upstart installed, "start" -exists and might be in the PATH, but it makes a poor choice for a web -browser. Instead, test that /bin/start exists and is executable. - -Signed-off-by: Todd Zullinger ---- - git-web--browse.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/git-web--browse.sh b/git-web--browse.sh -index 78d236b..7ed0fad 100755 ---- a/git-web--browse.sh -+++ b/git-web--browse.sh -@@ -115,7 +115,7 @@ if test -z "$browser" ; then - browser_candidates="open $browser_candidates" - fi - # /bin/start indicates MinGW -- if test -n /bin/start; then -+ if test -x /bin/start; then - browser_candidates="start $browser_candidates" - fi - --- -1.6.1.3 - diff --git a/git.spec b/git.spec index 99e025d..90f9bd2 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.1.3 -Release: 2%{?dist} +Version: 1.6.2 +Release: 1%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -11,8 +11,6 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch -# Included upstream as f6b98e4, tmz -Patch1: 0001-git-web-browse-Fix-check-for-bin-start.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -142,7 +140,6 @@ Requires: git = %{version}-%{release}, emacs-common %prep %setup -q %patch0 -p1 -%patch1 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -268,6 +265,7 @@ rm -rf $RPM_BUILD_ROOT %files -n emacs-git %defattr(-,root,root) +%doc contrib/emacs/README %{_datadir}/emacs/site-lisp/*git*.el* %{_datadir}/emacs/site-lisp/site-start.d/git-init.el @@ -290,6 +288,11 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon Mar 09 2009 Todd Zullinger - 1.6.2-1 +- git-1.6.2 +- Include contrib/emacs/README in emacs subpackage +- Drop upstreamed git-web--browse patch + * Tue Feb 24 2009 Todd Zullinger - 1.6.1.3-2 - Require perl(Authen::SASL) in git-email (bug 483062) - Build many of the subpackages as noarch diff --git a/sources b/sources index 1fc3d6c..06f7e08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e31ea5ce9b076f5745056f01465e9602 git-1.6.1.3.tar.bz2 +12c7d874e17c6e111697b1714b5f4319 git-1.6.2.tar.bz2 From ff79f533a220d7bfb66b33517209edd82798b264 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 4 Apr 2009 20:47:17 +0000 Subject: [PATCH 065/114] Update to git-1.6.2.2 - Include contrib/ dir in %doc (bug 492490) - Don't set DOCBOOK_XSL_172, fix the '\&.ft' with sed (bug 485161) - Ignore Branches output from cvsps-2.2b1 (bug 490602) - Remove shebang from bash-completion script - Include README in gitweb subpackage --- .cvsignore | 2 +- ...t-Ignore-cvsps-2.2b1-Branches-output.patch | 26 +++++++++++++++++++ git.spec | 26 ++++++++++++++++--- sources | 2 +- 4 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch diff --git a/.cvsignore b/.cvsignore index e8c0c3f..7b52e58 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.2.tar.bz2 +git-1.6.2.2.tar.bz2 diff --git a/git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch b/git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch new file mode 100644 index 0000000..37a22dd --- /dev/null +++ b/git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch @@ -0,0 +1,26 @@ +From 09891c65a5f7409ce0bd37daced0ff31fbb1b1c9 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Mon, 23 Mar 2009 00:03:36 -0400 +Subject: [PATCH] git-cvsimport: Ignore cvsps-2.2b1 Branches: output + +Signed-off-by: Todd Zullinger +--- + git-cvsimport.perl | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/git-cvsimport.perl b/git-cvsimport.perl +index e439202..d020f1a 100755 +--- a/git-cvsimport.perl ++++ b/git-cvsimport.perl +@@ -952,7 +952,7 @@ while () { + } elsif (/^-+$/) { # end of unknown-line processing + $state = 1; + } elsif ($state != 11) { # ignore stuff when skipping +- print STDERR "* UNKNOWN LINE * $_\n"; ++ print STDERR "* UNKNOWN LINE * $_\n" unless /^Branches: /; + } + } + commit() if $branch and $state != 11; +-- +1.6.2.2 + diff --git a/git.spec b/git.spec index 90f9bd2..f2d67c2 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.2 +Version: 1.6.2.2 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -11,6 +11,8 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch +# https://bugzilla.redhat.com/490602 +Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -140,6 +142,7 @@ Requires: git = %{version}-%{release}, emacs-common %prep %setup -q %patch0 -p1 +%patch1 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -147,7 +150,6 @@ Requires: git = %{version}-%{release}, emacs-common make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ DESTDIR=$RPM_BUILD_ROOT \\\ - DOCBOOK_XSL_172=YesPlease \\\ INSTALL="install -p" \\\ INSTALLDIRS=vendor \\\ htmldir=%{_docdir}/%{name}-%{version} \\\ @@ -157,6 +159,12 @@ make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ %{make_git} all %{!?_without_docs: doc} make -C contrib/emacs +# Work around odd manpage issues (bug #485161) +grep -rl '\\&\.ft' Documentation/ | xargs -i sed -i 's/\\&\.ft/.ft/g' {} + +# Remove shebang from bash-completion script +sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash + %install rm -rf $RPM_BUILD_ROOT %{make_git} install %{!?_without_docs: install-doc} @@ -195,8 +203,9 @@ install -pm 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysc # quiet some rpmlint complaints chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/git-core/* -rm -f Documentation/technical/.gitignore +rm -f {Documentation/technical,contrib/emacs}/.gitignore chmod a-x Documentation/technical/api-index.sh +find contrib -type f -perm /a+x | xargs chmod -x %clean @@ -207,7 +216,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_datadir}/git-core/ %dir %{_libexecdir}/git-core/ -%doc README COPYING Documentation/*.txt contrib/hooks +%doc README COPYING Documentation/*.txt contrib/ %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} %{_sysconfdir}/bash_completion.d @@ -280,6 +289,7 @@ rm -rf $RPM_BUILD_ROOT %files -n gitweb %defattr(-,root,root) +%doc gitweb/README %{_var}/www/git/ %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf @@ -288,6 +298,14 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Apr 03 2009 Todd Zullinger - 1.6.2.2-1 +- git-1.6.2.2 +- Include contrib/ dir in %%doc (bug 492490) +- Don't set DOCBOOK_XSL_172, fix the '\&.ft' with sed (bug 485161) +- Ignore Branches output from cvsps-2.2b1 (bug 490602) +- Remove shebang from bash-completion script +- Include README in gitweb subpackage + * Mon Mar 09 2009 Todd Zullinger - 1.6.2-1 - git-1.6.2 - Include contrib/emacs/README in emacs subpackage diff --git a/sources b/sources index 06f7e08..7b92812 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -12c7d874e17c6e111697b1714b5f4319 git-1.6.2.tar.bz2 +d219aa5480ed6396f8ab968f3f7eb0f9 git-1.6.2.2.tar.bz2 From e8f3787a2a4d1939e2e47e98cad6f610f46f19d1 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 6 Jun 2009 01:45:16 +0000 Subject: [PATCH 066/114] Update to git-1.6.3.2 - Require emacs >= 22.2 for emacs support (bug 495312) - Add a .desktop file for git-gui (bug 498801) - Set ASCIIDOC8 and ASCIIDOC_NO_ROFF to correct documentation issues, the sed hack to fix bug 485161 should no longer be needed - Escape newline in git-daemon xinetd description (bug 502393) - Add xinetd to git-daemon Requires (bug 504105) - Organize BuildRequires/Requires, drop redundant expat Requires - Only build noarch subpackages on Fedora >= 10 - Only build emacs and arch subpackages on Fedora - Handle curl/libcurl naming for EPEL and Fedora --- .cvsignore | 2 +- git-gui.desktop | 9 +++++ git.spec | 96 ++++++++++++++++++++++++++++++++++++++++++++----- git.xinetd | 2 +- sources | 2 +- 5 files changed, 99 insertions(+), 12 deletions(-) create mode 100644 git-gui.desktop diff --git a/.cvsignore b/.cvsignore index 7b52e58..65a8f60 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.2.2.tar.bz2 +git-1.6.3.2.tar.bz2 diff --git a/git-gui.desktop b/git-gui.desktop new file mode 100644 index 0000000..f74f066 --- /dev/null +++ b/git-gui.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Git GUI +GenericName=Git GUI +Comment=A graphical interface to Git +Exec=git gui +Icon=/usr/share/git-gui/lib/git-gui.ico +Terminal=false +Type=Application +Categories=Development; diff --git a/git.spec b/git.spec index f2d67c2..18d6b64 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.2.2 +Version: 1.6.3.2 Release: 1%{?dist} Summary: Core git tools License: GPLv2 @@ -10,14 +10,32 @@ Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd +Source4: git-gui.desktop Patch0: git-1.5-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -BuildRequires: zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: desktop-file-utils +%if 0%{?fedora} +BuildRequires: emacs >= 22.2 +BuildRequires: libcurl-devel +%else +BuildRequires: curl-devel +%endif +BuildRequires: expat-devel +BuildRequires: gettext +BuildRequires: openssl-devel +BuildRequires: zlib-devel >= 1.2 +%{!?_without_docs:BuildRequires: asciidoc > 6.0.3, xmlto} + +Requires: less +Requires: openssh-clients +Requires: perl(Error) Requires: perl-Git = %{version}-%{release} -Requires: zlib >= 1.2, rsync, less, openssh-clients, expat, perl(Error) +Requires: rsync +Requires: zlib >= 1.2 + Provides: git-core = %{version}-%{release} Obsoletes: git-core <= 1.5.4.3 @@ -33,16 +51,20 @@ SCMs, install the git-all meta-package. %package all Summary: Meta-package to pull in all git tools Group: Development/Tools +%if 0%{?fedora} >= 10 BuildArch: noarch +%endif Requires: git = %{version}-%{release} Requires: git-svn = %{version}-%{release} Requires: git-cvs = %{version}-%{release} -Requires: git-arch = %{version}-%{release} Requires: git-email = %{version}-%{release} Requires: gitk = %{version}-%{release} Requires: git-gui = %{version}-%{release} Requires: perl-Git = %{version}-%{release} +%if 0%{?fedora} Requires: emacs-git = %{version}-%{release} +Requires: git-arch = %{version}-%{release} +%endif Obsoletes: git <= 1.5.4.3 %description all @@ -55,14 +77,16 @@ This is a dummy package which brings in all subpackages. %package daemon Summary: Git protocol dæmon Group: Development/Tools -Requires: git = %{version}-%{release} +Requires: git = %{version}-%{release}, xinetd %description daemon The git dæmon for supporting git:// access to git repositories %package -n gitweb Summary: Simple web interface to git repositories Group: Development/Tools +%if 0%{?fedora} >= 10 BuildArch: noarch +%endif Requires: git = %{version}-%{release} %description -n gitweb @@ -72,7 +96,9 @@ Simple web interface to track changes in git repositories %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools +%if 0%{?fedora} >= 10 BuildArch: noarch +%endif Requires: git = %{version}-%{release}, subversion, perl(Term::ReadKey) %description svn Git tools for importing Subversion repositories. @@ -80,23 +106,31 @@ Git tools for importing Subversion repositories. %package cvs Summary: Git tools for importing CVS repositories Group: Development/Tools +%if 0%{?fedora} >= 10 BuildArch: noarch +%endif Requires: git = %{version}-%{release}, cvs, cvsps %description cvs Git tools for importing CVS repositories. +%if 0%{?fedora} %package arch Summary: Git tools for importing Arch repositories Group: Development/Tools +%if 0%{?fedora} >= 10 BuildArch: noarch +%endif Requires: git = %{version}-%{release}, tla %description arch Git tools for importing Arch repositories. +%endif %package email Summary: Git tools for sending email Group: Development/Tools +%if 0%{?fedora} >= 10 BuildArch: noarch +%endif Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} Requires: perl(Net::SMTP::SSL), perl(Authen::SASL) %description email @@ -105,7 +139,9 @@ Git tools for sending email. %package gui Summary: Git GUI tool Group: Development/Tools +%if 0%{?fedora} >= 10 BuildArch: noarch +%endif Requires: git = %{version}-%{release}, tk >= 8.4 Requires: gitk = %{version}-%{release} %description gui @@ -114,7 +150,9 @@ Git GUI tool. %package -n gitk Summary: Git revision tree visualiser Group: Development/Tools +%if 0%{?fedora} >= 10 BuildArch: noarch +%endif Requires: git = %{version}-%{release}, tk >= 8.4 %description -n gitk Git revision tree visualiser. @@ -122,7 +160,9 @@ Git revision tree visualiser. %package -n perl-Git Summary: Perl interface to Git Group: Development/Libraries +%if 0%{?fedora} >= 10 BuildArch: noarch +%endif Requires: git = %{version}-%{release}, perl(Error) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) @@ -130,14 +170,18 @@ BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) %description -n perl-Git Perl interface to Git. +%if 0%{?fedora} %package -n emacs-git Summary: Git version control system support for Emacs Group: Applications/Editors +%if 0%{?fedora} >= 10 BuildArch: noarch -Requires: git = %{version}-%{release}, emacs-common +%endif +Requires: git = %{version}-%{release}, emacs-common >= 22.2 %description -n emacs-git %{summary}. +%endif %prep %setup -q @@ -148,6 +192,7 @@ Requires: git = %{version}-%{release}, emacs-common # Otherwise it will rebuild in %%install due to flags changes. %define make_git \ make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ + ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\ ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ DESTDIR=$RPM_BUILD_ROOT \\\ INSTALL="install -p" \\\ @@ -157,10 +202,10 @@ make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ %build %{make_git} all %{!?_without_docs: doc} -make -C contrib/emacs -# Work around odd manpage issues (bug #485161) -grep -rl '\\&\.ft' Documentation/ | xargs -i sed -i 's/\\&\.ft/.ft/g' {} +%if 0%{?fedora} +make -C contrib/emacs +%endif # Remove shebang from bash-completion script sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash @@ -168,6 +213,8 @@ sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash %install rm -rf $RPM_BUILD_ROOT %{make_git} install %{!?_without_docs: install-doc} + +%if 0%{?fedora} make -C contrib/emacs install \ emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do @@ -176,6 +223,8 @@ for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do done install -Dpm 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/git-init.el +%endif + mkdir -p $RPM_BUILD_ROOT%{_var}/www/git install -pm 644 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/*.png gitweb/*.css install -pm 755 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/gitweb.cgi @@ -186,6 +235,10 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' +%if ! 0%{?fedora} +find $RPM_BUILD_ROOT Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' +%endif + (find $RPM_BUILD_ROOT{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files %if %{!?_without_docs:1}0 @@ -201,6 +254,13 @@ install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/git mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d install -pm 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git +# install git-gui .desktop file +desktop-file-install \ +%if 0%{?rhel} && 0%{?rhel} <= 5 + --vendor fedora \ +%endif + --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE4} + # quiet some rpmlint complaints chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/git-core/* rm -f {Documentation/technical,contrib/emacs}/.gitignore @@ -237,12 +297,14 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %doc Documentation/*git-cvs*.html } +%if 0%{?fedora} %files arch %defattr(-,root,root) %doc Documentation/git-archimport.txt %{_libexecdir}/git-core/git-archimport %{!?_without_docs: %{_mandir}/man1/git-archimport.1*} %{!?_without_docs: %doc Documentation/git-archimport.html } +%endif %files email %defattr(-,root,root) @@ -255,6 +317,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_libexecdir}/git-core/git-gui* %{_libexecdir}/git-core/git-citool +%{_datadir}/applications/*git-gui.desktop %{_datadir}/git-gui/ %{!?_without_docs: %{_mandir}/man1/git-gui.1*} %{!?_without_docs: %doc Documentation/git-gui.html} @@ -272,11 +335,13 @@ rm -rf $RPM_BUILD_ROOT %files -n perl-Git -f perl-files %defattr(-,root,root) +%if 0%{?fedora} %files -n emacs-git %defattr(-,root,root) %doc contrib/emacs/README %{_datadir}/emacs/site-lisp/*git*.el* %{_datadir}/emacs/site-lisp/site-start.d/git-init.el +%endif %files daemon %defattr(-,root,root) @@ -298,6 +363,19 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Jun 05 2009 Todd Zullinger - 1.6.3.2-1 +- git-1.6.3.2 +- Require emacs >= 22.2 for emacs support (bug 495312) +- Add a .desktop file for git-gui (bug 498801) +- Set ASCIIDOC8 and ASCIIDOC_NO_ROFF to correct documentation issues, + the sed hack to fix bug 485161 should no longer be needed +- Escape newline in git-daemon xinetd description (bug 502393) +- Add xinetd to git-daemon Requires (bug 504105) +- Organize BuildRequires/Requires, drop redundant expat Requires +- Only build noarch subpackages on Fedora >= 10 +- Only build emacs and arch subpackages on Fedora +- Handle curl/libcurl naming for EPEL and Fedora + * Fri Apr 03 2009 Todd Zullinger - 1.6.2.2-1 - git-1.6.2.2 - Include contrib/ dir in %%doc (bug 492490) diff --git a/git.xinetd b/git.xinetd index 52365ce..6c9933d 100644 --- a/git.xinetd +++ b/git.xinetd @@ -1,5 +1,5 @@ # default: off -# description: The git dæmon allows git repositories to be exported using +# description: The git dæmon allows git repositories to be exported using \ # the git:// protocol. service git diff --git a/sources b/sources index 7b92812..4faa209 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d219aa5480ed6396f8ab968f3f7eb0f9 git-1.6.2.2.tar.bz2 +149948ff33fb7d8cf9eef925e6c08157 git-1.6.3.2.tar.bz2 From 4387c32ff055cd3d1c3ff1c9aaef4097a3c9ac99 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 19 Jun 2009 13:10:45 +0000 Subject: [PATCH 067/114] Fix git-daemon hang on invalid input (CVE-2009-2108, bug 505761) --- git-1.6.3.2-daemon-extra-args.patch | 104 ++++++++++++++++++++++++++++ git.spec | 8 ++- 2 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 git-1.6.3.2-daemon-extra-args.patch diff --git a/git-1.6.3.2-daemon-extra-args.patch b/git-1.6.3.2-daemon-extra-args.patch new file mode 100644 index 0000000..150f98c --- /dev/null +++ b/git-1.6.3.2-daemon-extra-args.patch @@ -0,0 +1,104 @@ +From 73bb33a94ec67a53e7d805b12ad9264fa25f4f8d Mon Sep 17 00:00:00 2001 +From: Shawn O. Pearce +Date: Thu, 4 Jun 2009 18:33:32 -0700 +Subject: [PATCH] daemon: Strictly parse the "extra arg" part of the command + +Since 1.4.4.5 (49ba83fb67 "Add virtualization support to git-daemon") +git daemon enters an infinite loop and never terminates if a client +hides any extra arguments in the initial request line which is not +exactly "\0host=blah\0". + +Since that change, a client must never insert additional extra +arguments, or attempt to use any argument other than "host=", as +any daemon will get stuck parsing the request line and will never +complete the request. + +Since the client can't tell if the daemon is patched or not, it +is not possible to know if additional extra args might actually be +able to be safely requested. + +If we ever need to extend the git daemon protocol to support a new +feature, we may have to do something like this to the exchange: + + # If both support git:// v2 + # + C: 000cgit://v2 + S: 0010ok host user + C: 0018host git.kernel.org + C: 0027git-upload-pack /pub/linux-2.6.git + S: ...git-upload-pack header... + + # If client supports git:// v2, server does not: + # + C: 000cgit://v2 + S: + + C: 003bgit-upload-pack /pub/linux-2.6.git\0host=git.kernel.org\0 + S: ...git-upload-pack header... + +This requires the client to create two TCP connections to talk to +an older git daemon, however all daemons since the introduction of +daemon.c will safely reject the unknown "git://v2" command request, +so the client can quite easily determine the server supports an +older protocol. + +Signed-off-by: Shawn O. Pearce +Signed-off-by: Junio C Hamano + +diff --git a/connect.c b/connect.c +index f6b8ba6..958c831 100644 +--- a/connect.c ++++ b/connect.c +@@ -579,7 +579,10 @@ struct child_process *git_connect(int fd[2], const char *url_orig, + git_tcp_connect(fd, host, flags); + /* + * Separate original protocol components prog and path +- * from extended components with a NUL byte. ++ * from extended host header with a NUL byte. ++ * ++ * Note: Do not add any other headers here! Doing so ++ * will cause older git-daemon servers to crash. + */ + packet_write(fd[1], + "%s %s%chost=%s%c", +diff --git a/daemon.c b/daemon.c +index daa4c8e..b2babcc 100644 +--- a/daemon.c ++++ b/daemon.c +@@ -406,15 +406,15 @@ static char *xstrdup_tolower(const char *str) + } + + /* +- * Separate the "extra args" information as supplied by the client connection. ++ * Read the host as supplied by the client connection. + */ +-static void parse_extra_args(char *extra_args, int buflen) ++static void parse_host_arg(char *extra_args, int buflen) + { + char *val; + int vallen; + char *end = extra_args + buflen; + +- while (extra_args < end && *extra_args) { ++ if (extra_args < end && *extra_args) { + saw_extended_args = 1; + if (strncasecmp("host=", extra_args, 5) == 0) { + val = extra_args + 5; +@@ -436,6 +436,8 @@ static void parse_extra_args(char *extra_args, int buflen) + /* On to the next one */ + extra_args = val + vallen; + } ++ if (extra_args < end && *extra_args) ++ die("Invalid request"); + } + + /* +@@ -545,7 +547,7 @@ static int execute(struct sockaddr *addr) + hostname = canon_hostname = ip_address = tcp_port = NULL; + + if (len != pktlen) +- parse_extra_args(line + len + 1, pktlen - len - 1); ++ parse_host_arg(line + len + 1, pktlen - len - 1); + + for (i = 0; i < ARRAY_SIZE(daemon_service); i++) { + struct daemon_service *s = &(daemon_service[i]); diff --git a/git.spec b/git.spec index 18d6b64..15e8215 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.6.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -14,6 +14,8 @@ Source4: git-gui.desktop Patch0: git-1.5-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch +# http://git.kernel.org/?p=git/git.git;a=commitdiff;h=73bb33a9 +Patch2: git-1.6.3.2-daemon-extra-args.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -187,6 +189,7 @@ Requires: git = %{version}-%{release}, emacs-common >= 22.2 %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -363,6 +366,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Jun 19 2009 Todd Zullinger - 1.6.3.2-2 +- Fix git-daemon hang on invalid input (CVE-2009-2108, bug 505761) + * Fri Jun 05 2009 Todd Zullinger - 1.6.3.2-1 - git-1.6.3.2 - Require emacs >= 22.2 for emacs support (bug 495312) From 87ceff4e35986ecf89d9faea3cd78dde6917c051 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 20 Jun 2009 00:52:46 +0000 Subject: [PATCH 068/114] Temporarily disable asciidoc's safe mode until bug 506953 is fixed --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 15e8215..ba6a063 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.6.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -195,7 +195,7 @@ Requires: git = %{version}-%{release}, emacs-common >= 22.2 # Otherwise it will rebuild in %%install due to flags changes. %define make_git \ make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ - ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\ + ASCIIDOC="asciidoc --unsafe" ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\ ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ DESTDIR=$RPM_BUILD_ROOT \\\ INSTALL="install -p" \\\ @@ -366,6 +366,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Jun 19 2009 Todd Zullinger - 1.6.3.2-3 +- Temporarily disable asciidoc's safe mode until bug 506953 is fixed + * Fri Jun 19 2009 Todd Zullinger - 1.6.3.2-2 - Fix git-daemon hang on invalid input (CVE-2009-2108, bug 505761) From 762cf1156ba49f6ec459ed20930b7c315b60c7a7 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 28 Jun 2009 23:26:09 +0000 Subject: [PATCH 069/114] Update to git-1.6.3.3 - Move contributed hooks to %{_datadir}/git-core/contrib/hooks (bug 500137) --- .cvsignore | 2 +- git-1.6-update-contrib-hooks-path.patch | 43 ++++++++++ git-1.6.3.2-daemon-extra-args.patch | 104 ------------------------ git.spec | 35 ++++++-- sources | 2 +- 5 files changed, 75 insertions(+), 111 deletions(-) create mode 100644 git-1.6-update-contrib-hooks-path.patch delete mode 100644 git-1.6.3.2-daemon-extra-args.patch diff --git a/.cvsignore b/.cvsignore index 65a8f60..c7eb084 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.3.2.tar.bz2 +git-1.6.3.3.tar.bz2 diff --git a/git-1.6-update-contrib-hooks-path.patch b/git-1.6-update-contrib-hooks-path.patch new file mode 100644 index 0000000..cfa3817 --- /dev/null +++ b/git-1.6-update-contrib-hooks-path.patch @@ -0,0 +1,43 @@ +From 1963c852acc5d8c521a3e4f3b9ceb313d26a473c Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Mon, 22 Jun 2009 08:00:29 -0400 +Subject: [PATCH] Update path to contrib/hooks/post-receive-email + +--- + contrib/hooks/post-receive-email | 6 +++--- + templates/hooks--post-receive.sample | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email +index 2a66063..4835ada 100755 +--- a/contrib/hooks/post-receive-email ++++ b/contrib/hooks/post-receive-email +@@ -10,12 +10,12 @@ + # This hook is stored in the contrib/hooks directory. Your distribution + # will have put this somewhere standard. You should make this script + # executable then link to it in the repository you would like to use it in. +-# For example, on debian the hook is stored in +-# /usr/share/doc/git-core/contrib/hooks/post-receive-email: ++# For example, on fedora the hook is stored in ++# /usr/share/git-core/contrib/hooks/post-receive-email: + # + # chmod a+x post-receive-email + # cd /path/to/your/repository.git +-# ln -sf /usr/share/doc/git-core/contrib/hooks/post-receive-email hooks/post-receive ++# ln -sf /usr/share/git-core/contrib/hooks/post-receive-email hooks/post-receive + # + # This hook script assumes it is enabled on the central repository of a + # project, with all users pushing only to it and not between each other. It +diff --git a/templates/hooks--post-receive.sample b/templates/hooks--post-receive.sample +index 18d2e0f..cf57878 100755 +--- a/templates/hooks--post-receive.sample ++++ b/templates/hooks--post-receive.sample +@@ -12,4 +12,4 @@ + # see contrib/hooks/ for an sample, or uncomment the next line and + # rename the file to "post-receive". + +-#. /usr/share/doc/git-core/contrib/hooks/post-receive-email ++#. /usr/share/git-core/contrib/hooks/post-receive-email +-- +1.6.3.2 + diff --git a/git-1.6.3.2-daemon-extra-args.patch b/git-1.6.3.2-daemon-extra-args.patch deleted file mode 100644 index 150f98c..0000000 --- a/git-1.6.3.2-daemon-extra-args.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 73bb33a94ec67a53e7d805b12ad9264fa25f4f8d Mon Sep 17 00:00:00 2001 -From: Shawn O. Pearce -Date: Thu, 4 Jun 2009 18:33:32 -0700 -Subject: [PATCH] daemon: Strictly parse the "extra arg" part of the command - -Since 1.4.4.5 (49ba83fb67 "Add virtualization support to git-daemon") -git daemon enters an infinite loop and never terminates if a client -hides any extra arguments in the initial request line which is not -exactly "\0host=blah\0". - -Since that change, a client must never insert additional extra -arguments, or attempt to use any argument other than "host=", as -any daemon will get stuck parsing the request line and will never -complete the request. - -Since the client can't tell if the daemon is patched or not, it -is not possible to know if additional extra args might actually be -able to be safely requested. - -If we ever need to extend the git daemon protocol to support a new -feature, we may have to do something like this to the exchange: - - # If both support git:// v2 - # - C: 000cgit://v2 - S: 0010ok host user - C: 0018host git.kernel.org - C: 0027git-upload-pack /pub/linux-2.6.git - S: ...git-upload-pack header... - - # If client supports git:// v2, server does not: - # - C: 000cgit://v2 - S: - - C: 003bgit-upload-pack /pub/linux-2.6.git\0host=git.kernel.org\0 - S: ...git-upload-pack header... - -This requires the client to create two TCP connections to talk to -an older git daemon, however all daemons since the introduction of -daemon.c will safely reject the unknown "git://v2" command request, -so the client can quite easily determine the server supports an -older protocol. - -Signed-off-by: Shawn O. Pearce -Signed-off-by: Junio C Hamano - -diff --git a/connect.c b/connect.c -index f6b8ba6..958c831 100644 ---- a/connect.c -+++ b/connect.c -@@ -579,7 +579,10 @@ struct child_process *git_connect(int fd[2], const char *url_orig, - git_tcp_connect(fd, host, flags); - /* - * Separate original protocol components prog and path -- * from extended components with a NUL byte. -+ * from extended host header with a NUL byte. -+ * -+ * Note: Do not add any other headers here! Doing so -+ * will cause older git-daemon servers to crash. - */ - packet_write(fd[1], - "%s %s%chost=%s%c", -diff --git a/daemon.c b/daemon.c -index daa4c8e..b2babcc 100644 ---- a/daemon.c -+++ b/daemon.c -@@ -406,15 +406,15 @@ static char *xstrdup_tolower(const char *str) - } - - /* -- * Separate the "extra args" information as supplied by the client connection. -+ * Read the host as supplied by the client connection. - */ --static void parse_extra_args(char *extra_args, int buflen) -+static void parse_host_arg(char *extra_args, int buflen) - { - char *val; - int vallen; - char *end = extra_args + buflen; - -- while (extra_args < end && *extra_args) { -+ if (extra_args < end && *extra_args) { - saw_extended_args = 1; - if (strncasecmp("host=", extra_args, 5) == 0) { - val = extra_args + 5; -@@ -436,6 +436,8 @@ static void parse_extra_args(char *extra_args, int buflen) - /* On to the next one */ - extra_args = val + vallen; - } -+ if (extra_args < end && *extra_args) -+ die("Invalid request"); - } - - /* -@@ -545,7 +547,7 @@ static int execute(struct sockaddr *addr) - hostname = canon_hostname = ip_address = tcp_port = NULL; - - if (len != pktlen) -- parse_extra_args(line + len + 1, pktlen - len - 1); -+ parse_host_arg(line + len + 1, pktlen - len - 1); - - for (i = 0; i < ARRAY_SIZE(daemon_service); i++) { - struct daemon_service *s = &(daemon_service[i]); diff --git a/git.spec b/git.spec index ba6a063..9857342 100644 --- a/git.spec +++ b/git.spec @@ -1,8 +1,8 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.3.2 -Release: 3%{?dist} -Summary: Core git tools +Version: 1.6.3.3 +Release: 1%{?dist} +Summary: Fast Version Control System License: GPLv2 Group: Development/Tools URL: http://git-scm.com/ @@ -14,8 +14,8 @@ Source4: git-gui.desktop Patch0: git-1.5-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# http://git.kernel.org/?p=git/git.git;a=commitdiff;h=73bb33a9 -Patch2: git-1.6.3.2-daemon-extra-args.patch +# https://bugzilla.redhat.com/500137 +Patch2: git-1.6-update-contrib-hooks-path.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -203,6 +203,17 @@ make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ htmldir=%{_docdir}/%{name}-%{version} \\\ prefix=%{_prefix} +# Filter bogus perl requires +# packed-refs comes from a comment in contrib/hooks/update-paranoid +cat << \EOF > %{name}-req +#!/bin/sh +%{__perl_requires} $* |\ +sed -e '/perl(packed-refs)/d' +EOF + +%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req +chmod +x %{__perl_requires} + %build %{make_git} all %{!?_without_docs: doc} @@ -257,6 +268,14 @@ install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/git mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d install -pm 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git +# Move contrib/hooks out of %%docdir and make them executable +mkdir -p $RPM_BUILD_ROOT%{_datadir}/git-core/contrib +mv contrib/hooks $RPM_BUILD_ROOT%{_datadir}/git-core/contrib +chmod +x $RPM_BUILD_ROOT%{_datadir}/git-core/contrib/hooks/* +pushd contrib > /dev/null +ln -s ../../../git-core/contrib/hooks +popd > /dev/null + # install git-gui .desktop file desktop-file-install \ %if 0%{?rhel} && 0%{?rhel} <= 5 @@ -266,6 +285,7 @@ desktop-file-install \ # quiet some rpmlint complaints chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/git-core/* +chmod a-x $RPM_BUILD_ROOT%{_libexecdir}/git-core/git-mergetool--lib rm -f {Documentation/technical,contrib/emacs}/.gitignore chmod a-x Documentation/technical/api-index.sh find contrib -type f -perm /a+x | xargs chmod -x @@ -366,6 +386,11 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sun Jun 28 2009 Todd Zullinger - 1.6.3.3-1 +- git-1.6.3.3 +- Move contributed hooks to %%{_datadir}/git-core/contrib/hooks (bug 500137) +- Fix rpmlint warnings about Summary and git-mergetool--lib missing shebang + * Fri Jun 19 2009 Todd Zullinger - 1.6.3.2-3 - Temporarily disable asciidoc's safe mode until bug 506953 is fixed diff --git a/sources b/sources index 4faa209..80c46f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -149948ff33fb7d8cf9eef925e6c08157 git-1.6.3.2.tar.bz2 +91ae46ac01dadab1962beb064abd5b60 git-1.6.3.3.tar.bz2 From 0069f8b607e34f2f4fb74fbde868326062d4b164 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 00:12:40 +0000 Subject: [PATCH 070/114] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 9857342..4892202 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.6.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 1.6.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Sun Jun 28 2009 Todd Zullinger - 1.6.3.3-1 - git-1.6.3.3 - Move contributed hooks to %%{_datadir}/git-core/contrib/hooks (bug 500137) From 1c30876e7b52349f880eb1d26928fb56c9bcd9fa Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 29 Jul 2009 11:49:52 +0000 Subject: [PATCH 071/114] Update to git-1.6.4 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index c7eb084..8eb7d9d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.3.3.tar.bz2 +git-1.6.4.tar.bz2 diff --git a/git.spec b/git.spec index 4892202..fde020f 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.3.3 -Release: 2%{?dist} +Version: 1.6.4 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed Jul 29 2009 Todd Zullinger - 1.6.4-1 +- git-1.6.4 + * Fri Jul 24 2009 Fedora Release Engineering - 1.6.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 80c46f7..fd75ba6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -91ae46ac01dadab1962beb064abd5b60 git-1.6.3.3.tar.bz2 +d41e3d43c8f1d23024fb3d3fe6aa3858 git-1.6.4.tar.bz2 From 7eeaed53fe719e31ab487c2d0676d29df6726436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Fri, 21 Aug 2009 13:30:59 +0000 Subject: [PATCH 072/114] - rebuilt with new openssl --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index fde020f..4b1ce9f 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.6.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Fri Aug 21 2009 Tomas Mraz - 1.6.4-2 +- rebuilt with new openssl + * Wed Jul 29 2009 Todd Zullinger - 1.6.4-1 - git-1.6.4 From b11d0403161a70eae524848a22afb4607c2ea251 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 23 Aug 2009 16:33:46 +0000 Subject: [PATCH 073/114] Update to git-1.6.4.1 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8eb7d9d..dc02e51 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.4.tar.bz2 +git-1.6.4.1.tar.bz2 diff --git a/git.spec b/git.spec index 4b1ce9f..a3e2a13 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.4 -Release: 2%{?dist} +Version: 1.6.4.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sat Aug 22 2009 Todd Zullinger - 1.6.4.1-1 +- git-1.6.4.1 + * Fri Aug 21 2009 Tomas Mraz - 1.6.4-2 - rebuilt with new openssl diff --git a/sources b/sources index fd75ba6..1c30151 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d41e3d43c8f1d23024fb3d3fe6aa3858 git-1.6.4.tar.bz2 +bdc9b8be7d56a3beabad2d228f2e8e9a git-1.6.4.1.tar.bz2 From 958314da4ad2a67d94b0f8145f8729fcc1a29d6d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 31 Aug 2009 14:30:41 +0000 Subject: [PATCH 074/114] Update to git-1.6.4.2 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index dc02e51..bdd30c6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.4.1.tar.bz2 +git-1.6.4.2.tar.bz2 diff --git a/git.spec b/git.spec index a3e2a13..9cc4300 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.4.1 +Version: 1.6.4.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sun Aug 30 2009 Todd Zullinger - 1.6.4.2-1 +- git-1.6.4.2 + * Sat Aug 22 2009 Todd Zullinger - 1.6.4.1-1 - git-1.6.4.1 diff --git a/sources b/sources index 1c30151..331941b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bdc9b8be7d56a3beabad2d228f2e8e9a git-1.6.4.1.tar.bz2 +05c41dc84eae47e3d4fe5b3dee9cc73c git-1.6.4.2.tar.bz2 From ee3bd9c6ee06bcfa15f19c07b4bb3224550de128 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 13 Sep 2009 14:40:24 +0000 Subject: [PATCH 075/114] Update to git-1.6.4.3 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index bdd30c6..4ab23da 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.4.2.tar.bz2 +git-1.6.4.3.tar.bz2 diff --git a/git.spec b/git.spec index 9cc4300..d06e97d 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.4.2 +Version: 1.6.4.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sun Sep 13 2009 Todd Zullinger - 1.6.4.3-1 +- git-1.6.4.2 + * Sun Aug 30 2009 Todd Zullinger - 1.6.4.2-1 - git-1.6.4.2 diff --git a/sources b/sources index 331941b..f551d1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05c41dc84eae47e3d4fe5b3dee9cc73c git-1.6.4.2.tar.bz2 +4af70ff9b8f209704059f7ef96127236 git-1.6.4.3.tar.bz2 From b9c71ac0ca7ad5742ff35ba763450ac2c2443302 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 13 Sep 2009 15:03:53 +0000 Subject: [PATCH 076/114] Fix %changelog typo (hardly worth a rebuild, as 1.6.5 is not too far off) --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index d06e97d..b45f94a 100644 --- a/git.spec +++ b/git.spec @@ -387,7 +387,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Sun Sep 13 2009 Todd Zullinger - 1.6.4.3-1 -- git-1.6.4.2 +- git-1.6.4.3 * Sun Aug 30 2009 Todd Zullinger - 1.6.4.2-1 - git-1.6.4.2 From 38399517f7c10760a1aec2be36b02be90d8720f8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 17 Sep 2009 01:47:17 +0000 Subject: [PATCH 077/114] Update to git-1.6.4.4 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4ab23da..0ba28a0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.4.3.tar.bz2 +git-1.6.4.4.tar.bz2 diff --git a/git.spec b/git.spec index b45f94a..d6453de 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.4.3 +Version: 1.6.4.4 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -386,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed Sep 16 2009 Todd Zullinger - 1.6.4.4-1 +- git-1.6.4.4 + * Sun Sep 13 2009 Todd Zullinger - 1.6.4.3-1 - git-1.6.4.3 diff --git a/sources b/sources index f551d1a..ad782c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4af70ff9b8f209704059f7ef96127236 git-1.6.4.3.tar.bz2 +b150352782998ca1f84185e6af53ec26 git-1.6.4.4.tar.bz2 From b79693427a70cf957654803c2d567d03e916b8e3 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 28 Sep 2009 15:01:54 +0000 Subject: [PATCH 078/114] Update to git-1.6.5.rc2 Enable Linus' block-sha1 implementation. This allows git to not link most binaries with libcrypto (from openssl). Combined with the upstream changes to not link to libcurl except when needed, this slims down the git binaries a bit. --- .cvsignore | 2 +- git.spec | 16 +++++++++++----- sources | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0ba28a0..21852c0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.4.4.tar.bz2 +git-1.6.5.rc2.tar.bz2 diff --git a/git.spec b/git.spec index d6453de..ccb0f29 100644 --- a/git.spec +++ b/git.spec @@ -1,12 +1,13 @@ # Pass --without docs to rpmbuild if you don't want the documentation +%global snap .rc2 Name: git -Version: 1.6.4.4 -Release: 1%{?dist} +Version: 1.6.5 +Release: 0.2%{?snap}%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools URL: http://git-scm.com/ -Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 +Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}%{?snap}.tar.bz2 Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd @@ -186,7 +187,7 @@ Requires: git = %{version}-%{release}, emacs-common >= 22.2 %endif %prep -%setup -q +%setup -q -n %{name}-%{version}%{?snap} %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -196,6 +197,7 @@ Requires: git = %{version}-%{release}, emacs-common >= 22.2 %define make_git \ make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ ASCIIDOC="asciidoc --unsafe" ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\ + BLK_SHA1=1 \\\ ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ DESTDIR=$RPM_BUILD_ROOT \\\ INSTALL="install -p" \\\ @@ -211,7 +213,7 @@ cat << \EOF > %{name}-req sed -e '/perl(packed-refs)/d' EOF -%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req +%global __perl_requires %{_builddir}/%{name}-%{version}%{?snap}/%{name}-req chmod +x %{__perl_requires} %build @@ -386,6 +388,10 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon Sep 28 2009 Todd Zullinger - 1.6.5-0.2.rc2 +- git-1.6.5.rc2 +- Enable Linus' block-sha1 implementation + * Wed Sep 16 2009 Todd Zullinger - 1.6.4.4-1 - git-1.6.4.4 diff --git a/sources b/sources index ad782c2..5030125 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b150352782998ca1f84185e6af53ec26 git-1.6.4.4.tar.bz2 +e9cfec47e38232948dc90188927f7782 git-1.6.5.rc2.tar.bz2 From 83562ac72a082a80e193044d9fdca48fd323bc2c Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 14 Oct 2009 02:40:46 +0000 Subject: [PATCH 079/114] Update to git-1.6.5 --- .cvsignore | 2 +- git-1.6-update-contrib-hooks-path.patch | 2 +- git.spec | 12 +++++++----- sources | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 21852c0..dd5767e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.5.rc2.tar.bz2 +git-1.6.5.tar.bz2 diff --git a/git-1.6-update-contrib-hooks-path.patch b/git-1.6-update-contrib-hooks-path.patch index cfa3817..a4220ad 100644 --- a/git-1.6-update-contrib-hooks-path.patch +++ b/git-1.6-update-contrib-hooks-path.patch @@ -33,7 +33,7 @@ index 18d2e0f..cf57878 100755 --- a/templates/hooks--post-receive.sample +++ b/templates/hooks--post-receive.sample @@ -12,4 +12,4 @@ - # see contrib/hooks/ for an sample, or uncomment the next line and + # see contrib/hooks/ for a sample, or uncomment the next line and # rename the file to "post-receive". -#. /usr/share/doc/git-core/contrib/hooks/post-receive-email diff --git a/git.spec b/git.spec index ccb0f29..d5348d7 100644 --- a/git.spec +++ b/git.spec @@ -1,13 +1,12 @@ # Pass --without docs to rpmbuild if you don't want the documentation -%global snap .rc2 Name: git Version: 1.6.5 -Release: 0.2%{?snap}%{?dist} +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools URL: http://git-scm.com/ -Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}%{?snap}.tar.bz2 +Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd @@ -187,7 +186,7 @@ Requires: git = %{version}-%{release}, emacs-common >= 22.2 %endif %prep -%setup -q -n %{name}-%{version}%{?snap} +%setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -213,7 +212,7 @@ cat << \EOF > %{name}-req sed -e '/perl(packed-refs)/d' EOF -%global __perl_requires %{_builddir}/%{name}-%{version}%{?snap}/%{name}-req +%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req chmod +x %{__perl_requires} %build @@ -388,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sun Oct 11 2009 Todd Zullinger - 1.6.5-1 +- git-1.6.5 + * Mon Sep 28 2009 Todd Zullinger - 1.6.5-0.2.rc2 - git-1.6.5.rc2 - Enable Linus' block-sha1 implementation diff --git a/sources b/sources index 5030125..36246ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e9cfec47e38232948dc90188927f7782 git-1.6.5.rc2.tar.bz2 +da86c1736c55edb9f446828581137b51 git-1.6.5.tar.bz2 From 8c6a74fbc761ec81f73ae9c040290a9f498d5299 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 18 Oct 2009 13:30:26 +0000 Subject: [PATCH 080/114] Update to git-1.6.5.1 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index dd5767e..ae71b27 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.5.tar.bz2 +git-1.6.5.1.tar.bz2 diff --git a/git.spec b/git.spec index d5348d7..cf422cd 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.5 +Version: 1.6.5.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -387,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sat Oct 17 2009 Todd Zullinger - 1.6.5.1-1 +- git-1.6.5.1 + * Sun Oct 11 2009 Todd Zullinger - 1.6.5-1 - git-1.6.5 diff --git a/sources b/sources index 36246ed..58e8374 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da86c1736c55edb9f446828581137b51 git-1.6.5.tar.bz2 +fd784f407d538705ed36c0498542d4f5 git-1.6.5.1.tar.bz2 From baa02def71078bd1bded4b271d868fdb029e4634 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 31 Oct 2009 01:44:28 +0000 Subject: [PATCH 081/114] Update to git-1.6.5.2 - Drop asciidoc --unsafe option, it should not be needed anymore - Don't use install -t/-T, they're not compatible with older coreutils - Don't use -perm /a+x with find, it's incompatible with older findutils --- .cvsignore | 2 +- git.spec | 18 ++++++++++++------ sources | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index ae71b27..49a8acf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.5.1.tar.bz2 +git-1.6.5.2.tar.bz2 diff --git a/git.spec b/git.spec index cf422cd..dd9aff7 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,6 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.6.5.1 +Version: 1.6.5.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -195,7 +195,7 @@ Requires: git = %{version}-%{release}, emacs-common >= 22.2 # Otherwise it will rebuild in %%install due to flags changes. %define make_git \ make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ - ASCIIDOC="asciidoc --unsafe" ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\ + ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\ BLK_SHA1=1 \\\ ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ DESTDIR=$RPM_BUILD_ROOT \\\ @@ -241,8 +241,8 @@ install -Dpm 644 %{SOURCE1} \ %endif mkdir -p $RPM_BUILD_ROOT%{_var}/www/git -install -pm 644 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/*.png gitweb/*.css -install -pm 755 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/gitweb.cgi +install -pm 644 gitweb/*.png gitweb/*.css $RPM_BUILD_ROOT%{_var}/www/git +install -pm 755 gitweb/gitweb.cgi $RPM_BUILD_ROOT%{_var}/www/git mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf @@ -267,7 +267,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/git mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d -install -pm 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git +install -pm 644 contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git # Move contrib/hooks out of %%docdir and make them executable mkdir -p $RPM_BUILD_ROOT%{_datadir}/git-core/contrib @@ -289,7 +289,7 @@ chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/git-core/* chmod a-x $RPM_BUILD_ROOT%{_libexecdir}/git-core/git-mergetool--lib rm -f {Documentation/technical,contrib/emacs}/.gitignore chmod a-x Documentation/technical/api-index.sh -find contrib -type f -perm /a+x | xargs chmod -x +find contrib -type f | xargs chmod -x %clean @@ -387,6 +387,12 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon Oct 26 2009 Todd Zullinger - 1.6.5.2-1 +- git-1.6.5.2 +- Drop asciidoc --unsafe option, it should not be needed anymore +- Don't use install -t/-T, they're not compatible with older coreutils +- Don't use -perm /a+x with find, it's incompatible with older findutils + * Sat Oct 17 2009 Todd Zullinger - 1.6.5.1-1 - git-1.6.5.1 diff --git a/sources b/sources index 58e8374..acbb4bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd784f407d538705ed36c0498542d4f5 git-1.6.5.1.tar.bz2 +99708c449b23433136dbdfa38bd16d80 git-1.6.5.2.tar.bz2 From 075e35089926ded6357e68fdc07dcfa79fbed10b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:19:26 +0000 Subject: [PATCH 082/114] 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 6c8a637..fbfe8aa 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := git 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 dc9ff0d4c3e0183dd11c23531f7439e1891f29af Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 27 Nov 2009 03:10:18 +0000 Subject: [PATCH 083/114] Update to git-1.6.5.3 - Only BR perl(Error) on Fedora and RHEL >= 5 - Use config.mak to set build options - Improve compatibility with EPEL - Replace $RPM_BUILD_ROOT with %{buildroot} - Fix Obsoletes for those rebuilding on EL-4 --- .cvsignore | 2 +- git.spec | 158 ++++++++++++++++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 105 insertions(+), 57 deletions(-) diff --git a/.cvsignore b/.cvsignore index 49a8acf..57401d1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.5.2.tar.bz2 +git-1.6.5.3.tar.bz2 diff --git a/git.spec b/git.spec index dd9aff7..715c730 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,12 @@ # Pass --without docs to rpmbuild if you don't want the documentation +%if 0%{?rhel} && 0%{?rhel} <= 5 +%global gitcoredir %{_bindir} +%else +%global gitcoredir %{_libexecdir}/git-core +%endif + Name: git -Version: 1.6.5.2 +Version: 1.6.5.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -33,13 +39,21 @@ BuildRequires: zlib-devel >= 1.2 Requires: less Requires: openssh-clients +%if 0%{?fedora} || 0%{?rhel} >= 5 Requires: perl(Error) +%endif Requires: perl-Git = %{version}-%{release} Requires: rsync Requires: zlib >= 1.2 Provides: git-core = %{version}-%{release} +%if 0%{?fedora} || 0%{?rhel} >= 5 Obsoletes: git-core <= 1.5.4.3 +%else +# EL-4 has 1.5.4.7-3.el4. We don't support this, but no point making it more +# difficult than it needs to be (folks stuck on EL-4 have it bad enough ;). +Obsoletes: git-core <= 1.5.4.7-4 +%endif %description Git is a fast, scalable, distributed revision control system with an @@ -67,7 +81,13 @@ Requires: perl-Git = %{version}-%{release} Requires: emacs-git = %{version}-%{release} Requires: git-arch = %{version}-%{release} %endif +%if 0%{?fedora} || 0%{?rhel} >= 5 Obsoletes: git <= 1.5.4.3 +%else +# EL-4 has 1.5.4.7-3.el4. We don't support this, but no point making it more +# difficult than it needs to be (folks stuck on EL-4 have it bad enough ;). +Obsoletes: git <= 1.5.4.7-4 +%endif %description all Git is a fast, scalable, distributed revision control system with an @@ -111,7 +131,10 @@ Group: Development/Tools %if 0%{?fedora} >= 10 BuildArch: noarch %endif -Requires: git = %{version}-%{release}, cvs, cvsps +Requires: git = %{version}-%{release}, cvs +%if 0%{?fedora} || 0%{?rhel} >= 5 +Requires: cvsps +%endif %description cvs Git tools for importing CVS repositories. @@ -134,7 +157,10 @@ Group: Development/Tools BuildArch: noarch %endif Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} -Requires: perl(Net::SMTP::SSL), perl(Authen::SASL) +Requires: perl(Authen::SASL) +%if 0%{?fedora} || 0%{?rhel} >= 5 +Requires: perl(Net::SMTP::SSL) +%endif %description email Git tools for sending email. @@ -165,9 +191,12 @@ Group: Development/Libraries %if 0%{?fedora} >= 10 BuildArch: noarch %endif -Requires: git = %{version}-%{release}, perl(Error) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: git = %{version}-%{release} +%if 0%{?fedora} || 0%{?rhel} >= 5 BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) +Requires: perl(Error) +%endif +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -n perl-Git Perl interface to Git. @@ -193,16 +222,27 @@ Requires: git = %{version}-%{release}, emacs-common >= 22.2 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. -%define make_git \ -make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ - ASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 \\\ - BLK_SHA1=1 \\\ - ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ - DESTDIR=$RPM_BUILD_ROOT \\\ - INSTALL="install -p" \\\ - INSTALLDIRS=vendor \\\ - htmldir=%{_docdir}/%{name}-%{version} \\\ - prefix=%{_prefix} +cat << \EOF > config.mak +V = 1 +CFLAGS = %{optflags} +BLK_SHA1 = 1 +ETC_GITCONFIG = %{_sysconfdir}/gitconfig +DESTDIR = %{buildroot} +INSTALL = install -p +htmldir = %{_docdir}/%{name}-%{version} +prefix = %{_prefix} +EOF + +%if 0%{?fedora} +cat << \EOF >> config.mak +ASCIIDOC8 = 1 +ASCIIDOC_NO_ROFF = 1 +EOF +%endif + +%if 0%{?rhel} && 0%{?rhel} <= 5 +echo gitexecdir = %{_bindir} >> config.mak +%endif # Filter bogus perl requires # packed-refs comes from a comment in contrib/hooks/update-paranoid @@ -216,7 +256,7 @@ EOF chmod +x %{__perl_requires} %build -%{make_git} all %{!?_without_docs: doc} +make %{?_smp_mflags} all %{!?_without_docs: doc} %if 0%{?fedora} make -C contrib/emacs @@ -226,53 +266,53 @@ make -C contrib/emacs sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash %install -rm -rf $RPM_BUILD_ROOT -%{make_git} install %{!?_without_docs: install-doc} +rm -rf %{buildroot} +make %{?_smp_mflags} INSTALLDIRS=vendor install %{!?_without_docs: install-doc} %if 0%{?fedora} make -C contrib/emacs install \ - emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp -for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do + emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp +for elc in %{buildroot}%{_datadir}/emacs/site-lisp/*.elc ; do install -pm 644 contrib/emacs/$(basename $elc .elc).el \ - $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp + %{buildroot}%{_datadir}/emacs/site-lisp done install -Dpm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/git-init.el + %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d/git-init.el %endif -mkdir -p $RPM_BUILD_ROOT%{_var}/www/git -install -pm 644 gitweb/*.png gitweb/*.css $RPM_BUILD_ROOT%{_var}/www/git -install -pm 755 gitweb/gitweb.cgi $RPM_BUILD_ROOT%{_var}/www/git -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d -install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf +mkdir -p %{buildroot}%{_var}/www/git +install -pm 644 gitweb/*.png gitweb/*.css %{buildroot}%{_var}/www/git +install -pm 755 gitweb/gitweb.cgi %{buildroot}%{_var}/www/git +mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d +install -pm 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/httpd/conf.d/git.conf -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' +find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';' +find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' %if ! 0%{?fedora} -find $RPM_BUILD_ROOT Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' +find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' %endif -(find $RPM_BUILD_ROOT{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citooli|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files -(find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files +(find %{buildroot}{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^%{buildroot}@@) > bin-man-doc-files +(find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) >> perl-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find %{buildroot}%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files %else -rm -rf $RPM_BUILD_ROOT%{_mandir} +rm -rf %{buildroot}%{_mandir} %endif -mkdir -p $RPM_BUILD_ROOT%{_var}/lib/git -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d -install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/git +mkdir -p %{buildroot}%{_var}/lib/git +mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d +install -pm 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/git -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d -install -pm 644 contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git +mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d +install -pm 644 contrib/completion/git-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/git # Move contrib/hooks out of %%docdir and make them executable -mkdir -p $RPM_BUILD_ROOT%{_datadir}/git-core/contrib -mv contrib/hooks $RPM_BUILD_ROOT%{_datadir}/git-core/contrib -chmod +x $RPM_BUILD_ROOT%{_datadir}/git-core/contrib/hooks/* +mkdir -p %{buildroot}%{_datadir}/git-core/contrib +mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib +chmod +x %{buildroot}%{_datadir}/git-core/contrib/hooks/* pushd contrib > /dev/null ln -s ../../../git-core/contrib/hooks popd > /dev/null @@ -282,24 +322,24 @@ desktop-file-install \ %if 0%{?rhel} && 0%{?rhel} <= 5 --vendor fedora \ %endif - --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE4} + --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} # quiet some rpmlint complaints -chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/git-core/* -chmod a-x $RPM_BUILD_ROOT%{_libexecdir}/git-core/git-mergetool--lib +chmod -R g-w %{buildroot} +find %{buildroot} -name git-mergetool--lib | xargs chmod a-x rm -f {Documentation/technical,contrib/emacs}/.gitignore chmod a-x Documentation/technical/api-index.sh find contrib -type f | xargs chmod -x %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files -f bin-man-doc-files %defattr(-,root,root) %{_datadir}/git-core/ -%dir %{_libexecdir}/git-core/ +%dir %{gitcoredir} %doc README COPYING Documentation/*.txt contrib/ %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} @@ -308,7 +348,7 @@ rm -rf $RPM_BUILD_ROOT %files svn %defattr(-,root,root) -%{_libexecdir}/git-core/*svn* +%{gitcoredir}/*svn* %doc Documentation/*svn*.txt %{!?_without_docs: %{_mandir}/man1/*svn*.1*} %{!?_without_docs: %doc Documentation/*svn*.html } @@ -317,7 +357,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc Documentation/*git-cvs*.txt %{_bindir}/git-cvsserver -%{_libexecdir}/git-core/*cvs* +%{gitcoredir}/*cvs* %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %doc Documentation/*git-cvs*.html } @@ -325,7 +365,7 @@ rm -rf $RPM_BUILD_ROOT %files arch %defattr(-,root,root) %doc Documentation/git-archimport.txt -%{_libexecdir}/git-core/git-archimport +%{gitcoredir}/git-archimport %{!?_without_docs: %{_mandir}/man1/git-archimport.1*} %{!?_without_docs: %doc Documentation/git-archimport.html } %endif @@ -333,14 +373,14 @@ rm -rf $RPM_BUILD_ROOT %files email %defattr(-,root,root) %doc Documentation/*email*.txt -%{_libexecdir}/git-core/*email* +%{gitcoredir}/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } %files gui %defattr(-,root,root) -%{_libexecdir}/git-core/git-gui* -%{_libexecdir}/git-core/git-citool +%{gitcoredir}/git-gui* +%{gitcoredir}/git-citool %{_datadir}/applications/*git-gui.desktop %{_datadir}/git-gui/ %{!?_without_docs: %{_mandir}/man1/git-gui.1*} @@ -371,7 +411,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc Documentation/*daemon*.txt %config(noreplace)%{_sysconfdir}/xinetd.d/git -%{_libexecdir}/git-core/git-daemon +%{gitcoredir}/git-daemon %{_var}/lib/git %{!?_without_docs: %{_mandir}/man1/*daemon*.1*} %{!?_without_docs: %doc Documentation/*daemon*.html} @@ -387,6 +427,14 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sat Nov 21 2009 Todd Zullinger - 1.6.5.3-1 +- git-1.6.5.3 +- Only BR perl(Error) on Fedora and RHEL >= 5 +- Use config.mak to set build options +- Improve compatibility with EPEL +- Replace $RPM_BUILD_ROOT with %%{buildroot} +- Fix Obsoletes for those rebuilding on EL-4 + * Mon Oct 26 2009 Todd Zullinger - 1.6.5.2-1 - git-1.6.5.2 - Drop asciidoc --unsafe option, it should not be needed anymore diff --git a/sources b/sources index acbb4bd..f3afea8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99708c449b23433136dbdfa38bd16d80 git-1.6.5.2.tar.bz2 +a1dbc3da46cbf33c4367db689853c142 git-1.6.5.3.tar.bz2 From 5d53d5203f5327e58155f012eaeaea5f142cca55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Sun, 6 Dec 2009 23:09:37 +0000 Subject: [PATCH 084/114] - rebuild against perl 5.10.1 --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 715c730..131c238 100644 --- a/git.spec +++ b/git.spec @@ -7,7 +7,7 @@ Name: git Version: 1.6.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -427,6 +427,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Dec 4 2009 Stepan Kasal - 1.6.5.3-2 +- rebuild against perl 5.10.1 + * Sat Nov 21 2009 Todd Zullinger - 1.6.5.3-1 - git-1.6.5.3 - Only BR perl(Error) on Fedora and RHEL >= 5 From bc3e0f7744b2115f79a5acbcab5e1a52de0d7b89 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 7 Dec 2009 15:11:59 +0000 Subject: [PATCH 085/114] Update to git-1.6.5.5 Fixes bug 543481 (Unsubstituted Docbook parameters in git manpages) --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 57401d1..2aae902 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.5.3.tar.bz2 +git-1.6.5.5.tar.bz2 diff --git a/git.spec b/git.spec index 131c238..9e87ad3 100644 --- a/git.spec +++ b/git.spec @@ -6,8 +6,8 @@ %endif Name: git -Version: 1.6.5.3 -Release: 2%{?dist} +Version: 1.6.5.5 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -427,6 +427,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sun Dec 06 2009 Todd Zullinger - 1.6.5.5-1 +- git-1.6.5.5 + * Fri Dec 4 2009 Stepan Kasal - 1.6.5.3-2 - rebuild against perl 5.10.1 diff --git a/sources b/sources index f3afea8..a25dd1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1dbc3da46cbf33c4367db689853c142 git-1.6.5.3.tar.bz2 +fd575f22e67adbea1d17e5bc66a80f8d git-1.6.5.5.tar.bz2 From 64dae55e57e4bb99220dd179267e8d92f7bb5bd1 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 24 Dec 2009 13:38:47 +0000 Subject: [PATCH 086/114] Update to git-1.6.6 --- .cvsignore | 2 +- git.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2aae902..1255b84 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.5.5.tar.bz2 +git-1.6.6.tar.bz2 diff --git a/git.spec b/git.spec index 9e87ad3..fb9918a 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.6.5.5 +Version: 1.6.6 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -427,6 +427,12 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Dec 23 2009 Todd Zullinger - 1.6.6-1 +- git-1.6.6 + +* Fri Dec 11 2009 Todd Zullinger - 1.6.5.6-1 +- git-1.6.5.6 + * Sun Dec 06 2009 Todd Zullinger - 1.6.5.5-1 - git-1.6.5.5 diff --git a/sources b/sources index a25dd1c..e075050 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd575f22e67adbea1d17e5bc66a80f8d git-1.6.5.5.tar.bz2 +25e4bcdc528b3ffadc6e59908a513881 git-1.6.6.tar.bz2 From 68affad56786d410729dbee27c54b3a3fc409522 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 31 Jan 2010 21:05:27 +0000 Subject: [PATCH 087/114] Update to git-1.6.6.1 - Use %{gitcoredir}/git-daemon as xinetd server option, for SELinux (#529682) - Make %{_var}/lib/git the default gitweb projectroot (#556299) - Include gitweb/INSTALL file as documentation, the gitweb README refers to it - Ship a short example gitweb config file (%{_sysconfdir}/gitweb.conf) - Remove long fixed xinetd IPv6 workaround on Fedora (#557528) - Install missing gitweb.js (#558740) --- git.spec | 39 +++++++++++++++++++++++++++++-------- git.xinetd | 16 --------------- git.xinetd.in | 14 +++++++++++++ gitweb.conf.in | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 24 deletions(-) delete mode 100644 git.xinetd create mode 100644 git.xinetd.in create mode 100644 gitweb.conf.in diff --git a/git.spec b/git.spec index fb9918a..3daf682 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.6.6 +Version: 1.6.6.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -14,9 +14,10 @@ Group: Development/Tools URL: http://git-scm.com/ Source0: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2 Source1: git-init.el -Source2: git.xinetd +Source2: git.xinetd.in Source3: git.conf.httpd Source4: git-gui.desktop +Source5: gitweb.conf.in Patch0: git-1.5-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch @@ -229,6 +230,7 @@ BLK_SHA1 = 1 ETC_GITCONFIG = %{_sysconfdir}/gitconfig DESTDIR = %{buildroot} INSTALL = install -p +GITWEB_PROJECTROOT = %{_var}/lib/git htmldir = %{_docdir}/%{name}-%{version} prefix = %{_prefix} EOF @@ -281,10 +283,12 @@ install -Dpm 644 %{SOURCE1} \ %endif mkdir -p %{buildroot}%{_var}/www/git -install -pm 644 gitweb/*.png gitweb/*.css %{buildroot}%{_var}/www/git +install -pm 644 gitweb/*.{css,js,png} %{buildroot}%{_var}/www/git install -pm 755 gitweb/gitweb.cgi %{buildroot}%{_var}/www/git -mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d -install -pm 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/httpd/conf.d/git.conf +mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d +install -pm 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf +sed "s|@PROJECTROOT@|%{_var}/lib/git|g" \ + %{SOURCE5} > %{buildroot}%{_sysconfdir}/gitweb.conf find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';' @@ -304,7 +308,16 @@ rm -rf %{buildroot}%{_mandir} mkdir -p %{buildroot}%{_var}/lib/git mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d -install -pm 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/git +# On EL <= 5, xinetd does not enable IPv6 by default +enable_ipv6=" # xinetd does not enable IPv6 by default + flags = IPv6" +perl -p \ + -e "s|\@GITCOREDIR\@|%{gitcoredir}|g;" \ + -e "s|\@BASE_PATH\@|%{_var}/lib/git|g;" \ +%if 0%{?rhel} && 0%{?rhel} <= 5 + -e "s|^}|$enable_ipv6\n$&|;" \ +%endif + %{SOURCE2} > %{buildroot}%{_sysconfdir}/xinetd.d/git mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d install -pm 644 contrib/completion/git-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/git @@ -418,15 +431,25 @@ rm -rf %{buildroot} %files -n gitweb %defattr(-,root,root) -%doc gitweb/README -%{_var}/www/git/ +%doc gitweb/INSTALL gitweb/README +%config(noreplace)%{_sysconfdir}/gitweb.conf %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf +%{_var}/www/git/ %files all # No files for you! %changelog +* Tue Jan 26 2010 Todd Zullinger - 1.6.6.1-1 +- git-1.6.6.1 +- Use %%{gitcoredir}/git-daemon as xinetd server option, for SELinux (#529682) +- Make %%{_var}/lib/git the default gitweb projectroot (#556299) +- Include gitweb/INSTALL file as documentation, the gitweb README refers to it +- Ship a short example gitweb config file (%%{_sysconfdir}/gitweb.conf) +- Remove long fixed xinetd IPv6 workaround on Fedora (#557528) +- Install missing gitweb.js (#558740) + * Wed Dec 23 2009 Todd Zullinger - 1.6.6-1 - git-1.6.6 diff --git a/git.xinetd b/git.xinetd deleted file mode 100644 index 6c9933d..0000000 --- a/git.xinetd +++ /dev/null @@ -1,16 +0,0 @@ -# default: off -# description: The git dæmon allows git repositories to be exported using \ -# the git:// protocol. - -service git -{ - disable = yes - socket_type = stream - wait = no - user = nobody - server = /usr/bin/git - server_args = daemon --base-path=/var/lib/git --export-all --user-path=public_git --syslog --inetd --verbose - log_on_failure += USERID -# xinetd doesn't do this by default. bug #195265 - flags = IPv6 -} diff --git a/git.xinetd.in b/git.xinetd.in new file mode 100644 index 0000000..540e070 --- /dev/null +++ b/git.xinetd.in @@ -0,0 +1,14 @@ +# default: off +# description: The git dæmon allows git repositories to be exported using \ +# the git:// protocol. + +service git +{ + disable = yes + socket_type = stream + wait = no + user = nobody + server = @GITCOREDIR@/git-daemon + server_args = --base-path=@BASE_PATH@ --export-all --user-path=public_git --syslog --inetd --verbose + log_on_failure += USERID +} diff --git a/gitweb.conf.in b/gitweb.conf.in new file mode 100644 index 0000000..c04a96b --- /dev/null +++ b/gitweb.conf.in @@ -0,0 +1,53 @@ +# The gitweb config file is a fragment of perl code. You can set variables +# using "our $variable = value"; text from "#" character until the end of a +# line is ignored. See perlsyn(1) man page for details. +# +# See /usr/share/doc/gitweb-*/README and /usr/share/doc/gitweb-*/INSTALL for +# more details and available configuration variables. + +# Set the path to git projects. This is an absolute filesystem path which will +# be prepended to the project path. +#our $projectroot = "@PROJECTROOT@"; + +# Set the list of git base URLs used for URL to where fetch project from, i.e. +# the full URL is "$git_base_url/$project". By default this is empty +#our @git_base_url_list = qw(git://git.example.com +# ssh://git.example.com@PROJECTROOT@); + +# Enable the 'blame' blob view, showing the last commit that modified +# each line in the file. This can be very CPU-intensive. Disabled by default +#$feature{'blame'}{'default'} = [1]; +# +# Allow projects to override the default setting via git config file. +# Example: gitweb.blame = 0|1; +#$feature{'blame'}{'override'} = 1; + +# Disable the 'snapshot' link, providing a compressed archive of any tree. This +# can potentially generate high traffic if you have large project. Enabled for +# .tar.gz snapshots by default. +# +# Value is a list of formats defined in %known_snapshot_formats that you wish +# to offer. +#$feature{'snapshot'}{'default'} = []; +# +# Allow projects to override the default setting via git config file. +# Example: gitweb.snapshot = tbz2,zip; (use "none" to disable) +#$feature{'snapshot'}{'override'} = 1; + +# Disable grep search, which will list the files in currently selected tree +# containing the given string. This can be potentially CPU-intensive, of +# course. Enabled by default. +#$feature{'grep'}{'default'} = [0]; +# +# Allow projects to override the default setting via git config file. +# Example: gitweb.grep = 0|1; +#$feature{'grep'}{'override'} = 1; + +# Disable the pickaxe search, which will list the commits that modified a given +# string in a file. This can be practical and quite faster alternative to +# 'blame', but still potentially CPU-intensive. Enabled by default. +#$feature{'pickaxe'}{'default'} = [0]; +# +# Allow projects to override the default setting via git config file. +# Example: gitweb.pickaxe = 0|1; +#$feature{'pickaxe'}{'override'} = 1; From f31fb739f4238e9ba0c827313788ce0d0b41a8ec Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 31 Jan 2010 21:24:39 +0000 Subject: [PATCH 088/114] Add git-1.6.6.1 tarball --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1255b84..707db7c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.6.tar.bz2 +git-1.6.6.1.tar.bz2 diff --git a/sources b/sources index e075050..5ca3aac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -25e4bcdc528b3ffadc6e59908a513881 git-1.6.6.tar.bz2 +9d254bfdae56c6fa124d8a1312a1b034 git-1.6.6.1.tar.bz2 From 78783483c5c7d85804642e43d8b5a8ebf43742e8 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 15 Feb 2010 00:47:41 +0000 Subject: [PATCH 089/114] Update to git-1.7.0 - Link imap-send with libcrypto (#565147) - Disable building of unused python remote helper libs --- .cvsignore | 2 +- git.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 707db7c..b2eda6f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.6.6.1.tar.bz2 +git-1.7.0.tar.bz2 diff --git a/git.spec b/git.spec index 3daf682..a432c06 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.6.6.1 +Version: 1.7.0 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -227,6 +227,8 @@ cat << \EOF > config.mak V = 1 CFLAGS = %{optflags} BLK_SHA1 = 1 +NEEDS_CRYPTO_WITH_SSL = 1 +NO_PYTHON = 1 ETC_GITCONFIG = %{_sysconfdir}/gitconfig DESTDIR = %{buildroot} INSTALL = install -p @@ -441,6 +443,11 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sat Feb 13 2010 Todd Zullinger - 1.7.0-1 +- git-1.7.0 +- Link imap-send with libcrypto (#565147) +- Disable building of unused python remote helper libs + * Tue Jan 26 2010 Todd Zullinger - 1.6.6.1-1 - git-1.6.6.1 - Use %%{gitcoredir}/git-daemon as xinetd server option, for SELinux (#529682) diff --git a/sources b/sources index 5ca3aac..9992ad3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9d254bfdae56c6fa124d8a1312a1b034 git-1.6.6.1.tar.bz2 +c7553b73e2156d187ece6ba936ae30ab git-1.7.0.tar.bz2 From d5e5b3bd578fc7e395378a2b9f68d0ef5dfeb8a5 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 1 Mar 2010 14:16:42 +0000 Subject: [PATCH 090/114] Update to git-1.7.0.1 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b2eda6f..3c2b4ea 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.7.0.tar.bz2 +git-1.7.0.1.tar.bz2 diff --git a/git.spec b/git.spec index a432c06..79793cd 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.0 +Version: 1.7.0.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -443,6 +443,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Mar 01 2010 Todd Zullinger - 1.7.0.1-1 +- git-1.7.0.1 + * Sat Feb 13 2010 Todd Zullinger - 1.7.0-1 - git-1.7.0 - Link imap-send with libcrypto (#565147) diff --git a/sources b/sources index 9992ad3..a0c39d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c7553b73e2156d187ece6ba936ae30ab git-1.7.0.tar.bz2 +c4315200efc90ea0f243cf0e86cda1f1 git-1.7.0.1.tar.bz2 From 011aa9301e7263a32d8b125a29f1c77795ef6238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Thu, 29 Apr 2010 11:28:02 +0000 Subject: [PATCH 091/114] - Mass rebuild with perl-5.12.0 --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 79793cd..9c7440e 100644 --- a/git.spec +++ b/git.spec @@ -7,7 +7,7 @@ Name: git Version: 1.7.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -443,6 +443,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Apr 29 2010 Marcela Maslanova - 1.7.0.1-2 +- Mass rebuild with perl-5.12.0 + * Mon Mar 01 2010 Todd Zullinger - 1.7.0.1-1 - git-1.7.0.1 From 77b1a5d6f6370300949ae6cd0332e0a82d48589e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 20 May 2010 15:56:11 +0000 Subject: [PATCH 092/114] Update to git-1.7.1 - Fix conditionals for EL-6 - Comply with Emacs add-on packaging guidelines (#573423), Jonathan Underwood - Place elisp source files in separate emacs-git-el package - Place git support files in own directory under site-lisp - Use Emacs packaging macros --- .cvsignore | 2 +- git.spec | 83 ++++++++++++++++++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 54 insertions(+), 33 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3c2b4ea..74d9875 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.7.0.1.tar.bz2 +git-1.7.1.tar.bz2 diff --git a/git.spec b/git.spec index 9c7440e..90a0137 100644 --- a/git.spec +++ b/git.spec @@ -6,8 +6,8 @@ %endif Name: git -Version: 1.7.0.1 -Release: 2%{?dist} +Version: 1.7.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -26,7 +26,7 @@ Patch2: git-1.6-update-contrib-hooks-path.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 BuildRequires: emacs >= 22.2 BuildRequires: libcurl-devel %else @@ -68,19 +68,21 @@ SCMs, install the git-all meta-package. %package all Summary: Meta-package to pull in all git tools Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release} -Requires: git-svn = %{version}-%{release} +%if 0%{?fedora} +Requires: git-arch = %{version}-%{release} +%endif Requires: git-cvs = %{version}-%{release} Requires: git-email = %{version}-%{release} -Requires: gitk = %{version}-%{release} Requires: git-gui = %{version}-%{release} +Requires: git-svn = %{version}-%{release} +Requires: gitk = %{version}-%{release} Requires: perl-Git = %{version}-%{release} -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 Requires: emacs-git = %{version}-%{release} -Requires: git-arch = %{version}-%{release} %endif %if 0%{?fedora} || 0%{?rhel} >= 5 Obsoletes: git <= 1.5.4.3 @@ -107,7 +109,7 @@ The git dæmon for supporting git:// access to git repositories %package -n gitweb Summary: Simple web interface to git repositories Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release} @@ -119,7 +121,7 @@ Simple web interface to track changes in git repositories %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release}, subversion, perl(Term::ReadKey) @@ -129,7 +131,7 @@ Git tools for importing Subversion repositories. %package cvs Summary: Git tools for importing CVS repositories Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release}, cvs @@ -143,9 +145,7 @@ Git tools for importing CVS repositories. %package arch Summary: Git tools for importing Arch repositories Group: Development/Tools -%if 0%{?fedora} >= 10 BuildArch: noarch -%endif Requires: git = %{version}-%{release}, tla %description arch Git tools for importing Arch repositories. @@ -154,7 +154,7 @@ Git tools for importing Arch repositories. %package email Summary: Git tools for sending email Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} @@ -168,7 +168,7 @@ Git tools for sending email. %package gui Summary: Git GUI tool Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release}, tk >= 8.4 @@ -179,7 +179,7 @@ Git GUI tool. %package -n gitk Summary: Git revision tree visualiser Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release}, tk >= 8.4 @@ -189,7 +189,7 @@ Git revision tree visualiser. %package -n perl-Git Summary: Perl interface to Git Group: Development/Libraries -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release} @@ -202,17 +202,24 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi %description -n perl-Git Perl interface to Git. -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 %package -n emacs-git Summary: Git version control system support for Emacs Group: Applications/Editors -%if 0%{?fedora} >= 10 BuildArch: noarch -%endif -Requires: git = %{version}-%{release}, emacs-common >= 22.2 +Requires: git = %{version}-%{release}, emacs(bin) >= %{_emacs_version} %description -n emacs-git %{summary}. + +%package -n emacs-git-el +Summary: Elisp source files for git version control system support for Emacs +Group: Applications/Editors +BuildArch: noarch +Requires: emacs-git = %{version}-%{release} + +%description -n emacs-git-el +%{summary}. %endif %prep @@ -237,7 +244,7 @@ htmldir = %{_docdir}/%{name}-%{version} prefix = %{_prefix} EOF -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 cat << \EOF >> config.mak ASCIIDOC8 = 1 ASCIIDOC_NO_ROFF = 1 @@ -262,7 +269,7 @@ chmod +x %{__perl_requires} %build make %{?_smp_mflags} all %{!?_without_docs: doc} -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 make -C contrib/emacs %endif @@ -273,15 +280,16 @@ sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash rm -rf %{buildroot} make %{?_smp_mflags} INSTALLDIRS=vendor install %{!?_without_docs: install-doc} -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 +%global elispdir %{_emacs_sitelispdir}/git make -C contrib/emacs install \ - emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp -for elc in %{buildroot}%{_datadir}/emacs/site-lisp/*.elc ; do + emacsdir=%{buildroot}%{elispdir} +for elc in %{buildroot}%{elispdir}/*.elc ; do install -pm 644 contrib/emacs/$(basename $elc .elc).el \ - %{buildroot}%{_datadir}/emacs/site-lisp + %{buildroot}%{elispdir} done install -Dpm 644 %{SOURCE1} \ - %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d/git-init.el + %{buildroot}%{_emacs_sitestartdir}/git-init.el %endif mkdir -p %{buildroot}%{_var}/www/git @@ -414,12 +422,17 @@ rm -rf %{buildroot} %files -n perl-Git -f perl-files %defattr(-,root,root) -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 %files -n emacs-git %defattr(-,root,root) %doc contrib/emacs/README -%{_datadir}/emacs/site-lisp/*git*.el* -%{_datadir}/emacs/site-lisp/site-start.d/git-init.el +%dir %{elispdir} +%{elispdir}/*.elc +%{_emacs_sitestartdir}/git-init.el + +%files -n emacs-git-el +%defattr(-,root,root) +%{elispdir}/*.el %endif %files daemon @@ -443,6 +456,14 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue May 04 2010 Todd Zullinger - 1.7.1-1 +- git-1.7.1 +- Fix conditionals for EL-6 +- Comply with Emacs add-on packaging guidelines (#573423), Jonathan Underwood + - Place elisp source files in separate emacs-git-el package + - Place git support files in own directory under site-lisp + - Use Emacs packaging macros + * Thu Apr 29 2010 Marcela Maslanova - 1.7.0.1-2 - Mass rebuild with perl-5.12.0 diff --git a/sources b/sources index a0c39d8..2c3f8d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c4315200efc90ea0f243cf0e86cda1f1 git-1.7.0.1.tar.bz2 +3da231dbe82ad103373cb530ae7475d5 git-1.7.1.tar.bz2 From 7fef5735cfe284c05ded4ec79975c0491f6b24ad Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 25 Jun 2010 18:20:55 +0000 Subject: [PATCH 093/114] - rebuild against new perl --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 90a0137..232ae75 100644 --- a/git.spec +++ b/git.spec @@ -7,7 +7,7 @@ Name: git Version: 1.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -456,6 +456,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Jun 25 2010 Adam Tkac - 1.7.1-2 +- rebuild against new perl + * Tue May 04 2010 Todd Zullinger - 1.7.1-1 - git-1.7.1 - Fix conditionals for EL-6 From bb50e46edd9939c6b316845ecd066964f0e2864d Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 2 Jul 2010 13:29:19 +0000 Subject: [PATCH 094/114] - update to 1.7.1.1 --- .cvsignore | 2 +- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 74d9875..393c4f7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.7.1.tar.bz2 +git-1.7.1.1.tar.bz2 diff --git a/git.spec b/git.spec index 232ae75..9f658cc 100644 --- a/git.spec +++ b/git.spec @@ -6,8 +6,8 @@ %endif Name: git -Version: 1.7.1 -Release: 2%{?dist} +Version: 1.7.1.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -456,6 +456,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Jul 02 2010 Adam Tkac - 1.7.1.1-1 +- update to 1.7.1.1 + * Fri Jun 25 2010 Adam Tkac - 1.7.1-2 - rebuild against new perl diff --git a/sources b/sources index 2c3f8d4..4184383 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3da231dbe82ad103373cb530ae7475d5 git-1.7.1.tar.bz2 +1b116a3e2ecce46a89e4272abf0de955 git-1.7.1.1.tar.bz2 From 8c3bcd12a1a3f7397765733963007ae98ed53bfa Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 22 Jul 2010 11:09:55 +0000 Subject: [PATCH 095/114] - update to 1.7.2 --- .cvsignore | 2 +- git-1.5-gitweb-home-link.patch | 9 +++++---- git.spec | 9 +++++---- sources | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 393c4f7..e23ad7a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.7.1.1.tar.bz2 +git-1.7.2.tar.bz2 diff --git a/git-1.5-gitweb-home-link.patch b/git-1.5-gitweb-home-link.patch index cd36563..74c8390 100644 --- a/git-1.5-gitweb-home-link.patch +++ b/git-1.5-gitweb-home-link.patch @@ -1,7 +1,8 @@ ---- git-1.5.0.6/gitweb/gitweb.perl~ 2007-03-30 01:37:05.000000000 +0100 -+++ git-1.5.0.6/gitweb/gitweb.perl 2007-05-07 08:31:37.000000000 +0100 -@@ -39,7 +39,7 @@ our $projectroot = "++GITWEB_PROJECTROOT - our $home_link = $my_uri || "/"; +diff -up git-1.7.2/gitweb/gitweb.perl.orig git-1.7.2/gitweb/gitweb.perl +--- git-1.7.2/gitweb/gitweb.perl.orig 2010-07-21 23:35:25.000000000 +0200 ++++ git-1.7.2/gitweb/gitweb.perl 2010-07-22 10:49:50.385707086 +0200 +@@ -79,7 +79,7 @@ our $projectroot = "++GITWEB_PROJECTROOT + our $project_maxdepth = "++GITWEB_PROJECT_MAXDEPTH++"; # string of the home link on top of all pages -our $home_link_str = "++GITWEB_HOME_LINK_STR++"; diff --git a/git.spec b/git.spec index 9f658cc..2fe57fa 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.1.1 +Version: 1.7.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -242,6 +242,7 @@ INSTALL = install -p GITWEB_PROJECTROOT = %{_var}/lib/git htmldir = %{_docdir}/%{name}-%{version} prefix = %{_prefix} +gitwebdir = %{_var}/www/git EOF %if 0%{?fedora} || 0%{?rhel} >= 6 @@ -292,9 +293,6 @@ install -Dpm 644 %{SOURCE1} \ %{buildroot}%{_emacs_sitestartdir}/git-init.el %endif -mkdir -p %{buildroot}%{_var}/www/git -install -pm 644 gitweb/*.{css,js,png} %{buildroot}%{_var}/www/git -install -pm 755 gitweb/gitweb.cgi %{buildroot}%{_var}/www/git mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf sed "s|@PROJECTROOT@|%{_var}/lib/git|g" \ @@ -456,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jul 22 2010 Adam Tkac - 1.7.2-1 +- update to 1.7.2 + * Fri Jul 02 2010 Adam Tkac - 1.7.1.1-1 - update to 1.7.1.1 diff --git a/sources b/sources index 4184383..188db10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b116a3e2ecce46a89e4272abf0de955 git-1.7.1.1.tar.bz2 +652f861ae161e48979ef834707e2dc4c git-1.7.2.tar.bz2 From 012e1b5c7c5a32b104d9878e9e257d71cc25f54a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:41:35 +0000 Subject: [PATCH 096/114] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 fbfe8aa..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: git -# $Id$ -NAME := git -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) From 4764d30f286c50e99c7b13afa7488fee5d9a0287 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 30 Jul 2010 10:15:19 -0400 Subject: [PATCH 097/114] Update to git-1.7.2.1 --- .gitignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e23ad7a..1dd8967 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -git-1.7.2.tar.bz2 +git-1.7.2.1.tar.bz2 diff --git a/git.spec b/git.spec index 2fe57fa..3b15654 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.2 +Version: 1.7.2.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jul 29 2010 Todd Zullinger - 1.7.2.1-1 +- Update to git-1.7.2.1 + * Thu Jul 22 2010 Adam Tkac - 1.7.2-1 - update to 1.7.2 diff --git a/sources b/sources index 188db10..c6e2468 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -652f861ae161e48979ef834707e2dc4c git-1.7.2.tar.bz2 +24a443a120a0ab372185cb6bc0dbd934 git-1.7.2.1.tar.bz2 From 383e396ac5599f312be817126ef2e195939338ca Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Fri, 30 Jul 2010 22:52:13 +0200 Subject: [PATCH 098/114] cherry-pick: "Do not unquote + into ' ' in URLs" There are problems with this bug in dist-git. --- git-1.7.2.1-730220de.patch | 86 ++++++++++++++++++++++++++++++++++++++ git.spec | 9 +++- 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 git-1.7.2.1-730220de.patch diff --git a/git-1.7.2.1-730220de.patch b/git-1.7.2.1-730220de.patch new file mode 100644 index 0000000..fdf4d2e --- /dev/null +++ b/git-1.7.2.1-730220de.patch @@ -0,0 +1,86 @@ +commit 730220de8be669257287e9a1f5dde349ace5426a +Author: Thomas Rast +Date: Sat Jul 24 16:49:04 2010 +0200 + + Do not unquote + into ' ' in URLs + + Since 9d2e942 (decode file:// and ssh:// URLs, 2010-05-23) the URL + logic unquotes escaped URLs. For the %2B type of escape, this is + conformant with RFC 2396. However, it also unquotes + into a space + character, which is only appropriate for the query strings in HTTP. + This notably broke fetching from the gtk+ repository. + + We cannot just remove the corresponding code since the same + url_decode_internal() is also used by the HTTP backend to decode query + parameters. Introduce a new argument that controls whether the + + decoding happens, and use it only in the (client-side) url_decode(). + + Reported-by: Jasper St. Pierre + Signed-off-by: Thomas Rast + Signed-off-by: Junio C Hamano + +diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh +index 8abb71a..4431dfd 100755 +--- a/t/t5601-clone.sh ++++ b/t/t5601-clone.sh +@@ -178,8 +178,14 @@ test_expect_success 'clone respects global branch.autosetuprebase' ' + + test_expect_success 'respect url-encoding of file://' ' + git init x+y && +- test_must_fail git clone "file://$PWD/x+y" xy-url && +- git clone "file://$PWD/x%2By" xy-url ++ git clone "file://$PWD/x+y" xy-url-1 && ++ git clone "file://$PWD/x%2By" xy-url-2 ++' ++ ++test_expect_success 'do not query-string-decode + in URLs' ' ++ rm -rf x+y && ++ git init "x y" && ++ test_must_fail git clone "file://$PWD/x+y" xy-no-plus + ' + + test_expect_success 'do not respect url-encoding of non-url path' ' +diff --git a/url.c b/url.c +index 2306236..cd8f74f 100644 +--- a/url.c ++++ b/url.c +@@ -67,7 +67,8 @@ static int url_decode_char(const char *q) + return val; + } + +-static char *url_decode_internal(const char **query, const char *stop_at, struct strbuf *out) ++static char *url_decode_internal(const char **query, const char *stop_at, ++ struct strbuf *out, int decode_plus) + { + const char *q = *query; + +@@ -90,7 +91,7 @@ static char *url_decode_internal(const char **query, const char *stop_at, struct + } + } + +- if (c == '+') ++ if (decode_plus && c == '+') + strbuf_addch(out, ' '); + else + strbuf_addch(out, c); +@@ -110,17 +111,17 @@ char *url_decode(const char *url) + strbuf_add(&out, url, colon - url); + url = colon; + } +- return url_decode_internal(&url, NULL, &out); ++ return url_decode_internal(&url, NULL, &out, 0); + } + + char *url_decode_parameter_name(const char **query) + { + struct strbuf out = STRBUF_INIT; +- return url_decode_internal(query, "&=", &out); ++ return url_decode_internal(query, "&=", &out, 1); + } + + char *url_decode_parameter_value(const char **query) + { + struct strbuf out = STRBUF_INIT; +- return url_decode_internal(query, "&", &out); ++ return url_decode_internal(query, "&", &out, 1); + } diff --git a/git.spec b/git.spec index 3b15654..3be1405 100644 --- a/git.spec +++ b/git.spec @@ -7,7 +7,7 @@ Name: git Version: 1.7.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -23,6 +23,9 @@ Patch0: git-1.5-gitweb-home-link.patch Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/500137 Patch2: git-1.6-update-contrib-hooks-path.patch +# Do not unquote + into ' ' in URLs +# cherry-picked from upstream +Patch3: git-1.7.2.1-730220de.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -227,6 +230,7 @@ Requires: emacs-git = %{version}-%{release} %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -454,6 +458,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Jul 30 2010 Thomas Spura - 1.7.2.1-2 +- cherry-pick: "Do not unquote + into ' ' in URLs" + * Thu Jul 29 2010 Todd Zullinger - 1.7.2.1-1 - Update to git-1.7.2.1 From 71a8c911be9b871bb73673abd2c2f715962038e0 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 20 Aug 2010 10:55:54 +0200 Subject: [PATCH 099/114] Update to 1.7.2.2. Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1dd8967..51ec344 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ git-1.7.2.1.tar.bz2 +/git-1.7.2.2.tar.bz2 diff --git a/git.spec b/git.spec index 3be1405..48f52a7 100644 --- a/git.spec +++ b/git.spec @@ -6,8 +6,8 @@ %endif Name: git -Version: 1.7.2.1 -Release: 2%{?dist} +Version: 1.7.2.2 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -458,6 +458,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Aug 20 2010 Adam Tkac - 1.7.2.2-1 +- update to 1.7.2.2 + * Fri Jul 30 2010 Thomas Spura - 1.7.2.1-2 - cherry-pick: "Do not unquote + into ' ' in URLs" diff --git a/sources b/sources index c6e2468..37117e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -24a443a120a0ab372185cb6bc0dbd934 git-1.7.2.1.tar.bz2 +4a5840b6d650692cb320eddb5ccefbaf git-1.7.2.2.tar.bz2 From d5dd393b9af6d7627f2c2c4fcda27aa40b9816c5 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Tue, 7 Sep 2010 10:14:04 +0200 Subject: [PATCH 100/114] Update to 1.7.2.3. Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 51ec344..99ca092 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ git-1.7.2.1.tar.bz2 /git-1.7.2.2.tar.bz2 +/git-1.7.2.3.tar.bz2 diff --git a/git.spec b/git.spec index 48f52a7..e3db044 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.2.2 +Version: 1.7.2.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -458,6 +458,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Sep 07 2010 Adam Tkac - 1.7.2.3-1 +- update to 1.7.2.3 + * Fri Aug 20 2010 Adam Tkac - 1.7.2.2-1 - update to 1.7.2.2 diff --git a/sources b/sources index 37117e1..461cff7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a5840b6d650692cb320eddb5ccefbaf git-1.7.2.2.tar.bz2 +d88c06f6442156686deb4b4fbab0954c git-1.7.2.3.tar.bz2 From 6d000faf2c345830839a95c24b9fe15eb890be9b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 19 Sep 2010 10:37:07 -0400 Subject: [PATCH 101/114] Update to 1.7.3 --- git-1.7.2.1-730220de.patch | 86 -------------------------------------- git.spec | 9 ++-- 2 files changed, 4 insertions(+), 91 deletions(-) delete mode 100644 git-1.7.2.1-730220de.patch diff --git a/git-1.7.2.1-730220de.patch b/git-1.7.2.1-730220de.patch deleted file mode 100644 index fdf4d2e..0000000 --- a/git-1.7.2.1-730220de.patch +++ /dev/null @@ -1,86 +0,0 @@ -commit 730220de8be669257287e9a1f5dde349ace5426a -Author: Thomas Rast -Date: Sat Jul 24 16:49:04 2010 +0200 - - Do not unquote + into ' ' in URLs - - Since 9d2e942 (decode file:// and ssh:// URLs, 2010-05-23) the URL - logic unquotes escaped URLs. For the %2B type of escape, this is - conformant with RFC 2396. However, it also unquotes + into a space - character, which is only appropriate for the query strings in HTTP. - This notably broke fetching from the gtk+ repository. - - We cannot just remove the corresponding code since the same - url_decode_internal() is also used by the HTTP backend to decode query - parameters. Introduce a new argument that controls whether the + - decoding happens, and use it only in the (client-side) url_decode(). - - Reported-by: Jasper St. Pierre - Signed-off-by: Thomas Rast - Signed-off-by: Junio C Hamano - -diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh -index 8abb71a..4431dfd 100755 ---- a/t/t5601-clone.sh -+++ b/t/t5601-clone.sh -@@ -178,8 +178,14 @@ test_expect_success 'clone respects global branch.autosetuprebase' ' - - test_expect_success 'respect url-encoding of file://' ' - git init x+y && -- test_must_fail git clone "file://$PWD/x+y" xy-url && -- git clone "file://$PWD/x%2By" xy-url -+ git clone "file://$PWD/x+y" xy-url-1 && -+ git clone "file://$PWD/x%2By" xy-url-2 -+' -+ -+test_expect_success 'do not query-string-decode + in URLs' ' -+ rm -rf x+y && -+ git init "x y" && -+ test_must_fail git clone "file://$PWD/x+y" xy-no-plus - ' - - test_expect_success 'do not respect url-encoding of non-url path' ' -diff --git a/url.c b/url.c -index 2306236..cd8f74f 100644 ---- a/url.c -+++ b/url.c -@@ -67,7 +67,8 @@ static int url_decode_char(const char *q) - return val; - } - --static char *url_decode_internal(const char **query, const char *stop_at, struct strbuf *out) -+static char *url_decode_internal(const char **query, const char *stop_at, -+ struct strbuf *out, int decode_plus) - { - const char *q = *query; - -@@ -90,7 +91,7 @@ static char *url_decode_internal(const char **query, const char *stop_at, struct - } - } - -- if (c == '+') -+ if (decode_plus && c == '+') - strbuf_addch(out, ' '); - else - strbuf_addch(out, c); -@@ -110,17 +111,17 @@ char *url_decode(const char *url) - strbuf_add(&out, url, colon - url); - url = colon; - } -- return url_decode_internal(&url, NULL, &out); -+ return url_decode_internal(&url, NULL, &out, 0); - } - - char *url_decode_parameter_name(const char **query) - { - struct strbuf out = STRBUF_INIT; -- return url_decode_internal(query, "&=", &out); -+ return url_decode_internal(query, "&=", &out, 1); - } - - char *url_decode_parameter_value(const char **query) - { - struct strbuf out = STRBUF_INIT; -- return url_decode_internal(query, "&", &out); -+ return url_decode_internal(query, "&", &out, 1); - } diff --git a/git.spec b/git.spec index e3db044..552d01f 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.2.3 +Version: 1.7.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -23,9 +23,6 @@ Patch0: git-1.5-gitweb-home-link.patch Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/500137 Patch2: git-1.6-update-contrib-hooks-path.patch -# Do not unquote + into ' ' in URLs -# cherry-picked from upstream -Patch3: git-1.7.2.1-730220de.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -230,7 +227,6 @@ Requires: emacs-git = %{version}-%{release} %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -458,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sun Sep 19 2010 Todd Zullinger - 1.7.3-1 +- Update to 1.7.3 + * Tue Sep 07 2010 Adam Tkac - 1.7.2.3-1 - update to 1.7.2.3 From f279779f02353cf0005c3154d9c83f7f8592b41e Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 19 Sep 2010 21:50:58 -0400 Subject: [PATCH 102/114] Update sources for 1.7.3 It helps to have the tarball uploaded for building. :/ --- .gitignore | 8 +++++--- sources | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 99ca092..119e105 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ -git-1.7.2.1.tar.bz2 -/git-1.7.2.2.tar.bz2 -/git-1.7.2.3.tar.bz2 +*~ +*.rpm +*.tar.bz2 +/.build*.log +/git-*/ diff --git a/sources b/sources index 461cff7..769cf95 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ d88c06f6442156686deb4b4fbab0954c git-1.7.2.3.tar.bz2 +c18eb252ce63a688071f10c3f7bc28e1 git-1.7.3.tar.bz2 From 84a8287c19caeb95affbc9ff64f1b6736ec08568 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 20 Sep 2010 15:45:41 -0400 Subject: [PATCH 103/114] Ensure the release notes are included in %doc --- git.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 552d01f..5daf800 100644 --- a/git.spec +++ b/git.spec @@ -7,7 +7,7 @@ Name: git Version: 1.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -361,7 +361,7 @@ rm -rf %{buildroot} %defattr(-,root,root) %{_datadir}/git-core/ %dir %{gitcoredir} -%doc README COPYING Documentation/*.txt contrib/ +%doc README COPYING Documentation/*.txt Documentation/RelNotes contrib/ %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} %{!?_without_docs: %doc Documentation/howto Documentation/technical} %{_sysconfdir}/bash_completion.d @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Sep 20 2010 Todd Zullinger - 1.7.3-2 +- Ensure the release notes are included in %%doc + * Sun Sep 19 2010 Todd Zullinger - 1.7.3-1 - Update to 1.7.3 From 10effb55093784aae83b9a95a19d61281f6816ff Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 29 Sep 2010 14:17:04 -0700 Subject: [PATCH 104/114] - Rebuilt for gcc bug 634757 --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 5daf800..05da8dd 100644 --- a/git.spec +++ b/git.spec @@ -7,7 +7,7 @@ Name: git Version: 1.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Sep 29 2010 jkeating - 1.7.3-3 +- Rebuilt for gcc bug 634757 + * Mon Sep 20 2010 Todd Zullinger - 1.7.3-2 - Ensure the release notes are included in %%doc From 0114f5785d46c49c1ea0afd77c37225e547a698f Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 30 Sep 2010 13:28:18 +0200 Subject: [PATCH 105/114] Update to 1.7.3.1. Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 7 +++++-- sources | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 119e105..c15bf68 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ *.tar.bz2 /.build*.log /git-*/ +/git-1.7.3.1.tar.bz2 diff --git a/git.spec b/git.spec index 05da8dd..69c989d 100644 --- a/git.spec +++ b/git.spec @@ -6,8 +6,8 @@ %endif Name: git -Version: 1.7.3 -Release: 3%{?dist} +Version: 1.7.3.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Sep 30 2010 Adam Tkac - 1.7.3.1-1 +- update to 1.7.3.1 + * Wed Sep 29 2010 jkeating - 1.7.3-3 - Rebuilt for gcc bug 634757 diff --git a/sources b/sources index 769cf95..73bb43e 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -d88c06f6442156686deb4b4fbab0954c git-1.7.2.3.tar.bz2 -c18eb252ce63a688071f10c3f7bc28e1 git-1.7.3.tar.bz2 +77e1611498919965fb65fd1f229ee155 git-1.7.3.1.tar.bz2 From 154dc10e8988763d96b89bb89589e9f2c2ee2194 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 22 Oct 2010 09:26:15 +0200 Subject: [PATCH 106/114] Update to 1.7.3.2. Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c15bf68..dbe618c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /.build*.log /git-*/ /git-1.7.3.1.tar.bz2 +/git-1.7.3.2.tar.bz2 diff --git a/git.spec b/git.spec index 69c989d..ae9268f 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.3.1 +Version: 1.7.3.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Oct 22 2010 Adam Tkac - 1.7.3.2-1 +- update to 1.7.3.2 + * Thu Sep 30 2010 Adam Tkac - 1.7.3.1-1 - update to 1.7.3.1 diff --git a/sources b/sources index 73bb43e..a5d6e61 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -77e1611498919965fb65fd1f229ee155 git-1.7.3.1.tar.bz2 +902f7f07a789fedc0d2ac03656b85969 git-1.7.3.2.tar.bz2 From 2d2f51feecddcda9ff76876423423ed12f950ed1 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 6 Dec 2010 09:29:50 +0100 Subject: [PATCH 107/114] Update to 1.7.3.3. Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dbe618c..2c7d4c2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /git-*/ /git-1.7.3.1.tar.bz2 /git-1.7.3.2.tar.bz2 +/git-1.7.3.3.tar.bz2 diff --git a/git.spec b/git.spec index ae9268f..819ec56 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.3.2 +Version: 1.7.3.3 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Dec 06 2010 Adam Tkac - 1.7.3.3-1 +- update to 1.7.3.3 + * Fri Oct 22 2010 Adam Tkac - 1.7.3.2-1 - update to 1.7.3.2 diff --git a/sources b/sources index a5d6e61..c88e80b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -902f7f07a789fedc0d2ac03656b85969 git-1.7.3.2.tar.bz2 +0430440eeb7c037afd4254bc6fd2cce8 git-1.7.3.3.tar.bz2 From 32225e93ff161082e4bbdbe506481c29a4a6a153 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 16 Dec 2010 12:59:03 +0100 Subject: [PATCH 108/114] Update to 1.7.3.4. Signed-off-by: Adam Tkac --- .gitignore | 1 + git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2c7d4c2..3134a8d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /git-1.7.3.1.tar.bz2 /git-1.7.3.2.tar.bz2 /git-1.7.3.3.tar.bz2 +/git-1.7.3.4.tar.bz2 diff --git a/git.spec b/git.spec index 819ec56..5c3f016 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.3.3 +Version: 1.7.3.4 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Dec 16 2010 Adam Tkac - 1.7.3.4-1 +- update to 1.7.3.4 + * Mon Dec 06 2010 Adam Tkac - 1.7.3.3-1 - update to 1.7.3.3 diff --git a/sources b/sources index c88e80b..f53a6a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0430440eeb7c037afd4254bc6fd2cce8 git-1.7.3.3.tar.bz2 +3a2602016f98c529cda7b9fad1a6e216 git-1.7.3.4.tar.bz2 From 7175565872d3d5970b05da32d6edd6637583c6db Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Wed, 19 Jan 2011 11:20:32 +0100 Subject: [PATCH 109/114] Update to 1.7.3.5. Signed-off-by: Adam Tkac --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 5c3f016..52dfdb9 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.3.4 +Version: 1.7.3.5 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Wed Jan 19 2011 Adam Tkac - 1.7.3.5-1 +- update to 1.7.3.5 + * Thu Dec 16 2010 Adam Tkac - 1.7.3.4-1 - update to 1.7.3.4 diff --git a/sources b/sources index f53a6a0..df61f92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a2602016f98c529cda7b9fad1a6e216 git-1.7.3.4.tar.bz2 +8a8cd93b8a4dff0a03c0fdc77253af3e git-1.7.3.5.tar.bz2 From c658997bfc79a3901c13d88559cfd48143a730ff Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 31 Jan 2011 11:48:52 +0100 Subject: [PATCH 110/114] Update to 1.7.4. Signed-off-by: Adam Tkac --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git.spec b/git.spec index 52dfdb9..6f92dfd 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.3.5 +Version: 1.7.4 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Jan 31 2011 Adam Tkac - 1.7.4-1 +- update to 1.7.4 + * Wed Jan 19 2011 Adam Tkac - 1.7.3.5-1 - update to 1.7.3.5 diff --git a/sources b/sources index df61f92..f4039d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a8cd93b8a4dff0a03c0fdc77253af3e git-1.7.3.5.tar.bz2 +fa24dc1ef0b663327ea0fe1981365b39 git-1.7.4.tar.bz2 From 8c320784c225a75d42f124148d93dafa387deebf Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 20:01:30 -0600 Subject: [PATCH 111/114] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 6f92dfd..1d2e435 100644 --- a/git.spec +++ b/git.spec @@ -7,7 +7,7 @@ Name: git Version: 1.7.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 1.7.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jan 31 2011 Adam Tkac - 1.7.4-1 - update to 1.7.4 From 031dd59158fb38095f08d84b08762143924b0e8b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 12 Feb 2011 19:42:10 -0500 Subject: [PATCH 112/114] Update to 1.7.4.1 --- .gitignore | 4 ---- git.spec | 7 +++++-- sources | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 3134a8d..119e105 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,3 @@ *.tar.bz2 /.build*.log /git-*/ -/git-1.7.3.1.tar.bz2 -/git-1.7.3.2.tar.bz2 -/git-1.7.3.3.tar.bz2 -/git-1.7.3.4.tar.bz2 diff --git a/git.spec b/git.spec index 1d2e435..b4a3751 100644 --- a/git.spec +++ b/git.spec @@ -6,8 +6,8 @@ %endif Name: git -Version: 1.7.4 -Release: 2%{?dist} +Version: 1.7.4.1 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Sun Feb 13 2011 Todd Zullinger - 1.7.4.1-1 +- Update to 1.7.4.1 + * Tue Feb 08 2011 Fedora Release Engineering - 1.7.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index f4039d1..0faef81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fa24dc1ef0b663327ea0fe1981365b39 git-1.7.4.tar.bz2 +76898de4566d11c0d0eec7e99edc2b5c git-1.7.4.1.tar.bz2 From 8b78beb4c3bf81c4e2c9c818161461a724db18f3 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 12 Feb 2011 19:53:31 -0500 Subject: [PATCH 113/114] Improve EL-5 compatibility, thanks to Kevin Fenzi for emacs testing --- git-1.7-el5-emacs-support.patch | 252 ++++++++++++++++++++++++++++++++ git.spec | 33 ++++- 2 files changed, 278 insertions(+), 7 deletions(-) create mode 100644 git-1.7-el5-emacs-support.patch diff --git a/git-1.7-el5-emacs-support.patch b/git-1.7-el5-emacs-support.patch new file mode 100644 index 0000000..25b3c31 --- /dev/null +++ b/git-1.7-el5-emacs-support.patch @@ -0,0 +1,252 @@ +From 424058e0607b4b3c558d19633090e06e7bd2b851 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Wed, 2 Feb 2011 21:24:44 -0500 +Subject: [PATCH] Restore vc-git.el for basic compatibility on EL-5 + +This is the vc-git.el from 1.6.4.1, the last version to include it. +Most uses will be better served by the vc-git.el which is provided by +emacs >= 22.2, but on EL-5 we don't have the luxury of a modern emacs. +--- + contrib/emacs/Makefile | 2 +- + contrib/emacs/vc-git.el | 216 +++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 217 insertions(+), 1 deletions(-) + create mode 100644 contrib/emacs/vc-git.el + +diff --git a/contrib/emacs/Makefile b/contrib/emacs/Makefile +index 24d9312..a48540a 100644 +--- a/contrib/emacs/Makefile ++++ b/contrib/emacs/Makefile +@@ -2,7 +2,7 @@ + + EMACS = emacs + +-ELC = git.elc git-blame.elc ++ELC = git.elc vc-git.elc git-blame.elc + INSTALL ?= install + INSTALL_ELC = $(INSTALL) -m 644 + prefix ?= $(HOME) +diff --git a/contrib/emacs/vc-git.el b/contrib/emacs/vc-git.el +new file mode 100644 +index 0000000..b8f6be5 +--- /dev/null ++++ b/contrib/emacs/vc-git.el +@@ -0,0 +1,216 @@ ++;;; vc-git.el --- VC backend for the git version control system ++ ++;; Copyright (C) 2006 Alexandre Julliard ++ ++;; This program is free software; you can redistribute it and/or ++;; modify it under the terms of the GNU General Public License as ++;; published by the Free Software Foundation; either version 2 of ++;; the License, or (at your option) any later version. ++;; ++;; This program is distributed in the hope that it will be ++;; useful, but WITHOUT ANY WARRANTY; without even the implied ++;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ++;; PURPOSE. See the GNU General Public License for more details. ++;; ++;; You should have received a copy of the GNU General Public ++;; License along with this program; if not, write to the Free ++;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++;; MA 02111-1307 USA ++ ++;;; Commentary: ++ ++;; This file contains a VC backend for the git version control ++;; system. ++;; ++;; To install: put this file on the load-path and add GIT to the list ++;; of supported backends in `vc-handled-backends'; the following line, ++;; placed in your ~/.emacs, will accomplish this: ++;; ++;; (add-to-list 'vc-handled-backends 'GIT) ++;; ++;; TODO ++;; - changelog generation ++;; - working with revisions other than HEAD ++;; ++ ++(eval-when-compile (require 'cl)) ++ ++(defvar git-commits-coding-system 'utf-8 ++ "Default coding system for git commits.") ++ ++(defun vc-git--run-command-string (file &rest args) ++ "Run a git command on FILE and return its output as string." ++ (let* ((ok t) ++ (str (with-output-to-string ++ (with-current-buffer standard-output ++ (unless (eq 0 (apply #'call-process "git" nil '(t nil) nil ++ (append args (list (file-relative-name file))))) ++ (setq ok nil)))))) ++ (and ok str))) ++ ++(defun vc-git--run-command (file &rest args) ++ "Run a git command on FILE, discarding any output." ++ (let ((name (file-relative-name file))) ++ (eq 0 (apply #'call-process "git" nil (get-buffer "*Messages") nil (append args (list name)))))) ++ ++(defun vc-git-registered (file) ++ "Check whether FILE is registered with git." ++ (with-temp-buffer ++ (let* ((dir (file-name-directory file)) ++ (name (file-relative-name file dir))) ++ (and (ignore-errors ++ (when dir (cd dir)) ++ (eq 0 (call-process "git" nil '(t nil) nil "ls-files" "-c" "-z" "--" name))) ++ (let ((str (buffer-string))) ++ (and (> (length str) (length name)) ++ (string= (substring str 0 (1+ (length name))) (concat name "\0")))))))) ++ ++(defun vc-git-state (file) ++ "git-specific version of `vc-state'." ++ (let ((diff (vc-git--run-command-string file "diff-index" "-z" "HEAD" "--"))) ++ (if (and diff (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} [ADMU]\0[^\0]+\0" diff)) ++ 'edited ++ 'up-to-date))) ++ ++(defun vc-git-workfile-version (file) ++ "git-specific version of `vc-workfile-version'." ++ (let ((str (with-output-to-string ++ (with-current-buffer standard-output ++ (call-process "git" nil '(t nil) nil "symbolic-ref" "HEAD"))))) ++ (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str) ++ (match-string 2 str) ++ str))) ++ ++(defun vc-git-symbolic-commit (commit) ++ "Translate COMMIT string into symbolic form. ++Returns nil if not possible." ++ (and commit ++ (with-temp-buffer ++ (and ++ (zerop ++ (call-process "git" nil '(t nil) nil "name-rev" ++ "--name-only" "--tags" ++ commit)) ++ (goto-char (point-min)) ++ (= (forward-line 2) 1) ++ (bolp) ++ (buffer-substring-no-properties (point-min) (1- (point-max))))))) ++ ++(defun vc-git-previous-version (file rev) ++ "git-specific version of `vc-previous-version'." ++ (let ((default-directory (file-name-directory (expand-file-name file))) ++ (file (file-name-nondirectory file))) ++ (vc-git-symbolic-commit ++ (with-temp-buffer ++ (and ++ (zerop ++ (call-process "git" nil '(t nil) nil "rev-list" ++ "-2" rev "--" file)) ++ (goto-char (point-max)) ++ (bolp) ++ (zerop (forward-line -1)) ++ (not (bobp)) ++ (buffer-substring-no-properties ++ (point) ++ (1- (point-max)))))))) ++ ++(defun vc-git-next-version (file rev) ++ "git-specific version of `vc-next-version'." ++ (let* ((default-directory (file-name-directory ++ (expand-file-name file))) ++ (file (file-name-nondirectory file)) ++ (current-rev ++ (with-temp-buffer ++ (and ++ (zerop ++ (call-process "git" nil '(t nil) nil "rev-list" ++ "-1" rev "--" file)) ++ (goto-char (point-max)) ++ (bolp) ++ (zerop (forward-line -1)) ++ (bobp) ++ (buffer-substring-no-properties ++ (point) ++ (1- (point-max))))))) ++ (and current-rev ++ (vc-git-symbolic-commit ++ (with-temp-buffer ++ (and ++ (zerop ++ (call-process "git" nil '(t nil) nil "rev-list" ++ "HEAD" "--" file)) ++ (goto-char (point-min)) ++ (search-forward current-rev nil t) ++ (zerop (forward-line -1)) ++ (buffer-substring-no-properties ++ (point) ++ (progn (forward-line 1) (1- (point)))))))))) ++ ++(defun vc-git-revert (file &optional contents-done) ++ "Revert FILE to the version stored in the git repository." ++ (if contents-done ++ (vc-git--run-command file "update-index" "--") ++ (vc-git--run-command file "checkout" "HEAD"))) ++ ++(defun vc-git-checkout-model (file) ++ 'implicit) ++ ++(defun vc-git-workfile-unchanged-p (file) ++ (let ((sha1 (vc-git--run-command-string file "hash-object" "--")) ++ (head (vc-git--run-command-string file "ls-tree" "-z" "HEAD" "--"))) ++ (and head ++ (string-match "[0-7]\\{6\\} blob \\([0-9a-f]\\{40\\}\\)\t[^\0]+\0" head) ++ (string= (car (split-string sha1 "\n")) (match-string 1 head))))) ++ ++(defun vc-git-register (file &optional rev comment) ++ "Register FILE into the git version-control system." ++ (vc-git--run-command file "update-index" "--add" "--")) ++ ++(defun vc-git-print-log (file &optional buffer) ++ (let ((name (file-relative-name file)) ++ (coding-system-for-read git-commits-coding-system)) ++ (vc-do-command buffer 'async "git" name "rev-list" "--pretty" "HEAD" "--"))) ++ ++(defun vc-git-diff (file &optional rev1 rev2 buffer) ++ (let ((name (file-relative-name file)) ++ (buf (or buffer "*vc-diff*"))) ++ (if (and rev1 rev2) ++ (vc-do-command buf 0 "git" name "diff-tree" "-p" rev1 rev2 "--") ++ (vc-do-command buf 0 "git" name "diff-index" "-p" (or rev1 "HEAD") "--")) ++ ; git-diff-index doesn't set exit status like diff does ++ (if (vc-git-workfile-unchanged-p file) 0 1))) ++ ++(defun vc-git-checkin (file rev comment) ++ (let ((coding-system-for-write git-commits-coding-system)) ++ (vc-git--run-command file "commit" "-m" comment "--only" "--"))) ++ ++(defun vc-git-checkout (file &optional editable rev destfile) ++ (if destfile ++ (let ((fullname (substring ++ (vc-git--run-command-string file "ls-files" "-z" "--full-name" "--") ++ 0 -1)) ++ (coding-system-for-read 'no-conversion) ++ (coding-system-for-write 'no-conversion)) ++ (with-temp-file destfile ++ (eq 0 (call-process "git" nil t nil "cat-file" "blob" ++ (concat (or rev "HEAD") ":" fullname))))) ++ (vc-git--run-command file "checkout" (or rev "HEAD")))) ++ ++(defun vc-git-annotate-command (file buf &optional rev) ++ ; FIXME: rev is ignored ++ (let ((name (file-relative-name file))) ++ (call-process "git" nil buf nil "blame" name))) ++ ++(defun vc-git-annotate-time () ++ (and (re-search-forward "[0-9a-f]+ (.* \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\) +[0-9]+)" nil t) ++ (vc-annotate-convert-time ++ (apply #'encode-time (mapcar (lambda (match) (string-to-number (match-string match))) '(6 5 4 3 2 1 7)))))) ++ ++;; Not really useful since we can't do anything with the revision yet ++;;(defun vc-annotate-extract-revision-at-line () ++;; (save-excursion ++;; (move-beginning-of-line 1) ++;; (and (looking-at "[0-9a-f]+") ++;; (buffer-substring (match-beginning 0) (match-end 0))))) ++ ++(provide 'vc-git) +-- +1.7.3.4 + diff --git a/git.spec b/git.spec index b4a3751..01c066b 100644 --- a/git.spec +++ b/git.spec @@ -23,11 +23,15 @@ Patch0: git-1.5-gitweb-home-link.patch Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/500137 Patch2: git-1.6-update-contrib-hooks-path.patch +# https://bugzilla.redhat.com/600411 +Patch3: git-1.7-el5-emacs-support.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils +%if 0%{?fedora} || 0%{?rhel} >= 5 +BuildRequires: emacs +%endif %if 0%{?fedora} || 0%{?rhel} >= 6 -BuildRequires: emacs >= 22.2 BuildRequires: libcurl-devel %else BuildRequires: curl-devel @@ -81,7 +85,7 @@ Requires: git-gui = %{version}-%{release} Requires: git-svn = %{version}-%{release} Requires: gitk = %{version}-%{release} Requires: perl-Git = %{version}-%{release} -%if 0%{?fedora} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?rhel} >= 5 Requires: emacs-git = %{version}-%{release} %endif %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -202,12 +206,17 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi %description -n perl-Git Perl interface to Git. -%if 0%{?fedora} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?rhel} >= 5 %package -n emacs-git Summary: Git version control system support for Emacs Group: Applications/Editors +Requires: git = %{version}-%{release} +%if 0%{?fedora} || 0%{?rhel} >= 6 BuildArch: noarch -Requires: git = %{version}-%{release}, emacs(bin) >= %{_emacs_version} +Requires: emacs(bin) >= %{_emacs_version} +%else +Requires: emacs-common +%endif %description -n emacs-git %{summary}. @@ -215,7 +224,9 @@ Requires: git = %{version}-%{release}, emacs(bin) >= %{_emacs_version} %package -n emacs-git-el Summary: Elisp source files for git version control system support for Emacs Group: Applications/Editors +%if 0%{?fedora} || 0%{?rhel} >= 6 BuildArch: noarch +%endif Requires: emacs-git = %{version}-%{release} %description -n emacs-git-el @@ -227,6 +238,9 @@ Requires: emacs-git = %{version}-%{release} %patch0 -p1 %patch1 -p1 %patch2 -p1 +%if 0%{?rhel} == 5 +%patch3 -p1 +%endif # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -270,7 +284,7 @@ chmod +x %{__perl_requires} %build make %{?_smp_mflags} all %{!?_without_docs: doc} -%if 0%{?fedora} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?rhel} >= 5 make -C contrib/emacs %endif @@ -281,7 +295,11 @@ sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash rm -rf %{buildroot} make %{?_smp_mflags} INSTALLDIRS=vendor install %{!?_without_docs: install-doc} -%if 0%{?fedora} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?rhel} >= 5 +%if 0%{?rhel} == 5 +%global _emacs_sitelispdir %{_datadir}/emacs/site-lisp +%global _emacs_sitestartdir %{_emacs_sitelispdir}/site-start.d +%endif %global elispdir %{_emacs_sitelispdir}/git make -C contrib/emacs install \ emacsdir=%{buildroot}%{elispdir} @@ -420,7 +438,7 @@ rm -rf %{buildroot} %files -n perl-Git -f perl-files %defattr(-,root,root) -%if 0%{?fedora} || 0%{?rhel} >= 6 +%if 0%{?fedora} || 0%{?rhel} >= 5 %files -n emacs-git %defattr(-,root,root) %doc contrib/emacs/README @@ -456,6 +474,7 @@ rm -rf %{buildroot} %changelog * Sun Feb 13 2011 Todd Zullinger - 1.7.4.1-1 - Update to 1.7.4.1 +- Improve EL-5 compatibility, thanks to Kevin Fenzi for emacs testing * Tue Feb 08 2011 Fedora Release Engineering - 1.7.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 94ce6ac2e5e07e3b268a06ba0301a78b6ab491d3 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 13 Feb 2011 13:34:14 -0500 Subject: [PATCH 114/114] Clean up documentation settings (the defaults changed in 1.7.4) Special settings for current Fedora and EL >= 6 are no longer required. Adjust the settings for older EL releases. --- git.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index 01c066b..fb6b7a5 100644 --- a/git.spec +++ b/git.spec @@ -259,17 +259,19 @@ prefix = %{_prefix} gitwebdir = %{_var}/www/git EOF -%if 0%{?fedora} || 0%{?rhel} >= 6 -cat << \EOF >> config.mak -ASCIIDOC8 = 1 -ASCIIDOC_NO_ROFF = 1 -EOF -%endif - %if 0%{?rhel} && 0%{?rhel} <= 5 echo gitexecdir = %{_bindir} >> config.mak %endif +%if 0%{?rhel} && 0%{?rhel} == 5 +# This is needed for 1.69.1-1.71.0 +echo DOCBOOK_SUPPRESS_SP = 1 >> config.mak +%endif + +%if 0%{?rhel} && 0%{?rhel} <= 4 +echo ASCIIDOC7 = 1 >> config.mak +%endif + # Filter bogus perl requires # packed-refs comes from a comment in contrib/hooks/update-paranoid cat << \EOF > %{name}-req @@ -474,6 +476,7 @@ rm -rf %{buildroot} %changelog * Sun Feb 13 2011 Todd Zullinger - 1.7.4.1-1 - Update to 1.7.4.1 +- Clean up documentation settings (the defaults changed in 1.7.4) - Improve EL-5 compatibility, thanks to Kevin Fenzi for emacs testing * Tue Feb 08 2011 Fedora Release Engineering - 1.7.4-2