|
@@ -6,7 +6,7 @@
|
|
|
Summary: Apache HTTP Server
|
|
Summary: Apache HTTP Server
|
|
|
Name: %{pkgname}
|
|
Name: %{pkgname}
|
|
|
Version: 2.2.14
|
|
Version: 2.2.14
|
|
|
-Release: 8%{_dist_release}
|
|
|
|
|
|
|
+Release: 9%{_dist_release}
|
|
|
URL: http://httpd.apache.org/
|
|
URL: http://httpd.apache.org/
|
|
|
|
|
|
|
|
Vendor: Project Vine
|
|
Vendor: Project Vine
|
|
@@ -64,8 +64,6 @@ Requires(post): alternatives
|
|
|
Provides: webserver
|
|
Provides: webserver
|
|
|
Provides: httpd = %{version}
|
|
Provides: httpd = %{version}
|
|
|
Provides: httpd-mmn = %{mmn}
|
|
Provides: httpd-mmn = %{mmn}
|
|
|
-Conflicts: thttpd
|
|
|
|
|
-Obsoletes: secureweb
|
|
|
|
|
Obsoletes: apache2-apr, apache2-apr-devel
|
|
Obsoletes: apache2-apr, apache2-apr-devel
|
|
|
|
|
|
|
|
%description
|
|
%description
|
|
@@ -76,7 +74,6 @@ 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.
|
|
|
-Obsoletes: secureweb-devel
|
|
|
|
|
Requires: libtool, httpd = %{version}
|
|
Requires: libtool, httpd = %{version}
|
|
|
Requires: apr-devel, apr-util-devel
|
|
Requires: apr-devel, apr-util-devel
|
|
|
|
|
|
|
@@ -91,7 +88,6 @@ to install this package.
|
|
|
%package manual
|
|
%package manual
|
|
|
Group: Applications/Documentation
|
|
Group: Applications/Documentation
|
|
|
Summary: Documentation for the Apache HTTP server.
|
|
Summary: Documentation for the Apache HTTP server.
|
|
|
-Obsoletes: secureweb-manual
|
|
|
|
|
|
|
|
|
|
%description manual
|
|
%description manual
|
|
|
The httpd-manual package contains the complete manual and
|
|
The httpd-manual package contains the complete manual and
|
|
@@ -497,6 +493,9 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%{_libdir}/apache2/build/*.sh
|
|
%{_libdir}/apache2/build/*.sh
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
|
+* Sat Apr 30 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.14-9
|
|
|
|
|
+- remove old Obsoletes/Conflicts
|
|
|
|
|
+
|
|
|
* Tue Jan 11 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.2.14-8
|
|
* Tue Jan 11 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.2.14-8
|
|
|
- rebuild with openssl-1.0.0c
|
|
- rebuild with openssl-1.0.0c
|
|
|
|
|
|
daisuke