commit 42a0f1854f05c32beacbf2d2068b2bcbfd595b78
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Sun Feb 3 16:51:03 2013 +0100
- added am patch (fixes build with automake 1.13)
syslog-ng-am.patch | 19 +++++++++++++++++++
syslog-ng.spec | 4 +++-
2 files changed, 22 insertions(+), 1 deletion(-)
---
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 20e5e3a..0e28fe2 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -2,7 +2,7 @@
# TODO:
# - relies on libs in /usr which is wrong
# (well, for modules bringing additional functionality it's acceptable IMO
--q)
-# - use external libivykis [>= 0.18+syslog-ng updates]
+# - use external libivykis [>= 0.30.1+syslog-ng updates(?)]
#
# Conditional build:
%bcond_with dynamic # link dynamically with glib, eventlog, pcre
(modules are always linked dynamically)
@@ -41,6 +41,7 @@ Patch0: %{name}-datadir.patch
Patch1: cap_syslog-vserver-workaround.patch
Patch2: %{name}-nolibs.patch
Patch3: %{name}-systemd.patch
+Patch4: %{name}-am.patch
URL: http://www.balabit.com/products/syslog_ng/
BuildRequires: autoconf >= 2.53
BuildRequires: automake
@@ -231,6 +232,7 @@ Pliki nagłówkowe do tworzenia modułów dla sysloga-ng.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
cp -a %{SOURCE4} doc
cp -a %{SOURCE5} contrib/syslog-ng.conf.simple
diff --git a/syslog-ng-am.patch b/syslog-ng-am.patch
new file mode 100644
index 0000000..22d8159
--- /dev/null
+++ b/syslog-ng-am.patch
@@ -0,0 +1,19 @@
+--- syslog-ng-3.3.6/configure.in.orig 2013-02-03 16:17:57.687433055 +0100
++++ syslog-ng-3.3.6/configure.in 2013-02-03 16:30:24.357417494 +0100
+@@ -67,7 +67,7 @@
+ pidfiledir='${localstatedir}'
+ moduledir='${exec_prefix}/lib/syslog-ng'
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ dnl
***************************************************************************
+ dnl Arguments
+@@ -211,7 +211,6 @@
+ dnl
***************************************************************************
+ dnl Checks for programs.
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_PROG_CC_C99
+ if test "x$ac_cv_prog_cc_c99" = "xno"; then
+ AC_MSG_ERROR("C99 standard compliant C compiler required. Try GCC 3.x
or later.")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/syslog-ng.git/commitdiff/42a0f1854f05c32beacbf2d2068b2bcbfd595b78
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
