Accepting request 123037 from server:http

- fix build with automake 1.12 (forwarded request 122770 from puzel)

OBS-URL: https://build.opensuse.org/request/show/123037
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/thttpd?expand=0&rev=22
This commit is contained in:
Stephan Kulow 2012-06-01 05:24:38 +00:00 committed by Git OBS Bridge
commit cf6d945714
2 changed files with 9 additions and 3 deletions

View File

@ -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 Thu Mar 22 09:33:49 UTC 2012 - dvaleev@suse.com

View File

@ -17,7 +17,7 @@
Name: thttpd Name: thttpd
Provides: http_daemon Provides: http_daemon
PreReq: %fillup_prereq %insserv_prereq permissions PreReq: %fillup_prereq %insserv_prereq permissions
Version: 2.25b Version: 2.25b
Release: 0 Release: 0
@ -41,7 +41,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Small and very simple webserver Summary: Small and very simple webserver
License: BSD-3-Clause License: BSD-3-Clause
Group: Productivity/Networking/Web/Servers Group: Productivity/Networking/Web/Servers
BuildRequires: libtool automake BuildRequires: automake
BuildRequires: libtool
%description %description
Thttpd is a very compact no-frills httpd serving daemon that can handle Thttpd is a very compact no-frills httpd serving daemon that can handle
@ -76,7 +77,7 @@ Authors:
%patch12 %patch12
%build %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 # update server root path
sed -i "s@__SRVROOT__@%{serverroot}/htdocs@g" README.SuSE SuSE/etc/thttpd.conf sed -i "s@__SRVROOT__@%{serverroot}/htdocs@g" README.SuSE SuSE/etc/thttpd.conf
sed -i "s@__PREFIX__@%{_prefix}@g;\ sed -i "s@__PREFIX__@%{_prefix}@g;\