rpms/git/devel git.spec,1.54,1.55

[Bernardo Innocenti (bernie)]

Author: bernie

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

Modified Files:
	git.spec 
Log Message:
* Sun Feb 24 2008 Bernardo Innocenti <bernie at codewiz.org> 1.5.4.3-2
- Do not silently overwrite /etc/httpd/conf.d/git.conf



Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- git.spec	23 Feb 2008 22:44:40 -0000	1.54
+++ git.spec	24 Feb 2008 14:57:54 -0000	1.55
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
 Version: 	1.5.4.3
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:  	Core git tools
 License: 	GPLv2
 Group: 		Development/Tools
@@ -245,7 +245,7 @@
 %files -n gitweb
 %defattr(-,root,root)
 /var/www/git/
-%{_sysconfdir}/httpd/conf.d/git.conf
+%config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf
 %{!?_without_docs: %doc Documentation/*.html Documentation/howto}
 %{!?_without_docs: %doc Documentation/technical}
 
@@ -253,6 +253,9 @@
 # No files for you!
 
 %changelog
+* Sun Feb 24 2008 Bernardo Innocenti <bernie at codewiz.org> 1.5.4.3-2
+- Do not silently overwrite /etc/httpd/conf.d/git.conf
+
 * Sat Feb 23 2008 James Bowes <jbowes at redhat.com> 1.5.4.3-1
 - git-1.5.4.3
 - Include Kristian Høgsberg's changes to rename git-core to