diff --git a/apache2.changes b/apache2.changes index 6aa4552..390cb30 100644 --- a/apache2.changes +++ b/apache2.changes @@ -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 diff --git a/apache2.service b/apache2.service index 6988107..25f8813 100644 --- a/apache2.service +++ b/apache2.service @@ -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 diff --git a/apache2.spec b/apache2.spec index 664d313..4a888f6 100644 --- a/apache2.spec +++ b/apache2.spec @@ -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 diff --git a/apache2@.service b/apache2@.service index 16f2319..82f380a 100644 --- a/apache2@.service +++ b/apache2@.service @@ -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