packages: apache-mod_pagespeed/apache-mod_pagespeed.spec, apache-mod_pagesp...
glen
glen at pld-linux.org
Sat Jul 7 21:56:21 CEST 2012
Author: glen Date: Sat Jul 7 19:56:21 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- smaller tarball by excluding deps from checkout present as system libs
---- Files affected:
packages/apache-mod_pagespeed:
apache-mod_pagespeed.spec (1.14 -> 1.15) , get-source.sh (1.6 -> 1.7) , gclient.conf (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/apache-mod_pagespeed/apache-mod_pagespeed.spec
diff -u packages/apache-mod_pagespeed/apache-mod_pagespeed.spec:1.14 packages/apache-mod_pagespeed/apache-mod_pagespeed.spec:1.15
--- packages/apache-mod_pagespeed/apache-mod_pagespeed.spec:1.14 Sat Jul 7 21:04:49 2012
+++ packages/apache-mod_pagespeed/apache-mod_pagespeed.spec Sat Jul 7 21:56:16 2012
@@ -27,11 +27,11 @@
Summary: Apache module for rewriting web pages to reduce latency and bandwidth
Name: apache-mod_%{mod_name}
Version: 0.10.22.4
-Release: 0.9
+Release: 0.10
License: Apache v2.0
Group: Networking/Daemons/HTTP
Source0: modpagespeed-%{version}.tar.bz2
-# Source0-md5: 9c9a8b091ee8d37253ee35878c3390e6
+# Source0-md5: 5a05827b25b66cdfb68bdce163f13e37
Source1: get-source.sh
Patch0: system-libs.patch
Patch1: gcc-headers.patch
@@ -172,6 +172,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2012/07/07 19:56:16 glen
+- smaller tarball by excluding deps from checkout present as system libs
+
Revision 1.14 2012/07/07 19:04:49 glen
- cleanup unused (bogus) deps, add missing BR detected by cleanbuild
- default config loads mod_headers, depend on the package
================================================================
Index: packages/apache-mod_pagespeed/get-source.sh
diff -u packages/apache-mod_pagespeed/get-source.sh:1.6 packages/apache-mod_pagespeed/get-source.sh:1.7
--- packages/apache-mod_pagespeed/get-source.sh:1.6 Sat Jul 7 15:32:51 2012
+++ packages/apache-mod_pagespeed/get-source.sh Sat Jul 7 21:56:16 2012
@@ -8,6 +8,7 @@
# leave empty to use latest tag, or "trunk" for trunk
version=
spec=apache-mod_pagespeed.spec
+force=0
# abort on errors
set -e
@@ -15,6 +16,11 @@
dir=$(dirname "$0")
cd "$dir"
+if [[ "$1" = *force ]]; then
+ force=1
+ shift
+fi
+
if [ "$1" ]; then
version=$1
fi
@@ -35,7 +41,7 @@
tarball=$pkg-$version.tar.bz2
fi
-if [ -f $tarball ]; then
+if [ -f $tarball -a $force != 1 ]; then
echo "Tarball $tarball already exists"
exit 0
fi
@@ -56,13 +62,22 @@
chmod a+x depot_tools/gclient depot_tools/update_depot_tools
}
+topdir=${PWD:-($pwd)}
+gclient=$topdir/gclient.conf
install -d $pkg
cd $pkg
-# force update
-rm -f .gclient
-../depot_tools/gclient config $svnurl
-../depot_tools/gclient sync
+if [ ! -f .gclient ]; then
+ if [ ! -f $gclient ]; then
+ ../depot_tools/gclient config $svnurl --gclientfile=$gclient
+ fi
+ cp $gclient .gclient
+fi
+
+# emulate gclient config, preserving our deps
+sed -i -re '/"url"/ s,"http[^"]+","'$svnurl'",' .gclient
+
+../depot_tools/gclient sync -v
# Populate the LASTCHANGE file template as we will not include VCS info in tarball
(cd src/build && svnversion > LASTCHANGE.in)
================================================================
Index: packages/apache-mod_pagespeed/gclient.conf
diff -u /dev/null packages/apache-mod_pagespeed/gclient.conf:1.1
--- /dev/null Sat Jul 7 21:56:21 2012
+++ packages/apache-mod_pagespeed/gclient.conf Sat Jul 7 21:56:16 2012
@@ -0,0 +1,26 @@
+solutions = [
+ { "name" : "src",
+ "url" : "http://modpagespeed.googlecode.com/svn/tags/0.10.22.4/src",
+ "deps_file" : "DEPS",
+ "managed" : True,
+ "custom_deps" : {
+ "src/third_party/apr/src": None,
+ "src/third_party/aprutil/src": None,
+
+ "src/third_party/httpd/src/include": None,
+ "src/third_party/httpd/src/os": None,
+ "src/third_party/httpd24/src/include": None,
+ "src/third_party/httpd24/src/os": None,
+
+ "src/third_party/opencv/src/opencv/include": None,
+ "src/third_party/opencv/src/opencv/modules/core": None,
+ "src/third_party/opencv/src/opencv/modules/imgproc": None,
+ "src/third_party/opencv/src/opencv/modules/highgui": None,
+
+# "src/third_party/zlib": None,
+# "src/third_party/libjpeg": None,
+# "src/third_party/serf/src": None,
+ },
+ "safesync_url": "",
+ },
+]
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/apache-mod_pagespeed/apache-mod_pagespeed.spec?r1=1.14&r2=1.15
http://cvs.pld-linux.org/packages/apache-mod_pagespeed/get-source.sh?r1=1.6&r2=1.7
More information about the pld-cvs-commit
mailing list