From: Marcin Krol <hawk@tld-linux.org>
Date: Tue, 7 Apr 2015 18:25:38 +0000 (+0000)
Subject: - TLDized
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=d8e2ebd017e29b697f504e899cfab77d5b410f87;p=packages%2Flighttpd.git

- TLDized
---

diff --git a/lighttpd-branding.patch b/lighttpd-branding.patch
index 9fdf8a5..c0e0062 100644
--- a/lighttpd-branding.patch
+++ b/lighttpd-branding.patch
@@ -5,7 +5,7 @@
  	if (!have_server) {
  		if (buffer_is_empty(con->conf.server_tag)) {
 -			buffer_append_string_len(b, CONST_STR_LEN("\r\nServer: " PACKAGE_DESC));
-+			buffer_append_string_len(b, CONST_STR_LEN("\r\nServer: " PACKAGE_DESC " (PLD Linux)"));
++			buffer_append_string_len(b, CONST_STR_LEN("\r\nServer: " PACKAGE_DESC " (TLD Linux)"));
  		} else if (con->conf.server_tag->used > 1) {
  			buffer_append_string_len(b, CONST_STR_LEN("\r\nServer: "));
  			buffer_append_string_encoded(b, CONST_BUF_LEN(con->conf.server_tag), ENCODING_HTTP_HEADER);
diff --git a/lighttpd-pld.html b/lighttpd.html
similarity index 79%
rename from lighttpd-pld.html
rename to lighttpd.html
index 1ff430b..88df2e2 100644
--- a/lighttpd-pld.html
+++ b/lighttpd.html
@@ -21,8 +21,7 @@
 </p>
 
 <p>
-<a href="http://www.lighttpd.net/"><img src="light_button.png" width="80" height="27" alt="Powered by Lighttpd" /></a><br/>
-<a href="http://www.pld-linux.org/"><img src="pld_button.png" width="80" height="15" alt="Powered by PLD Linux" /></a>
+<a href="http://www.lighttpd.net/"><img src="light_button.png" width="80" height="27" alt="Powered by Lighttpd" /></a>
 </p>
 
 </body>
diff --git a/lighttpd.spec b/lighttpd.spec
index aa7e2bc..b11931e 100644
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -47,9 +47,7 @@ Source8:	light_button.png
 # Source8-md5:	3e1008ee1d3d6d390cf81fe3072b4f50
 Source9:	light_logo.png
 # Source9-md5:	cbb7f0676e51ee2e26cf004df293fc62
-Source10:	pld_button.png
-# Source10-md5:	185afa921e81bd726b9f0f9f0909dc6e
-Source11:	%{name}-pld.html
+Source11:	%{name}.html
 Source12:	%{name}.monitrc
 Source13:	branch.sh
 Source14:	TODO
@@ -905,7 +903,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # Install lighttpd images
 cp -p %{SOURCE7} %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT%{_lighttpddir}/html
-cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_lighttpddir}/html/pld_button.png
 cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_lighttpddir}/html/index.html
 
 # NOTE: the order of the modules is somewhat important as the modules are