rpm/apache2
SHA256
1
0
Fork 0
forked from pool/apache2
Code Pull Requests Activity

Accepting request 94928 from home:coolo:removeautomake

Browse Source 
add automake to buildrequires

OBS-URL: https://build.opensuse.org/request/show/94928
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=351
This commit is contained in:
Stephan Kulow 2011-12-02 16:41:12 +00:00 committed by Git OBS Bridge
parent 1ee79ea228
commit df135f4b2d
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apache2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Dec 2 07:18:56 UTC 2011 - coolo@suse.com
- add automake as buildrequire to avoid implicit dependency
-------------------------------------------------------------------
Fri Nov 18 15:04:12 CET 2011 - draht@suse.de

34
apache2.spec
View File

@ -15,12 +15,17 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: apache2
BuildRequires: db-devel ed libapr-util1-devel libapr1-devel >= 1.4.2 openldap2 openldap2-devel
BuildRequires: openssl-devel pcre-devel zlib-devel
BuildRequires: automake
BuildRequires: db-devel
BuildRequires: ed
BuildRequires: libapr-util1-devel
BuildRequires: libapr1-devel >= 1.4.2
BuildRequires: openldap2
BuildRequires: openldap2-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: zlib-devel
%if %{?suse_version:1}0 && 0%{?sles_version} == 9
BuildRequires: libcap
%else
@ -69,11 +74,11 @@ BuildRequires: expat-devel
# "Server:" header
%define VENDOR SUSE
%define platform_string Linux/%VENDOR
License: ASLv..
License: Apache-2.0
Group: Productivity/Networking/Web/Servers
%define realver 2.2.21
Version: 2.2.21
Release: 1
Release: 0
#Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2
Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2
# Add file to take mtime from it in prep section
@ -140,7 +145,6 @@ Patch106: httpd-2.2.x-CVE-2011-3368-server_protocl_c.diff
Url: http://httpd.apache.org/
Icon: Apache.xpm
Summary: The Apache Web Server Version 2.2
AutoReqProv: on
Provides: httpd http_daemon %{apache_mmn} suse_help_viewer
Requires: %{pname}-MPM /etc/mime.types
PreReq: %{name}-utils
@ -200,18 +204,14 @@ http://httpd.apache.org/docs-2.2/upgrading.html.
%if %worker
%package worker
License: ASLv..
Summary: Apache 2 worker MPM (Multi-Processing Module)
Group: Productivity/Networking/Web/Servers
Provides: %{pname}-MPM
Requires: %{name} = %{version}
%endif
%if %prefork
%package prefork
License: ASLv..
Summary: Apache 2 "prefork" MPM (Multi-Processing Module)
Group: Productivity/Networking/Web/Servers
Provides: %{pname}-MPM
%if 0%{?suse_version} >= 901 && 0%{?sles_version} != 9
Provides: apache:/usr/sbin/httpd
@ -221,18 +221,14 @@ Requires: %{name} = %{version}
%if %event
%package event
License: ASLv..
Summary: Apache 2 event MPM (Multi-Processing Module)
Group: Productivity/Networking/Web/Servers
Provides: %{pname}-MPM
Requires: %{name} = %{version}
%endif
%if %itk
%package itk
License: ASLv..
Summary: Apache 2 "ITK" MPM (Multi-Processing Module)
Group: Productivity/Networking/Web/Servers
Provides: %{pname}-MPM
Requires: %{name} = %{version}
%endif
@ -288,7 +284,6 @@ See http://mpm-itk.sesse.net/
%endif
%package devel
License: ASLv..
Summary: Apache 2.2 Header and Include Files
Group: Development/Libraries/C and C++
Requires: %{name} = %{version} %{pname}-MPM
@ -302,7 +297,6 @@ for development using the Apache API.
%package doc
License: ASLv..
Summary: Additional Package Documentation.
Group: Documentation/Other
%if 0%{?suse_version} >= 901 && 0%{?sles_version} != 9
@ -320,9 +314,7 @@ this package's base documentation.
%package example-pages
License: ASLv..
Summary: Example Pages for the Apache 2 Web Server
Group: Productivity/Networking/Web/Servers
%if 0%{?suse_version} >= 901 && 0%{?sles_version} != 9
Provides: apache-example-pages
Obsoletes: apache-example-pages
@ -333,9 +325,7 @@ Some Example pages for Apache that show information about the installed
server.
%package utils
License: ASLv..
Summary: Apache 2 utilities
Group: Productivity/Networking/Web/Servers
%description utils
Utilities provided by the Apache 2 Web Server project which are useful