- up to 1.4.26

Changed files:
    am-old.patch -> 1.2
    branch.sh -> 1.20
    lighttpd.spec -> 1.325

diff --git a/am-old.patch b/am-old.patch
deleted file mode 100644 (file)
index 3343f6d..0000000
--- a/am-old.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- lighttpd-1.4.25/configure.ac       2009-11-21 15:11:50.000000000 +0000
-+++ lighttpd-1.4.24/configure.ac       2009-09-01 18:34:54.000000000 +0000
-@@ -5,9 +5,8 @@
- AC_CONFIG_MACRO_DIR([m4])
- 
- AC_CANONICAL_TARGET
- 
--AM_INIT_AUTOMAKE([-Wall -Wportability -Wno-override -Werror foreign dist-bzip2 tar-ustar silent-rules color-tests])
--AM_SILENT_RULES
-+AM_INIT_AUTOMAKE([-Wall -Wportability -Wno-override -Werror foreign dist-bzip2 tar-ustar])
- 
- # Checks for programs.
- AC_PROG_CC

diff --git a/branch.sh b/branch.sh
index 2fe3c6754cab8ec92692932ed9a971f74010a2d3..e19e91b78b5fce3c77c67de7c1404873e4ff7ec9 100644 (file)
--- a/branch.sh
+++ b/branch.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 svn=svn://svn.lighttpd.net/lighttpd
-tag=lighttpd-1.4.25
+tag=lighttpd-1.4.26
 branch=lighttpd-1.4.x
 out=lighttpd-branch.diff
 

diff --git a/lighttpd.spec b/lighttpd.spec
index 92115f2449715099e6f37c07d1f0e9d1f980f04b..fd9190bc14397f12f41fcd4c1e58adc639765ee6 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -22,12 +22,12 @@
 Summary:       Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd
-Version:       1.4.25
-Release:       6
+Version:       1.4.26
+Release:       1
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.bz2
-# Source0-md5: 2027c49fb46530e45338c5e2da13c02f
+# Source0-md5: a682c8efce47a2f4263a247ba0813c9b
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.user
@@ -84,14 +84,13 @@ Source134:  %{name}-mod_magnet.conf
 Source135:     %{name}-mod_extforward.conf
 Source136:     %{name}-mod_h264_streaming.conf
 Source137:     %{name}-mod_cgi_php.conf
-Patch100:      %{name}-branch.diff
+#Patch100:     %{name}-branch.diff
 Patch0:                %{name}-use_bin_sh.patch
 Patch1:                %{name}-mod_evasive-status_code.patch
 Patch2:                %{name}-mod_h264_streaming.patch
 Patch3:                %{name}-branding.patch
 Patch4:                %{name}-modinit-before-fork.patch
 Patch5:                %{name}-mod_deflate.patch
-Patch6:                am-old.patch
 #Patch8:               %{name}-errorlog-before-fork.patch
 URL:           http://www.lighttpd.net/
 %{?with_xattr:BuildRequires:   attr-devel}
@@ -811,14 +810,13 @@ Plik monitrc do monitorowania serwera www lighttpd.
 
 %prep
 %setup -q
-%patch100 -p0
+#%patch100 -p0
 %patch4 -p0
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %{?with_deflate:%patch5 -p1}
-%patch6 -p1
 
 rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead