summaryrefslogtreecommitdiffstats
path: root/httpd.spec
diff options
context:
space:
mode:
authorJoe Orton <jorton@redhat.com>2014-08-29 14:35:18 +0100
committerJoe Orton <jorton@redhat.com>2014-08-29 14:35:18 +0100
commit452da8d9b6122b29a1d1df51fdba4b4a494c389a (patch)
treef7e1742dd0a41b3ddee02c5ef7d231770a894e3a /httpd.spec
parent94399e06f8091f2bf72dd76a2ffaf4e27f8392eb (diff)
downloadhttpd-452da8d9b6122b29a1d1df51fdba4b4a494c389a.tar.gz
httpd-452da8d9b6122b29a1d1df51fdba4b4a494c389a.tar.xz
httpd-452da8d9b6122b29a1d1df51fdba4b4a494c389a.zip
pull in httpd-filesystem as Requires(pre) (#1128328)
Resolves: rhbz#1128328
Diffstat (limited to 'httpd.spec')
-rw-r--r--httpd.spec9
1 files changed, 6 insertions, 3 deletions
diff --git a/httpd.spec b/httpd.spec
index 984160a..ed5e365 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -14,7 +14,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.4.10
-Release: 7%{?dist}
+Release: 8%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@@ -86,7 +86,7 @@ Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
Requires: httpd-tools = %{version}-%{release}
Requires: httpd-filesystem = %{version}-%{release}
-Requires(pre): /usr/sbin/useradd
+Requires(pre): httpd-filesystem
Requires(preun): systemd-units
Requires(postun): systemd-units
Requires(post): systemd-units
@@ -149,7 +149,7 @@ Summary: SSL/TLS module for the Apache HTTP Server
Epoch: 1
BuildRequires: openssl-devel
Requires(post): openssl, /bin/cat
-Requires(pre): httpd
+Requires(pre): httpd-filesystem
Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
Obsoletes: stronghold-mod_ssl
@@ -667,6 +667,9 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
+* Fri Aug 29 2014 Joe Orton <jorton@redhat.com> - 2.4.10-8
+- pull in httpd-filesystem as Requires(pre) (#1128328)
+
* Fri Aug 22 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-7
- mod_systemd: updated to the latest version
- use -lsystemd instead of -lsystemd-daemon (#1125084)