From e1775e91aae2350f3e648be620bdbed5d48c760d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sat, 29 Sep 2012 13:01:29 +0300 Subject: [PATCH] - don't patch for automake 1.11.2 on ac --- lighttpd.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lighttpd.spec b/lighttpd.spec index ae27142..ad4f6bb 100644 --- a/lighttpd.spec +++ b/lighttpd.spec @@ -29,7 +29,7 @@ Summary: Fast and light HTTP server Summary(pl.UTF-8): Szybki i lekki serwer HTTP Name: lighttpd Version: 1.4.31 -Release: 3 +Release: 4 License: BSD Group: Networking/Daemons/HTTP Source0: http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.bz2 @@ -105,7 +105,11 @@ Patch7: %{name}-automake_1.12.patch URL: http://www.lighttpd.net/ %{?with_xattr:BuildRequires: attr-devel} BuildRequires: autoconf >= 2.57 +%if "%{pld_release}" != "ac" +BuildRequires: automake >= 1:1.11.2 +%else BuildRequires: automake +%endif BuildRequires: bzip2-devel BuildRequires: fcgi-devel %{?with_gamin:BuildRequires: gamin-devel} @@ -121,6 +125,7 @@ BuildRequires: mailcap >= 2.1.14-4.4 %{?with_ssl:BuildRequires: openssl-devel} BuildRequires: pcre-devel BuildRequires: pkgconfig +BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.647 %{?with_webdav_props:BuildRequires: sqlite3-devel} %{?with_valgrind:BuildRequires: valgrind} @@ -830,7 +835,9 @@ Plik monitrc do monitorowania serwera www lighttpd. %patch3 -p1 %{?with_deflate:%patch5 -p1} %patch6 -p1 +%if "%{pld_release}" != "ac" %patch7 -p1 +%endif rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead -- 2.43.0