rpms/git/devel git.spec,1.58,1.59

[James Bowes (jbowes)]

Author: jbowes

Update of /cvs/pkgs/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7487

Modified Files:
	git.spec 
Log Message:
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).



Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- git.spec	19 Mar 2008 13:07:11 -0000	1.58
+++ git.spec	26 Mar 2008 11:52:54 -0000	1.59
@@ -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 @@
 %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 @@
 %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 <jbowes at redhat.com> 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