From eee118cb002bd6f61ba08e00ec6b20cfc77f49e0e9c4698c43cc734e5695c17e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Fri, 28 Jun 2013 07:25:32 +0000
Subject: [PATCH] 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
---
 thttpd.changes | 5 +++++
 thttpd.spec    | 6 +-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/thttpd.changes b/thttpd.changes
index 7e9a2e3..9b853de 100644
--- a/thttpd.changes
+++ b/thttpd.changes
@@ -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
 
diff --git a/thttpd.spec b/thttpd.spec
index 63d1306..8279e2b 100644
--- a/thttpd.spec
+++ b/thttpd.spec
@@ -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/*