You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2011/05/23 00:51:46 UTC
svn commit: r1126268 - /httpd/httpd/trunk/build/rpm/httpd.spec.in
Author: minfrin
Date: Sun May 22 22:51:45 2011
New Revision: 1126268
URL: http://svn.apache.org/viewvc?rev=1126268&view=rev
Log:
rpm spec file: Prereq and BuildPrereq are deprecated, use Requires and
BuildRequires instead.
Modified:
httpd/httpd/trunk/build/rpm/httpd.spec.in
Modified: httpd/httpd/trunk/build/rpm/httpd.spec.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/rpm/httpd.spec.in?rev=1126268&r1=1126267&r2=1126268&view=diff
==============================================================================
--- httpd/httpd/trunk/build/rpm/httpd.spec.in (original)
+++ httpd/httpd/trunk/build/rpm/httpd.spec.in Sun May 22 22:51:45 2011
@@ -14,11 +14,11 @@ Source0: http://www.apache.org/dist/http
License: Apache License, Version 2.0
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildPrereq: apr-devel, apr-util-devel, openldap-devel, db4-devel, expat-devel, findutils, perl, pkgconfig, zlib-devel, pcre-devel >= 5.0, distcache-devel >= 1.4
-BuildPrereq: /usr/bin/apr-1-config, /usr/bin/apu-1-config
+BuildRequires: apr-devel, apr-util-devel, openldap-devel, db4-devel, expat-devel, findutils, perl, pkgconfig, zlib-devel, pcre-devel >= 5.0, distcache-devel >= 1.4
+BuildRequires: /usr/bin/apr-1-config, /usr/bin/apu-1-config
Requires: apr >= 1.4.2, apr-util >= 1.3.10, pcre-devel >= 5.0, gawk, /usr/bin/find, openldap
-Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv
-Prereq: sh-utils, textutils, /usr/sbin/useradd
+Requires: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv
+Requires: sh-utils, textutils, /usr/sbin/useradd
Provides: webserver
Provides: httpd-mmn = %{mmn}
Conflicts: thttpd
@@ -57,8 +57,8 @@ also be found at http://httpd.apache.org
%package -n mod_ssl
Group: System Environment/Daemons
Summary: SSL/TLS module for the Apache HTTP server
-BuildPrereq: openssl-devel
-Prereq: openssl, dev, /bin/cat
+BuildRequires: openssl-devel
+Requires: openssl, dev, /bin/cat
Requires: httpd, make, httpd-mmn = %{mmn}
%description -n mod_ssl