Author: glen Date: Thu Jan 5 18:26:18 2012 GMT
Module: packages Tag: DEVEL
---- Log message:
- up to r2825
---- Files affected:
packages/lighttpd:
branch.sh (1.21 -> 1.22) , lighttpd.spec (1.201.2.24 -> 1.201.2.25)
---- Diffs:
================================================================
Index: packages/lighttpd/branch.sh
diff -u packages/lighttpd/branch.sh:1.21 packages/lighttpd/branch.sh:1.22
--- packages/lighttpd/branch.sh:1.21 Thu Dec 1 12:11:19 2011
+++ packages/lighttpd/branch.sh Thu Jan 5 19:26:13 2012
@@ -1,45 +1,11 @@
#!/bin/sh
set -e
svn=svn://svn.lighttpd.net/lighttpd
-tag=lighttpd-1.4.29
-branch=lighttpd-1.4.x
-out=lighttpd-branch.diff
+p=lighttpd
+v=1.5
-d=$-
-filter() {
- set -$d
- # Excluding files which change version or were not in dist tarball
- filterdiff \
- -x 'ChangeLog' \
- -x 'CMakeLists.txt' \
- -x 'configure.ac' \
- -x 'configure.in' \
- -x '.cvsignore' \
- -x 'doc/.cvsignore' \
- -x 'SConstruct' \
- -x 'src/CMakeLists.txt' \
- -x 'src/config.h.cmake' \
- -x 'src/.cvsignore' \
- -x 'src/mod_uploadprogress.c' \
- -x 'tests/.cvsignore' \
- -x 'tests/mod-extforward.conf' \
- | \
- # remove revno's for smaller diffs
- sed -e 's,^\([-+]\{3\} .*\)\t(revision [0-9]\+)$,\1,'
-}
-
-old=$svn/tags/$tag
-new=$svn/branches/$branch
-echo >&2 "Running diff: $old -> $new"
-LC_ALL=C svn diff --old=$old --new=$new > $out.tmp
-revno=$(sed -ne 's,^[-+]\{3\} .*\t(revision \([0-9]\+\))$,\1,p' $out.tmp |
sort -u)
-echo >&2 "Revision $revno"
-sed -i -e "1i# Revision $revno" $out.tmp
-filter < $out.tmp > $out.tmp2 && mv -f $out.{tmp2,tmp}
-
-if cmp -s lighttpd-branch.diff{,.tmp}; then
- echo >&2 "No new diffs..."
- rm -f lighttpd-branch.diff.tmp
- exit 0
-fi
-mv -f lighttpd-branch.diff{.tmp,}
+svn co $svn/trunk $p-$v
+r=$(svnversion $p-$v)
+t=$p-r$r.tar.bz2
+tar -cjf $t --exclude-vcs $p-$v
+../dropin $t &
================================================================
Index: packages/lighttpd/lighttpd.spec
diff -u packages/lighttpd/lighttpd.spec:1.201.2.24
packages/lighttpd/lighttpd.spec:1.201.2.25
--- packages/lighttpd/lighttpd.spec:1.201.2.24 Thu Jan 5 19:09:41 2012
+++ packages/lighttpd/lighttpd.spec Thu Jan 5 19:26:13 2012
@@ -44,7 +44,7 @@
%bcond_with linux_aio # Async IO support for Linux via libaio
# SVN snapshot
-%define svn 2371
+%define svn 2825
%if %{with webdav_locks}
%define webdav_progs 1
@@ -58,8 +58,8 @@
Release: %{rel}%{?snap:.%(echo %{snap}|tr - _)}%{?svn:.%{svn}}
License: BSD
Group: Networking/Daemons/HTTP
-Source0: %{name}-%{version}.tar.gz
-# Source0-md5: e9396859e2b2f9be7291b5636ae4195a
+Source0: lighttpd-r%{svn}.tar.bz2
+# Source0-md5: f3d639579cc10841a995334a1394382c
Source1: %{name}.init
Source2: %{name}.conf
Source3: %{name}.user
@@ -830,7 +830,7 @@
Plik monitrc do monitorowania serwera www lighttpd.
%prep
-%setup -q
+%setup -q -n %{name}-1.5
#%patch100 -p1
%patch0 -p1
#%patch1 -p1
@@ -852,10 +852,10 @@
%{__libtoolize}
%{__aclocal}
%{__autoconf}
+%{__autoheader}
%{__automake}
%configure \
- --enable-maintainer-mode \
%{!?with_ipv6:--disable-ipv6} \
%{!?with_largefile:--disable-lfs} \
%{?with_valgrind:--with-valgrind} \
@@ -1326,6 +1326,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.201.2.25 2012/01/05 18:26:13 glen
+- up to r2825
+
Revision 1.201.2.24 2012/01/05 18:09:41 glen
- HEAD merge, up to r1.353
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/branch.sh?r1=1.21&r2=1.22&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd.spec?r1=1.201.2.24&r2=1.201.2.25&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
