From a49875c593a50e12f61849e8c055dee69943d32a16799fc6d0fe08ed1f08fcf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?= Date: Thu, 31 May 2012 11:30:44 +0000 Subject: [PATCH] Accepting request 122770 from home:puzel:branches:server:http - fix build with automake 1.12 OBS-URL: https://build.opensuse.org/request/show/122770 OBS-URL: https://build.opensuse.org/package/show/server:http/thttpd?expand=0&rev=8 --- thttpd.changes | 5 +++++ thttpd.spec | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/thttpd.changes b/thttpd.changes index ee9ab4d..ff67e7f 100644 --- a/thttpd.changes +++ b/thttpd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 29 14:06:26 UTC 2012 - puzel@suse.com + +- fix build with automake 1.12 + ------------------------------------------------------------------- Thu Mar 22 09:33:49 UTC 2012 - dvaleev@suse.com diff --git a/thttpd.spec b/thttpd.spec index 7b7485e..7435642 100644 --- a/thttpd.spec +++ b/thttpd.spec @@ -17,7 +17,7 @@ Name: thttpd -Provides: http_daemon +Provides: http_daemon PreReq: %fillup_prereq %insserv_prereq permissions Version: 2.25b Release: 0 @@ -41,7 +41,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Small and very simple webserver License: BSD-3-Clause Group: Productivity/Networking/Web/Servers -BuildRequires: libtool automake +BuildRequires: automake +BuildRequires: libtool %description Thttpd is a very compact no-frills httpd serving daemon that can handle @@ -76,7 +77,7 @@ Authors: %patch12 %build -cp /usr/share/automake-1.11/config.* . +cp /usr/share/automake-1.11/config.* . || cp /usr/share/automake-1.12/config.* . # update server root path sed -i "s@__SRVROOT__@%{serverroot}/htdocs@g" README.SuSE SuSE/etc/thttpd.conf sed -i "s@__PREFIX__@%{_prefix}@g;\