? git-httpd-config.patch
Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.54
diff -u -p -u -p -r1.54 git.spec
--- git.spec	23 Feb 2008 22:44:40 -0000	1.54
+++ git.spec	24 Feb 2008 14:09:29 -0000
@@ -245,7 +245,7 @@ rm -rf $RPM_BUILD_ROOT
 %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 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Sun Feb 24 2008 Bernardo Innocenti <bernie@codewiz.org> 1.5.4.3-2
+- Do not silently overwrite /etc/httpd/conf.d/git.conf
+
 * Sat Feb 23 2008 James Bowes <jbowes@redhat.com> 1.5.4.3-1
 - git-1.5.4.3
 - Include Kristian Høgsberg's changes to rename git-core to