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

Accepting request 396009 from Apache

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/396009
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=122
This commit is contained in:
Dominique Leuenberger 2016-05-20 09:54:53 +00:00 committed by Git OBS Bridge
commit 88293e7565
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apache2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 9 13:57:54 UTC 2016 - pgajdos@suse.com
- start apache services after remote-fs [bsc#978543]
-------------------------------------------------------------------
Thu May 5 07:06:05 UTC 2016 - pgajdos@suse.com

2
apache2.service
View File

@ -1,6 +1,6 @@
[Unit]
Description=The Apache Webserver
After=network.target nss-lookup.target time-sync.target
After=network.target nss-lookup.target time-sync.target remote-fs.target
Before=getty@tty1.service plymouth-quit.service xdm.service
PartOf=apache2.target

12
apache2.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package apache2
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -123,11 +123,11 @@ Patch70: httpd-implicit-pointer-decl.patch
Patch109: httpd-2.4.3-mod_systemd.patch
Patch111: httpd-visibility.patch
# PATCH-FIX-UPSTREAM marguerite@opensuse.org -- compability for lua 5.2+ https://bz.apache.org/bugzilla/show_bug.cgi?id=58188
Patch114: httpd-2.4.12-lua-5.2.patch
Patch114: httpd-2.4.12-lua-5.2.patch
# http://svn.apache.org/viewvc?view=revision&revision=1711479
Patch115: httpd-2.4.17-debug-crash.patch
BuildRequires: automake
BuildRequires: apache-rpm-macros-control
BuildRequires: automake
BuildRequires: db-devel
BuildRequires: ed
BuildRequires: libapr-util1-devel
@ -153,11 +153,11 @@ Requires(post): grep
Requires(post): sed
Requires(post): textutils
Provides: %{apache_mmn}
Provides: suse_maintenance_mmn_%{suse_maintenance_mmn}
Provides: %{name}-mod_macro = %{version}
Provides: http_daemon
Provides: httpd
Provides: suse_help_viewer
Provides: %{name}-mod_macro = %{version}
Provides: suse_maintenance_mmn_%{suse_maintenance_mmn}
Obsoletes: %{name}-mod_macro <= 1.2.1
Provides: apache = %{version}
Obsoletes: apache < 1.3.29
@ -255,11 +255,11 @@ Summary: Apache 2 Header and Include Files
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Requires: %{name}-MPM
Requires: apache-rpm-macros-control
Requires: apache2-prefork
Requires: gcc
Requires: libapr-util1-devel
Requires: libapr1-devel
Requires: apache-rpm-macros-control
%description devel
This package contains header files and include files that are needed

2
apache2@.service
View File

@ -1,6 +1,6 @@
[Unit]
Description=The Apache Webserver %I
After=network.target nss-lookup.target time-sync.target
After=network.target nss-lookup.target time-sync.target remote-fs.target
Before=getty@tty1.service plymouth-quit.service xdm.service
PartOf=apache2.target