rpms/git/FC-6 git.spec,1.29,1.30 sources,1.39,1.40

[James Bowes (jbowes)]

Author: jbowes

Update of /cvs/extras/rpms/git/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12751

Modified Files:
	git.spec sources 
Log Message:
git-1.5.2.2 for Fedora 6


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-6/git.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- git.spec	30 Mar 2007 17:52:28 -0000	1.29
+++ git.spec	2 Jul 2007 16:01:58 -0000	1.30
@@ -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 @@
 %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 @@
 %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 @@
 %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 <jbowes at redhat.com> 1.5.2.2-1
+- git-1.5.2.2
+
 * Fri Mar 30 2007 Chris Wright <chrisw at redhat.com> 1.5.0.6-1
 - git-1.5.0.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-6/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	30 Mar 2007 17:52:28 -0000	1.39
+++ sources	2 Jul 2007 16:01:58 -0000	1.40
@@ -1 +1 @@
-d9564417eadc424d4dd7616339fa9b2f  git-1.5.0.6.tar.gz
+6a0f39577cbfbb575edb3c45d8f5d528  git-1.5.2.2.tar.gz