From e18dedb0c1aa997c61e4779feacd3dac68a9c052 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 15:32:25 +0000 Subject: [PATCH 01/10] Initialize branch FC-6 for git --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 35f6281d8a59bdf1822abe4eddb54595c4ccc434 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Sun, 10 Dec 2006 22:37:54 +0000 Subject: [PATCH 02/10] Update to git-1.4.4.2 --- .cvsignore | 2 +- git.spec | 40 +++++++++++++++++++++++++++++++--------- sources | 2 +- 3 files changed, 33 insertions(+), 11 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 692f7e4..400fd3f 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.4.2.4 +Version: 1.4.4.2 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -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 + * Tue Oct 17 2006 Chris Wright 1.4.2.4-1 - git-1.4.2.4 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 2924c29092ddbf709dfeb8673e27b8dfa468ade5 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 11 Dec 2006 09:04:50 +0000 Subject: [PATCH 03/10] couple minor git fixes --- ...oid-miscounting-bytes-in-Perl-v5.8.x.patch | 32 +++++++++++++++++++ git-install-non-executable-doc-files.patch | 22 +++++++++++++ git.spec | 13 +++++++- 3 files changed, 66 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 400fd3f..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,9 +159,16 @@ 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 +* 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 3ae05c40c23b414b15778910bf4e73ffdec5948d Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 26 Feb 2007 22:43:20 +0000 Subject: [PATCH 04/10] 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 91b0c5eabdde43ab12cf7620e94172840e934518 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Tue, 13 Mar 2007 21:04:18 +0000 Subject: [PATCH 05/10] Update to git-1.5.0.3 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 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 f0fe843..d7bc425 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.2 +Version: 1.5.0.3 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 +* Tue Mar 13 2007 Chris Wright 1.5.0.3-1 +- git-1.5.0.3 + * Mon Feb 26 2007 Chris Wright 1.5.0.2-1 - git-1.5.0.2 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 df9147849b3e780bd88e2bb7641eb3956b68a598 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 19 Mar 2007 21:51:24 +0000 Subject: [PATCH 06/10] 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 d7bc425..401e1ea 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 628d6bb340e0c1d345a71000305e4cca19b8390e Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Fri, 30 Mar 2007 17:52:28 +0000 Subject: [PATCH 07/10] 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 401e1ea..58ea102 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 0174b0a5711d287348f0dace8e060b46a09a612b Mon Sep 17 00:00:00 2001 From: jbowes Date: Mon, 2 Jul 2007 16:01:58 +0000 Subject: [PATCH 08/10] git-1.5.2.2 for Fedora 6 --- git.spec | 18 ++++++++++++------ sources | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index 58ea102..c22bfb8 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.2 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,13 @@ 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 +* Mon Jul 2 2007 James Bowes 1.5.2.2-1 +- git-1.5.2.2 + * Fri Mar 30 2007 Chris Wright 1.5.0.6-1 - git-1.5.0.6 diff --git a/sources b/sources index 43c7921..c3c97df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d9564417eadc424d4dd7616339fa9b2f git-1.5.0.6.tar.gz +6a0f39577cbfbb575edb3c45d8f5d528 git-1.5.2.2.tar.gz From 536715febe80ae8209367b75c07d4e02330c5b2e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:56:50 +0000 Subject: [PATCH 09/10] 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 551cf3d729fbbd6125c4add799c6f953cea25720 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:41:46 +0000 Subject: [PATCH 10/10] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 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) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6