From 5c6de0adb595fb6600a81085c2e504bf792ccd58b0a35c145c3901fafa6f2088 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Tue, 6 Dec 2016 00:26:20 +0000 Subject: [PATCH] manually revert the accidently accepted SR 443209 OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=160 --- apparmor.changes | 6 ------ apparmor.spec | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/apparmor.changes b/apparmor.changes index db4dfc9..d7fe392 100644 --- a/apparmor.changes +++ b/apparmor.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Fri Dec 2 14:46:20 UTC 2016 - kstreitova@suse.com - -- disable apache in order to break build cycle: - ['apache2', 'apparmor', 'libapr-util1', 'mariadb', 'systemd'] - ------------------------------------------------------------------- Sun Oct 23 13:18:43 UTC 2016 - suse-beta@cboltz.de diff --git a/apparmor.spec b/apparmor.spec index 1a3e9cb..9b67610 100644 --- a/apparmor.spec +++ b/apparmor.spec @@ -22,7 +22,7 @@ # bcond_without means "enable" %bcond_with tomcat %bcond_without pam -%bcond_with apache +%bcond_without apache %bcond_without perl %if 0%{?suse_version} > 0 && 0%{?suse_version} <= 1210 # disable python and ruby bindings on openSUSE <= 12.1 to avoid problems with rb_sitearch and python_sitearch