- exclude configure.ac from branch.diff to avoid version bump; rel 7

Changed files:
    branch.sh -> 1.16
    lighttpd-branch.diff -> 1.60
    lighttpd.spec -> 1.301

diff --git a/branch.sh b/branch.sh
index 2105278a7ae22420ea1fed8cab5ca664d05aad86..66e3a8b292ab4a5c9bd94ac9cc8f1a63d8e2b432 100644 (file)
--- a/branch.sh
+++ b/branch.sh
@@ -21,6 +21,7 @@ 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-branch.diff b/lighttpd-branch.diff
index 257a3b56836beab94811f2da11674ac440ffa2ff..c9ee19e9c4d51d7924b8eb10ba8cb0f92ffdc883 100644 (file)
--- a/lighttpd-branch.diff
+++ b/lighttpd-branch.diff
@@ -2738,44 +2738,6 @@ Index: tests/LightyTest.pm
        return 0;
 Index: configure.ac
 ===================================================================
---- configure.ac       (.../tags/lighttpd-1.4.23)
-+++ configure.ac       (.../branches/lighttpd-1.4.x)
-@@ -1,9 +1,10 @@
- #                                               -*- Autoconf -*-
- # Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.57)
--AC_INIT([lighttpd], [1.4.23], [contact@lighttpd.net])
-+AC_INIT([lighttpd], [1.4.24], [contact@lighttpd.net])
- AC_CONFIG_SRCDIR([src/server.c])
- AC_CONFIG_HEADER([config.h])
-+AC_CONFIG_MACRO_DIR([m4])
- 
- AC_CANONICAL_TARGET
- 
-@@ -417,12 +418,18 @@
-    AC_DEFINE([HAVE_LUA], [1], [liblua])
-    AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-  ],[
--   # for debian based systems
--   PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1, [
--     AC_DEFINE([HAVE_LUA], [1], [liblua])
--     AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
--   ])
-+ # for debian based systems
-+ PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1, [
-+   AC_DEFINE([HAVE_LUA], [1], [liblua])
-+   AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-+ ],[
-+ # for freebsd
-+ PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1, [
-+   AC_DEFINE([HAVE_LUA], [1], [liblua])
-+   AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-  ])
-+ ])
-+ ])
- 
-  AC_SUBST(LUA_CFLAGS)
-  AC_SUBST(LUA_LIBS)
 Index: doc/.cvsignore
 ===================================================================
 Index: doc/fastcgi.txt

diff --git a/lighttpd.spec b/lighttpd.spec
index c2114295176a05f0f47cd2f5790bbd6fd4297d22..4e23cfad8939505cf4ac85f0a11577909a651fc8 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -23,7 +23,7 @@ Summary:      Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd
 Version:       1.4.23
-Release:       6
+Release:       7
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.lighttpd.net/download/%{name}-%{version}.tar.bz2