summaryrefslogtreecommitdiffstats
path: root/git.spec
diff options
context:
space:
mode:
authorBernie Innocenti <bernie@fedoraproject.org>2008-02-24 14:57:54 +0000
committerBernie Innocenti <bernie@fedoraproject.org>2008-02-24 14:57:54 +0000
commitba45fbb45c77026b0079446a096fd1033befd43d (patch)
tree2aa0ec7a023abbd2159b7b84dde84ebc97b8338e /git.spec
parent0c4a11cad2c5d6c007147b1fcb84d4bccc6531ac (diff)
downloadgit-package-ba45fbb45c77026b0079446a096fd1033befd43d.tar.gz
git-package-ba45fbb45c77026b0079446a096fd1033befd43d.tar.xz
git-package-ba45fbb45c77026b0079446a096fd1033befd43d.zip
- Do not silently overwrite /etc/httpd/conf.d/git.conf
Diffstat (limited to 'git.spec')
-rw-r--r--git.spec7
1 files changed, 5 insertions, 2 deletions
diff --git a/git.spec b/git.spec
index 3a8f403..9c44a19 100644
--- a/git.spec
+++ b/git.spec
@@ -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 @@ 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