Hello community,
here is the log from the commit of package thttpd for openSUSE:Factory checked
in at 2013-06-28 19:28:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/thttpd (Old)
and /work/SRC/openSUSE:Factory/.thttpd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "thttpd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/thttpd/thttpd.changes 2013-03-10
09:13:17.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.thttpd.new/thttpd.changes 2013-06-28
19:28:56.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jun 27 21:03:49 UTC 2013 - crrodrig...@opensuse.org
+
+- DO not add sample index.html that will conflict with apache
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ thttpd.spec ++++++
--- /var/tmp/diff_new_pack.56K955/_old 2013-06-28 19:28:56.000000000 +0200
+++ /var/tmp/diff_new_pack.56K955/_new 2013-06-28 19:28:56.000000000 +0200
@@ -113,10 +113,7 @@
%{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 @@
%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/*
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
