rpms/httpd/devel httpd.conf, 1.29, 1.30 httpd.init, 1.14, 1.15 httpd.spec, 1.131, 1.132
Joe Orton
jorton at fedoraproject.org
Thu Jan 22 14:50:27 UTC 2009
- Previous message (by thread): rpms/R-Biobase/devel .cvsignore, 1.5, 1.6 R-Biobase.spec, 1.7, 1.8 sources, 1.5, 1.6
- Next message (by thread): rpms/R-GeneR/F-9 R-GeneR.spec,1.4,1.5 sources,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jorton
Update of /cvs/extras/rpms/httpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31500
Modified Files:
httpd.conf httpd.init httpd.spec
Log Message:
* Thu Jan 22 2009 Joe Orton <jorton at redhat.com> 2.2.11-6
- Require: apr-util-ldap (#471898)
- init script changes: pass pidfile to status(), use status() in
condrestart (#480602), support try-restart as alias for
condrestart
- change /etc/httpd/run symlink to have destination /var/run/httpd,
and restore "run/httpd.conf" as default PidFile (#478688)
Index: httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.conf,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- httpd.conf 27 Dec 2008 14:36:47 -0000 1.29
+++ httpd.conf 22 Jan 2009 14:49:56 -0000 1.30
@@ -60,7 +60,7 @@
# PidFile: The file in which the server should record its process
# identification number when it starts.
#
-PidFile run/httpd/httpd.pid
+PidFile run/httpd.pid
#
# Timeout: The number of seconds before receives and sends time out.
Index: httpd.init
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- httpd.init 18 Dec 2008 16:30:24 -0000 1.14
+++ httpd.init 22 Jan 2009 14:49:56 -0000 1.15
@@ -91,15 +91,15 @@
stop
;;
status)
- status $httpd
+ status -p ${pidfile} $httpd
RETVAL=$?
;;
restart)
stop
start
;;
- condrestart)
- if [ -f ${pidfile} ] ; then
+ condrestart|try-restart)
+ if status -p ${pidfile} $httpd >&/dev/null; then
stop
start
fi
Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- httpd.spec 16 Jan 2009 18:20:34 -0000 1.131
+++ httpd.spec 22 Jan 2009 14:49:56 -0000 1.132
@@ -7,7 +7,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.2.11
-Release: 5
+Release: 6
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html
@@ -54,7 +54,7 @@
Obsoletes: apache, secureweb, mod_dav, mod_gzip, stronghold-apache
Obsoletes: stronghold-htdocs, mod_put, mod_roaming
Conflicts: pcre < 4.0
-Requires: httpd-tools = %{version}-%{release}
+Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
%description
The Apache HTTP Server is a powerful, efficient, and extensible
@@ -288,7 +288,7 @@
# symlinks for /etc/httpd
ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/etc/httpd/logs
-ln -s ../..%{_localstatedir}/run $RPM_BUILD_ROOT/etc/httpd/run
+ln -s ../..%{_localstatedir}/run/httpd $RPM_BUILD_ROOT/etc/httpd/run
ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules
# install SYSV init stuff
@@ -482,6 +482,14 @@
%{_libdir}/httpd/build/*.sh
%changelog
+* Thu Jan 22 2009 Joe Orton <jorton at redhat.com> 2.2.11-6
+- Require: apr-util-ldap (#471898)
+- init script changes: pass pidfile to status(), use status() in
+ condrestart (#480602), support try-restart as alias for
+ condrestart
+- change /etc/httpd/run symlink to have destination /var/run/httpd,
+ and restore "run/httpd.conf" as default PidFile (#478688)
+
* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> 2.2.11-5
- rebuild with new openssl
- Previous message (by thread): rpms/R-Biobase/devel .cvsignore, 1.5, 1.6 R-Biobase.spec, 1.7, 1.8 sources, 1.5, 1.6
- Next message (by thread): rpms/R-GeneR/F-9 R-GeneR.spec,1.4,1.5 sources,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list