From 8f77dff11b698e4a6ceaf4de0d64ebb01e34d9b3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 04:13:59 +0000 Subject: [PATCH 01/10] Initialize branch F-7 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..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 19b4a8650a59f85d3ab864c16ba04bf0ed8aad72 Mon Sep 17 00:00:00 2001 From: jbowes Date: Fri, 8 Jun 2007 17:54:56 +0000 Subject: [PATCH 02/10] git-1.5.1-1 for F7 --- git.spec | 25 +++++++++++++++++++------ sources | 2 +- 2 files changed, 20 insertions(+), 7 deletions(-) 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 3c3713b31d7fa89e91fff7e5ce17111b0a392e76 Mon Sep 17 00:00:00 2001 From: jbowes Date: Tue, 26 Jun 2007 22:09:49 +0000 Subject: [PATCH 03/10] 1.5.2.2-1 for F-7 --- git.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) 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 242fe402f6cd6bb70a597ecdfe17926e04963f29 Mon Sep 17 00:00:00 2001 From: jbowes Date: Sun, 5 Aug 2007 22:10:27 +0000 Subject: [PATCH 04/10] update to 1.5.2.4 --- git.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index dcc759f..9201e99 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.2 +Version: 1.5.2.4 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 +* Sun Aug 05 2007 James Bowes 1.5.2.4-1 +- git-1.5.2.4 + * Mon Jun 18 2007 James Bowes 1.5.2.2-1 - git-1.5.2.2 From 69337dc90e77d0019068bc51f96a16e3bbb3fc95 Mon Sep 17 00:00:00 2001 From: jbowes Date: Sun, 5 Aug 2007 22:19:38 +0000 Subject: [PATCH 05/10] update sources file as well --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6bd2c0a83eea92d9cc563d11ae0ceff4b7954ddf Mon Sep 17 00:00:00 2001 From: jbowes Date: Tue, 9 Oct 2007 13:21:06 +0000 Subject: [PATCH 06/10] 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 e8e0fe7..7cff24f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.5.0.6.tar.gz +git-1.5.3.3.tar.gz diff --git a/git.spec b/git.spec index 9201e99..6d2f35e 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.4 +Version: 1.5.3.3 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 +* Tue Oct 09 2007 James Bowes 1.5.3.3-1 +- git-1.5.3.3 + * Sun Aug 05 2007 James Bowes 1.5.2.4-1 - git-1.5.2.4 diff --git a/sources b/sources index 5ae257c..557dc24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a8537d8707c6e852d19545bc16d1afb8 git-1.5.2.4.tar.gz +978bda72a636d805dd3058efec5e6f2e git-1.5.3.3.tar.gz From cc7dcda86505b3662b50e2c7a4c4bc436a74f989 Mon Sep 17 00:00:00 2001 From: jbowes Date: Tue, 9 Oct 2007 13:34:10 +0000 Subject: [PATCH 07/10] add git-gui and git-citool docs --- git.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/git.spec b/git.spec index 6d2f35e..7c38a6b 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.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -146,11 +146,10 @@ 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} -# %{!?_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) @@ -170,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Tue Oct 09 2007 James Bowes 1.5.3.3-2 +- Add git-gui and git-citool docs + * Tue Oct 09 2007 James Bowes 1.5.3.3-1 - git-1.5.3.3 From 3591bdebf6b3441592693f4790e2308b6dc37fc4 Mon Sep 17 00:00:00 2001 From: jbowes Date: Tue, 9 Oct 2007 13:45:40 +0000 Subject: [PATCH 08/10] Catch compressed man pages as well --- git.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 7c38a6b..eef6d0f 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.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools @@ -146,9 +146,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/git-gui %{_bindir}/git-citool %{_datadir}/git-gui/ -%{!?_without_docs: %{_mandir}/man1/git-gui.1} +%{!?_without_docs: %{_mandir}/man1/git-gui.1*} %{!?_without_docs: %doc Documentation/git-gui.html} -%{!?_without_docs: %{_mandir}/man1/git-citool.1} +%{!?_without_docs: %{_mandir}/man1/git-citool.1*} %{!?_without_docs: %doc Documentation/git-citool.html} %files -n gitk @@ -169,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Tue Oct 09 2007 James Bowes 1.5.3.3-3 +- Catch compressed man pages as well + * Tue Oct 09 2007 James Bowes 1.5.3.3-2 - Add git-gui and git-citool docs From 67d97ff5b93d55d2caec5dbb450e482ff51aca84 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:56:49 +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 bcd28e31460760bd5a5fb617ef957d06baa6a4d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:41:11 +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 c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7