commit d1e0ebb308964a47d8ba3992f6e523683b656206
Author: Jacek Konieczny <j.koniec...@eggsoft.pl>
Date: Mon Feb 18 14:18:56 2019 +0100
'without zos_remote' bcond fix
audit-no_zos_remote.patch | 11 -----------
audit.spec | 17 ++++++++---------
2 files changed, 8 insertions(+), 20 deletions(-)
---
diff --git a/audit.spec b/audit.spec
index efed348..837b2be 100644
--- a/audit.spec
+++ b/audit.spec
@@ -29,12 +29,11 @@ Source3: %{name}d.sysconfig
Patch0: %{name}-install.patch
Patch1: %{name}-m4.patch
Patch2: %{name}-nolibs.patch
-Patch3: %{name}-no_zos_remote.patch
-Patch4: %{name}-systemd-notonly.patch
-Patch5: %{name}-am.patch
-Patch6: %{name}-no-refusemanualstop.patch
-Patch7: %{name}-cronjob.patch
-Patch8: golang-paths.patch
+Patch3: %{name}-systemd-notonly.patch
+Patch4: %{name}-am.patch
+Patch5: %{name}-no-refusemanualstop.patch
+Patch6: %{name}-cronjob.patch
+Patch7: golang-paths.patch
URL: http://people.redhat.com/sgrubb/audit/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1:1.12.6
@@ -196,12 +195,11 @@ Interfejs Pythona 3.x do biblioteki libaudit.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%{!?with_zos_remote:%patch3 -p1}
+%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
-%patch8 -p1
%if %{without python}
sed 's#swig/Makefile ##' -i configure.ac
@@ -219,7 +217,8 @@ sed 's/swig//' -i Makefile.am
--enable-systemd \
--with-apparmor \
--with-libwrap \
- %{?with_prelude:--with-prelude}
+ %{?with_prelude:--with-prelude} \
+ %{!?with_zos_remote:--disable-zos-remote}
%{__make}
diff --git a/audit-no_zos_remote.patch b/audit-no_zos_remote.patch
deleted file mode 100644
index d9aefc2..0000000
--- a/audit-no_zos_remote.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- audit-2.2.1/audisp/plugins/Makefile.am.orig 2012-03-23
13:42:40.000000000 +0100
-+++ audit-2.2.1/audisp/plugins/Makefile.am 2012-04-27 14:35:04.000000000
+0200
-@@ -22,7 +22,7 @@
-
- CONFIG_CLEAN_FILES = *.loT *.rej *.orig
-
--SUBDIRS = builtins zos-remote remote
-+SUBDIRS = builtins remote
- #SUBDIRS = builtins zos-remote
- if HAVE_PRELUDE
- SUBDIRS += prelude
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/audit.git/commitdiff/d1e0ebb308964a47d8ba3992f6e523683b656206
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
