- up to 1.4.24

Changed files:
    branch.sh -> 1.17
    lighttpd.spec -> 1.306

diff --git a/branch.sh b/branch.sh
index 66e3a8b292ab4a5c9bd94ac9cc8f1a63d8e2b432..751378202bc646f49fc61ae7f7ad61fe9d2190b1 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.23
+tag=lighttpd-1.4.24
 branch=lighttpd-1.4.x
 
 d=$-
@@ -11,6 +11,7 @@ filter() {
        filterdiff \
                -x 'ChangeLog' \
                -x 'CMakeLists.txt' \
+               -x 'configure.ac' \
                -x 'configure.in' \
                -x '.cvsignore' \
                -x 'doc/.cvsignore' \
@@ -21,7 +22,6 @@ filter() {
                -x 'src/mod_uploadprogress.c' \
                -x 'tests/.cvsignore' \
                -x 'tests/mod-extforward.conf' \
-               -x 'configure.ac' \
                | \
        # remove revno's for smaller diffs
        sed -e 's,^\([-+]\{3\} .*\)\t(revision [0-9]\+)$,\1,'

diff --git a/lighttpd.spec b/lighttpd.spec
index 82cf1973131fec6c1d45ba8c964bbd83133b513e..6d41d8a182efa02d73beadd1c305f650ad326681 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.23
-Release:       8
+Version:       1.4.24
+Release:       1
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.lighttpd.net/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 0ab6bb7b17bf0f515ce7dce68e5e215a
+# Source0-md5: e2324a24e4a5bce74663c21c58ddd200
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.user
@@ -83,7 +83,7 @@ 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
@@ -808,7 +808,7 @@ Plik monitrc do monitorowania serwera www lighttpd.
 
 %prep
 %setup -q
-%patch100 -p0
+#%patch100 -p0
 %patch4 -p0
 %patch0 -p1
 %patch1 -p1
@@ -1060,7 +1060,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README ChangeLog doc/lighttpd.conf doc/*.txt doc/rrdtool-graph.sh
+%doc NEWS README doc/lighttpd.conf doc/*.txt doc/rrdtool-graph.sh
 %dir %attr(751,root,lighttpd) %{_sysconfdir}
 %dir %attr(750,root,root) %{_sysconfdir}/webapps.d
 %dir %attr(750,root,root) %{_sysconfdir}/conf.d