Accepting request 181205 from home:elvigia:branches:server:http

- DO not add sample index.html that will conflict with apache

OBS-URL: https://build.opensuse.org/request/show/181205
OBS-URL: https://build.opensuse.org/package/show/server:http/thttpd?expand=0&rev=17
This commit is contained in:
Cristian Rodríguez 2013-06-28 07:25:32 +00:00 committed by Git OBS Bridge
parent 551f99a542
commit eee118cb00
2 changed files with 6 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jun 27 21:03:49 UTC 2013 - crrodriguez@opensuse.org
- DO not add sample index.html that will conflict with apache
-------------------------------------------------------------------
Mon Mar 4 16:04:08 UTC 2013 - vcizek@suse.com

View File

@ -113,10 +113,7 @@ install -d %{buildroot}/usr/bin \
%{buildroot}%{serverroot}/htdocs/users
make DESTDIR=%{buildroot} install
cp -a SuSE/* %{buildroot}
sed "s@THTTPD-RELEASE@%{version}@" \
%{buildroot}%{serverroot}/htdocs/index.html.template > \
%{buildroot}%{serverroot}/htdocs/index.html
rm -f %{buildroot}%{serverroot}/htdocs/index.html.template
rm -f %{buildroot}%{serverroot}/htdocs/index.html
%post
%{fillup_and_insserv thttpd}
@ -144,7 +141,6 @@ rm -rf "%{buildroot}"
%doc README README.SuSE config.h
%{serverroot}/htdocs/*
%attr(775, root, www) %{serverroot}/htdocs/users
%config(noreplace) %{serverroot}/htdocs/index.html
%verify(not mode) %attr(2750, root, www) /usr/bin/makeweb
/usr/bin/htpasswd
/usr/sbin/*