From c5a542fc1cbc5f14e5ac50c3423a12debf80f848 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 1 Dec 2009 16:06:03 +0000 Subject: [PATCH] - fix build with older automake Changed files: am-old.patch -> 1.1 lighttpd.spec -> 1.317 --- am-old.patch | 13 +++++++++++++ lighttpd.spec | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 am-old.patch diff --git a/am-old.patch b/am-old.patch new file mode 100644 index 0000000..3343f6d --- /dev/null +++ b/am-old.patch @@ -0,0 +1,13 @@ +--- lighttpd-1.4.25/configure.ac 2009-11-21 15:11:50.000000000 +0000 ++++ lighttpd-1.4.24/configure.ac 2009-09-01 18:34:54.000000000 +0000 +@@ -5,9 +5,8 @@ + AC_CONFIG_MACRO_DIR([m4]) + + AC_CANONICAL_TARGET + +-AM_INIT_AUTOMAKE([-Wall -Wportability -Wno-override -Werror foreign dist-bzip2 tar-ustar silent-rules color-tests]) +-AM_SILENT_RULES ++AM_INIT_AUTOMAKE([-Wall -Wportability -Wno-override -Werror foreign dist-bzip2 tar-ustar]) + + # Checks for programs. + AC_PROG_CC diff --git a/lighttpd.spec b/lighttpd.spec index 604108d..d59498b 100644 --- a/lighttpd.spec +++ b/lighttpd.spec @@ -91,10 +91,11 @@ Patch2: %{name}-mod_h264_streaming.patch Patch3: %{name}-branding.patch Patch4: %{name}-modinit-before-fork.patch Patch5: %{name}-mod_deflate.patch +Patch6: am-old.patch #Patch8: %{name}-errorlog-before-fork.patch URL: http://www.lighttpd.net/ %{?with_xattr:BuildRequires: attr-devel} -BuildRequires: autoconf +BuildRequires: autoconf >= 2.57 BuildRequires: automake BuildRequires: bzip2-devel BuildRequires: fcgi-devel @@ -817,6 +818,7 @@ Plik monitrc do monitorowania serwera www lighttpd. %patch2 -p1 %patch3 -p1 %{?with_deflate:%patch5 -p1} +%patch6 -p1 rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead -- 2.44.0