|
@@ -9,7 +9,7 @@
|
|
Summary: Apache HTTP Server
|
|
Summary: Apache HTTP Server
|
|
Name: %{pkgname}
|
|
Name: %{pkgname}
|
|
Version: 2.4.9
|
|
Version: 2.4.9
|
|
-Release: 1%{_dist_release}
|
|
+Release: 2%{_dist_release}
|
|
URL: http://httpd.apache.org/
|
|
URL: http://httpd.apache.org/
|
|
|
|
|
|
Vendor: Project Vine
|
|
Vendor: Project Vine
|
|
@@ -79,6 +79,7 @@ Requires(post): alternatives
|
|
Provides: webserver
|
|
Provides: webserver
|
|
Provides: httpd = %{version}
|
|
Provides: httpd = %{version}
|
|
Provides: httpd-mmn = %{mmn}
|
|
Provides: httpd-mmn = %{mmn}
|
|
|
|
+Provides: apache2-mmn = %{mmn}
|
|
Obsoletes: apache2-apr, apache2-apr-devel
|
|
Obsoletes: apache2-apr, apache2-apr-devel
|
|
Obsoletes: apache < 2.0, apache-devel < 2.0
|
|
Obsoletes: apache < 2.0, apache-devel < 2.0
|
|
|
|
|
|
@@ -90,7 +91,7 @@ Internet.
|
|
%package devel
|
|
%package devel
|
|
Group: Development/Libraries
|
|
Group: Development/Libraries
|
|
Summary: Development tools for the Apache HTTP server.
|
|
Summary: Development tools for the Apache HTTP server.
|
|
-Requires: libtool, httpd = %{version}
|
|
+Requires: libtool, apache2 = %{version}
|
|
Requires: apr-devel, apr-util-devel
|
|
Requires: apr-devel, apr-util-devel
|
|
|
|
|
|
%description devel
|
|
%description devel
|
|
@@ -116,7 +117,7 @@ Summary: SSL/TLS module for the Apache HTTP server
|
|
Epoch: 1
|
|
Epoch: 1
|
|
BuildRequires: openssl-devel
|
|
BuildRequires: openssl-devel
|
|
Requires(pre): openssl, dev, /bin/cat
|
|
Requires(pre): openssl, dev, /bin/cat
|
|
-Requires: httpd, make, httpd-mmn = %{mmn}
|
|
+Requires: apache2, make, apache2-mmn = %{mmn}
|
|
|
|
|
|
%description -n mod_ssl-apache2
|
|
%description -n mod_ssl-apache2
|
|
The mod_ssl module provides strong cryptography for the Apache Web
|
|
The mod_ssl module provides strong cryptography for the Apache Web
|
|
@@ -518,6 +519,9 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Wed Jun 25 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 2.4.9-2
|
|
|
|
+- modify dependency
|
|
|
|
+
|
|
* Wed Jun 25 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 2.4.9-1
|
|
* Wed Jun 25 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 2.4.9-1
|
|
- update to 2.4.9
|
|
- update to 2.4.9
|
|
- remove suffix '2' from {htdigest,htpasswd,rotatelogs}2
|
|
- remove suffix '2' from {htdigest,htpasswd,rotatelogs}2
|