rpms/lighttpd/FC-4 favicon.ico, NONE, 1.1 light_button.png, NONE, 1.1 light_logo.png, NONE, 1.1 .cvsignore, 1.5, 1.6 index.html, 1.1, 1.2 lighttpd.spec, 1.9, 1.10 sources, 1.5, 1.6 lighttpd.png, 1.1, NONE

Wed Feb 15 12:17:23 UTC 2006

Author: thias

Update of /cvs/extras/rpms/lighttpd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31889

Modified Files:
	.cvsignore index.html lighttpd.spec sources 
Added Files:
	favicon.ico light_button.png light_logo.png 
Removed Files:
	lighttpd.png 
Log Message:
Sync FC-4 branch with devel to update from 1.3.x to latest 1.4.10.

--- NEW FILE favicon.ico ---

wOQ<0r
Tc!óÈ;;;;Aˆ¡ûâÙŒ¤Œ?Ç·™šï´ÊH_"±r;ÇÊôs^
Eµ®Ž§Ã0àU·™;;è±’8Š6êê·Çs;u»9q‘ÕÄ¤X=Ý´ó¶™sNt/,([³ÊÇ;ô wPV°n§Ã¤¦ÃŒªÙ	çh;;Çïè©B”›N·ùöšL»Eð®ªÄ¤¤ÃÄŒŽ«Ýab·ÇÇZáÏNõsÇKºý¼äÚŒÄ¤¤Ã¦ÔÕØ®a˜Ê·–í<ƒÑ{N[;;Fˆ¡É“n§Ã¤¤ÃÄ}}naòÊôí¹>vríøs|½Ì~®ÅÃ¤ÃŒª×ÝpÇ÷„²WÒt²·Kydû)Ù}¤Ã§§}R‘pUÇ±C&žæ·‰zE•	×¥ÄÓ§QRÜÆÇ´ZDÀ;*EûgÚ¤¥¦G‹Õ×Ûgë!j\WšsÁÜ¤ÄŒÅØ®âatxü…€qÝ¤ÃÄ§=n‘)çAuUåÜ¤¤G=Ö¬°J ·o'¤ÃŒ}ÅÚÞaoª¥Ã§¨}ÕÕŒ¤¤ÃÄXÃ¦¤¥¥¥¦

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Aug 2005 15:05:31 -0000	1.5
+++ .cvsignore	15 Feb 2006 12:17:23 -0000	1.6
@@ -1 +1 @@
-lighttpd-1.3.16.tar.gz
+lighttpd-1.4.10.tar.gz


Index: index.html
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-4/index.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.html	23 Feb 2005 00:12:23 -0000	1.1
+++ index.html	15 Feb 2006 12:17:23 -0000	1.2
@@ -1,27 +1,28 @@
-<?xml version="1.0" encoding="iso-8859-15" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <!-- $Id$ -->
 <head>
   <title>Powered by lighttpd</title>
+  <link rel="shortcut icon" href="favicon.ico" />
+  <link rel="icon" href="favicon.ico" />
   <style type="text/css">
     <!--
-      body {background: white; color: #666f85}
+      body {background: white; color: #666f85; text-align: center}
       img  {border: none}
     -->
   </style>
 </head>
-<body style="text-align: center">
-
-<h1>lighttpd - Lightning fast, light system requirements</h1>
+<body>
 
 <p>
-<a href="http://www.lighttpd.net/"><img src="lighttpd.png" width="306" height="76" alt="Powered by lighttpd" /></a>
+<img src="light_logo.png" width="249" height="239" alt="LIGHTTPD - fly light." />
 </p>
 
 <p>
-<a href="http://www.fedora.redhat.com/"><img src="powered_by_fedora.png" width="88" height="31" alt="Powered by Fedora" /></a>
+<a href="http://www.fedora.redhat.com/"><img src="powered_by_fedora.png" width="88" height="31" alt="Powered by Fedora" /></a><br/>
+<a href="http://www.lighttpd.net/"><img src="light_button.png" width="80" height="27" alt="Powered by Lighttpd" /></a>
 </p>
 
 </body>


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-4/lighttpd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lighttpd.spec	1 Aug 2005 15:12:38 -0000	1.9
+++ lighttpd.spec	15 Feb 2006 12:17:23 -0000	1.10
@@ -2,8 +2,8 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.3.16
-Release: 2%{?dist}
+Version: 1.4.10
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -11,8 +11,10 @@
 Source1: lighttpd.logrotate
 Source2: php.d-lighttpd.ini
 Source10: index.html
-Source11: lighttpd.png
+Source11: http://www.lighttpd.net/favicon.ico
 Source12: powered_by_fedora.png
+Source13: http://www.lighttpd.net/light_button.png
+Source14: http://www.lighttpd.net/light_logo.png
 Patch0: lighttpd-1.3.10-defaultconf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
@@ -20,7 +22,10 @@
 Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(postun): /sbin/service
 BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel, gcc-c++
-%{?_with_ldap:BuildRequires: openldap-devel}
+%{!?_without_ldap:BuildRequires: openldap-devel}
+%{?_with_gamin:BuildRequires: gamin-devel}
+%{!?_without_gdbm:BuildRequires: gdbm-devel}
+%{!?_without_lua:BuildRequires: lua-devel}
 
 %description
 Secure, fast, compliant and very flexible web-server which has been optimized
@@ -31,7 +36,8 @@
 problems.
 
 Available rpmbuild rebuild options :
---with : ldap
+--with : memcache webdavprops gamin
+--without : ldap gdbm lua (cml)
 
 
 %package mod_mysql_vhost
@@ -66,16 +72,20 @@
 %build
 %configure \
     --libdir="%{_libdir}/lighttpd" \
-    --with-openssl \
     --with-mysql \
-    %{?_with_ldap:--with-ldap}
+    %{!?_without_ldap:--with-ldap} \
+    --with-openssl \
+    %{?_with_gamin:--with-fam} \
+    %{!?_without_gdbm:--with-gdbm} \
+    %{?_with_memcache:--with-memcache} \
+    %{?!_without_lua:--with-lua} \
+    %{?_with_webdavprops:--with-webdav-props}
 %{__make}
 
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall \
-    libdir="%{buildroot}%{_libdir}/lighttpd"
+%{__make} install DESTDIR=%{buildroot}
 
 # Install included init script and sysconfig entry
 %{__install} -D -p -m 0755 doc/rc.lighttpd.redhat \
@@ -97,7 +107,8 @@
 
 # Install our own default web page and images
 %{__mkdir_p} %{buildroot}%{webroot}
-%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \
+%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
+    %{SOURCE14} \
     %{buildroot}%{webroot}/
 
 # Install empty log directory to include
@@ -162,6 +173,67 @@
 
 
 %changelog
+* Wed Feb  8 2006 Matthias Saou <http://freshrpms.net/> 1.4.10-1
+- Update to 1.4.10.
+- Remove now included fix.
+
+* Wed Jan 25 2006 Matthias Saou <http://freshrpms.net/> 1.4.9-2
+- Add mod_fastcgi-fix patch to fix crash on backend overload.
+
+* Mon Jan 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.9-1
+- Update to 1.4.9.
+
+* Wed Nov 23 2005 Matthias Saou <http://freshrpms.net/> 1.4.8-1
+- Update to 1.4.8.
+
+* Fri Nov  4 2005 Matthias Saou <http://freshrpms.net/> 1.4.7-1
+- Update to 1.4.7.
+
+* Wed Oct 12 2005 Matthias Saou <http://freshrpms.net/> 1.4.6-1
+- Update to 1.4.6.
+
+* Mon Oct  3 2005 Matthias Saou <http://freshrpms.net/> 1.4.5-1
+- Update to 1.4.5.
+- Disable gamin/fam support for now, it does not work.
+
+* Tue Sep 27 2005 Matthias Saou <http://freshrpms.net/> 1.4.4-3
+- Update to current SVN to check if it fixes the remaining load problems.
+
+* Wed Sep 21 2005 Matthias Saou <http://freshrpms.net/> 1.4.4-2
+- Patch to SVN 722 revision : Fixes a crash in mod_mysql_vhost and a problem
+  with keepalive and certain browsers.
+
+* Mon Sep 19 2005 Matthias Saou <http://freshrpms.net/> 1.4.4-1
+- Update to 1.4.4 final.
+- Enable ldap auth, gdbm and gamin/fam support by default.
+
+* Thu Sep 15 2005 Matthias Saou <http://freshrpms.net/> 1.4.4-0
+- Update to 1.4.4 pre-release (fixes another fastcgi memleak).
+- Enable lua (cml module) by default.
+- Add --with-webdav-props conditional option.
+
+* Tue Sep 13 2005 Matthias Saou <http://freshrpms.net/> 1.4.3-2
+- Include lighttpd-1.4.3-stat_cache.patch to fix memleak.
+
+* Fri Sep  2 2005 Matthias Saou <http://freshrpms.net/> 1.4.3-1.1
+- Rearrange the included index.html to include the new logo, button and
+  favicon from lighttpd.net.
+
+* Fri Sep  2 2005 Matthias Saou <http://freshrpms.net/> 1.4.3-1
+- Update to 1.4.3.
+- No longer override libdir at make install stage, use DESTDIR instead, as
+  the resulting binary would now have referenced to %%{buildroot} :-(
+
+* Tue Aug 30 2005 Matthias Saou <http://freshrpms.net/> 1.4.2-1
+- Update to 1.4.2.
+
+* Mon Aug 22 2005 Matthias Saou <http://freshrpms.net/> 1.4.1-1
+- Update to 1.4.1.
+
+* Sun Aug 21 2005 Matthias Saou <http://freshrpms.net/> 1.4.0-1
+- Update to 1.4.0.
+- Add conditional of gamin, gdbm, memcache and lua options.
+
 * Mon Aug  1 2005 Matthias Saou <http://freshrpms.net/> 1.3.16-2
 - Update to 1.3.16, rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2005 15:05:32 -0000	1.5
+++ sources	15 Feb 2006 12:17:23 -0000	1.6
@@ -1 +1 @@
-b73f7a7ace4901b6417b0e450aaa5df5  lighttpd-1.3.16.tar.gz
+51e42c2cc98a1f9986b9f232ff5a01f2  lighttpd-1.4.10.tar.gz


