summaryrefslogtreecommitdiffstats
path: root/httpd.spec
diff options
context:
space:
mode:
authorjorton <jorton@fedoraproject.org>2007-05-09 10:18:59 +0000
committerjorton <jorton@fedoraproject.org>2007-05-09 10:18:59 +0000
commita9808100f19876f4a41d215c1d41a210c8522aed (patch)
tree9cf45094c2219d66676e68ac5683f8526b597aee /httpd.spec
parent13698f2bbbe89e264d5c250b22bdaf88dc5b5ad2 (diff)
downloadhttpd-a9808100f19876f4a41d215c1d41a210c8522aed.tar.gz
httpd-a9808100f19876f4a41d215c1d41a210c8522aed.tar.xz
httpd-a9808100f19876f4a41d215c1d41a210c8522aed.zip
- update welcome page brandinghttpd-2_2_4-4F-7-startF-7-split
Diffstat (limited to 'httpd.spec')
-rw-r--r--httpd.spec10
1 files changed, 6 insertions, 4 deletions
diff --git a/httpd.spec b/httpd.spec
index e0d2440..b9b2d81 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -2,12 +2,11 @@
%define suexec_caller apache
%define mmn 20051115
%define vstring Fedora
-%define distro Fedora Core
Summary: Apache HTTP Server
Name: httpd
Version: 2.2.4
-Release: 3
+Release: 4
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html
@@ -125,7 +124,7 @@ if test "x${vmmn}" != "x%{mmn}"; then
exit 1
fi
-: Building for '%{distro}' with MMN %{mmn} and vendor string '%{vstring}'
+: Building with MMN %{mmn} and vendor string '%{vstring}'
%build
# forcibly prevent use of bundled apr, apr-util, pcre
@@ -395,7 +394,7 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/httpd/logs
%{_sysconfdir}/httpd/run
%dir %{_sysconfdir}/httpd/conf
-%config %{_sysconfdir}/httpd/conf/httpd.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf/httpd.conf
%config(noreplace) %{_sysconfdir}/httpd/conf.d/welcome.conf
%config(noreplace) %{_sysconfdir}/httpd/conf.d/proxy_ajp.conf
%config(noreplace) %{_sysconfdir}/httpd/conf/magic
@@ -462,6 +461,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/build/*.sh
%changelog
+* Wed May 9 2007 Joe Orton <jorton@redhat.com> 2.2.4-4
+- update welcome page branding
+
* Tue Apr 3 2007 Joe Orton <jorton@redhat.com> 2.2.4-3
- drop old triggers, old Requires, xmlto BR
- use Requires(...) correctly