SPECS: lighttpd.spec - update to svn r2190, add modinit-before-fork.patch, ...

[glen]

Author: glen                         Date: Tue Jun 17 16:21:14 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update to svn r2190, add modinit-before-fork.patch, add branch creation script for reference

---- Files affected:
SPECS:
   lighttpd.spec (1.256 -> 1.257) 

---- Diffs:

================================================================
Index: SPECS/lighttpd.spec
diff -u SPECS/lighttpd.spec:1.256 SPECS/lighttpd.spec:1.257
--- SPECS/lighttpd.spec:1.256	Mon May 26 14:54:46 2008
+++ SPECS/lighttpd.spec	Tue Jun 17 18:21:08 2008
@@ -38,7 +38,7 @@
 %define		webdav_progs	1
 %endif
 
-%define		rel 6
+%define		rel 6.1
 Summary:	Fast and light HTTP server
 Summary(pl.UTF-8):	Szybki i lekki serwer HTTP
 Name:		lighttpd
@@ -64,6 +64,7 @@
 # Source10-md5:	486ecec3f6f4fe7f9bf7cee757b864f4
 Source11:	%{name}-pld.html
 Source12:	%{name}.monitrc
+Source13:	%{name}-branch.sh
 Source100:	%{name}-mod_access.conf
 Source101:	%{name}-mod_accesslog.conf
 Source102:	%{name}-mod_alias.conf
@@ -107,6 +108,7 @@
 Patch1:		%{name}-mod_evasive-status_code.patch
 Patch2:		%{name}-mod_h264_streaming.patch
 Patch3:		%{name}-branding.patch
+Patch4:		%{name}-modinit-before-fork.patch
 #Patchx:	%{name}-mod_deflate.patch
 URL:		http://www.lighttpd.net/
 %{?with_xattr:BuildRequires:	attr-devel}
@@ -798,11 +800,14 @@
 %prep
 %setup -q
 %patch100 -p0
+%patch4 -p0
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 
+rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead
+
 # build mime.types.conf
 sh %{SOURCE6} /etc/mime.types
 
@@ -828,7 +833,8 @@
 	%{?with_gamin:--with-gamin} \
 	%{?with_gdbm:--with-gdbm}
 
-%{__make}
+# -j1 as src/mod_ssi_exprparser.h regeneration deps are broken
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -1279,7 +1285,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.256  2008/05/26 12:54:46  glen
+Revision 1.257  2008/06/17 16:21:08  glen
+- update to svn r2190, add modinit-before-fork.patch, add branch creation script for reference
+
+Revision 1.256  2008-05-26 12:54:46  glen
 - build mod_auth with ldap support; rel 6
 
 Revision 1.255  2008-04-27 11:41:53  blues
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lighttpd.spec?r1=1.256&r2=1.257&f=u