auto-import changelog data from httpd-2.0.50-7.src.rpm

Wed Sep 08 2004 Joe Orton <jorton@redhat.com> 2.0.50-7
- prereq rather than just require httpd from -suexec (#132045)
This commit is contained in:
cvsdist 2004-09-09 06:23:08 +00:00
parent 5d149576dd
commit c5c4ff4b10
2 changed files with 13 additions and 10 deletions

View File

@ -1,13 +1,13 @@
%define contentdir /var/www %define contentdir /var/www
%define suexec_caller apache %define suexec_caller apache
%define mmn 20020903 %define mmn 20020903
%define vstring Red Hat %define vstring Fedora
%define distro Red Hat Enterprise Linux %define distro Fedora Core
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.0.50 Version: 2.0.50
Release: 6.ent Release: 7
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html Source1: index.html
@ -136,7 +136,7 @@ Security (TLS) protocols.
%package suexec %package suexec
Group: System Environment/Daemons Group: System Environment/Daemons
Summary: suexec binary for the Apache HTTP server Summary: suexec binary for the Apache HTTP server
Requires: httpd = %{version}-%{release} PreReq: httpd = %{version}-%{release}
%description suexec %description suexec
This package includes the /usr/sbin/suexec binary which can be installed This package includes the /usr/sbin/suexec binary which can be installed
@ -592,6 +592,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/suexec.8* %{_mandir}/man8/suexec.8*
%changelog %changelog
* Wed Sep 8 2004 Joe Orton <jorton@redhat.com> 2.0.50-7
- prereq rather than just require httpd from -suexec (#132045)
* Sun Sep 5 2004 Joe Orton <jorton@redhat.com> 2.0.50-6 * Sun Sep 5 2004 Joe Orton <jorton@redhat.com> 2.0.50-6
- include /etc/sysconfig/httpd template (#112085) - include /etc/sysconfig/httpd template (#112085)
- pass $OPTIONS in httpd invocations in apachectl (#115910) - pass $OPTIONS in httpd invocations in apachectl (#115910)

View File

@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head> <head>
<title>Test Page for the Apache HTTP Server on Red Hat Enterprise Linux</title> <title>Test Page for the Apache HTTP Server on Fedora Core</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<style type="text/css"> <style type="text/css">
/*<![CDATA[*/ /*<![CDATA[*/
@ -27,7 +27,7 @@
text-align: center; text-align: center;
margin: 0; margin: 0;
padding: 0.6em 2em 0.4em; padding: 0.6em 2em 0.4em;
background-color: #900; background-color: #22437f;
color: #fff; color: #fff;
font-weight: normal; font-weight: normal;
font-size: 1.75em; font-size: 1.75em;
@ -85,7 +85,7 @@
</head> </head>
<body> <body>
<h1>Red Hat Enterprise Linux <strong>Test Page</strong></h1> <h1>Fedora Core <strong>Test Page</strong></h1>
<div class="content"> <div class="content">
<div class="content-middle"> <div class="content-middle">
@ -103,7 +103,7 @@
<p>For example, if you experienced problems while visiting www.example.com, you should send e-mail to "webmaster@example.com".</p> <p>For example, if you experienced problems while visiting www.example.com, you should send e-mail to "webmaster@example.com".</p>
<p>For information on Red Hat Enterprise Linux, please visit the <a href="http://www.redhat.com/">Red Hat, Inc. website</a>. The documentation for Red Hat Enterprise Linux is <a href="http://www.redhat.com/docs/manuals/enterprise/">available on the Red Hat, Inc. website</a>.</p> <p>For information on Fedora Core, please visit the <a href="http://fedora.redhat.com/">Fedora Project website</a>.</p>
<hr /> <hr />
</div> </div>
@ -113,9 +113,9 @@
<p>You may now add content to the directory <tt>/var/www/html/</tt>. Note that until you do so, people visiting your website will see this page, and not your content. To prevent this page from ever being used, follow the instructions in the file <tt>/etc/httpd/conf.d/welcome.conf</tt>.</p> <p>You may now add content to the directory <tt>/var/www/html/</tt>. Note that until you do so, people visiting your website will see this page, and not your content. To prevent this page from ever being used, follow the instructions in the file <tt>/etc/httpd/conf.d/welcome.conf</tt>.</p>
<div class="logos"> <div class="logos">
<p>You are free to use the images below on Apache and Red Hat powered HTTP servers. Thanks for using Apache and Red Hat Enterprise Linux!</p> <p>You are free to use the images below on Apache and Fedora Core powered HTTP servers. Thanks for using Apache and Fedora Core!</p>
<p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://www.redhat.com/"><img src="/icons/powered_by_rh.png" alt="[ Powered by Red Hat ]" width="88" height="31" /></a></p> <p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://fedora.redhat.com/"><img src="/icons/powered_by_fedora.png" alt="[ Powered by Fedora Core ]" width="88" height="31" /></a></p>
</div> </div>
</div> </div>
</div> </div>