rpms/git/EL-5 git.spec,1.29,1.30 sources,1.39,1.40

[James Bowes (jbowes)]

Author: jbowes

Update of /cvs/extras/rpms/git/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28563

Modified Files:
	git.spec sources 
Log Message:
git-1.5.2.1 for el-5


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/EL-5/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	9 Jun 2007 01:52:21 -0000	1.30
@@ -1,13 +1,13 @@
 # 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
 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
 
@@ -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,20 @@
 %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 <jbowes at redhat.com> 1.5.2.1-1
+- git-1.5.2.1
+
+* Tue May 13 2007 Quy Tonthat <qtonthat at gmail.com>
+- Added lib files for git-gui
+- Added Documentation/technical (As needed by Git Users Manual)
+
+* Tue May 8 2007 Quy Tonthat <qtonthat at gmail.com>
+- Added howto files
+
 * Fri Mar 30 2007 Chris Wright <chrisw at redhat.com> 1.5.0.6-1
 - git-1.5.0.6
 
@@ -176,6 +189,9 @@
 * Tue Mar 13 2007 Chris Wright <chrisw at redhat.com> 1.5.0.3-1
 - git-1.5.0.3
 
+* Fri Mar 2 2007 Chris Wright <chrisw at redhat.com> 1.5.0.2-2
+- BuildRequires perl-devel as of perl-5.8.8-14 (bz 230680)
+
 * Mon Feb 26 2007 Chris Wright <chrisw at redhat.com> 1.5.0.2-1
 - git-1.5.0.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/EL-5/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	9 Jun 2007 01:52:21 -0000	1.40
@@ -1 +1 @@
-d9564417eadc424d4dd7616339fa9b2f  git-1.5.0.6.tar.gz
+e65b08c2e1a4112c3139c15ac5a13e71  git-1.5.2.1.tar.gz