[packages/apache-mod_pagespeed: 2/7] up to 1.9.32.4 stable
glen
glen at pld-linux.org
Tue Jul 14 01:39:22 CEST 2015
commit 36c8c93e7ffed21398bfc980ad275926da35b08f
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Jul 13 16:05:43 2015 +0300
up to 1.9.32.4 stable
apache-mod_pagespeed.spec | 10 ++++++----
clean-source.sh | 2 +-
no-dev-stdout.patch | 9 +++++----
3 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/apache-mod_pagespeed.spec b/apache-mod_pagespeed.spec
index d284dfa..f12c64c 100644
--- a/apache-mod_pagespeed.spec
+++ b/apache-mod_pagespeed.spec
@@ -49,13 +49,13 @@
Summary: Apache module for rewriting web pages to reduce latency and bandwidth
Name: apache-mod_%{mod_name}
# beta: 1.9.32.x-beta
-# stable: 1.8.31.x
-Version: 1.8.31.6
-Release: 2
+# stable: 1.9.32.x-stable
+Version: 1.9.32.4
+Release: 0.1
License: Apache v2.0
Group: Networking/Daemons/HTTP
Source0: modpagespeed-%{version}.tar.xz
-# Source0-md5: ab144d1d524ce60db44c4dfd6f3f8ef3
+# Source0-md5: c902122f7d85d4e43cad92911ad59a85
Source1: get-source.sh
Source2: gclient.conf
Patch0: system-libs.patch
@@ -114,6 +114,8 @@ site is maintained.
%patch4 -p1
%patch5 -p1
+sh -x %{_sourcedir}/clean-source.sh
+
rm -r third_party/icu/source
rm -r third_party/icu/genfiles
install -d third_party/icu/source/{common,i18n}
diff --git a/clean-source.sh b/clean-source.sh
index 4bb9bdf..856b50d 100755
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -27,7 +27,7 @@ almost_strip_dirs \
rm -r net/instaweb/rewriter/testdata
rm -r third_party/aprutil/gen
rm -r third_party/chromium/src/base/test
-rm -r third_party/chromium/src/chrome
+#rm -r third_party/chromium/src/chrome
rm -r third_party/chromium/src/net
rm -r third_party/gflags/src/windows
rm -r third_party/giflib/windows
diff --git a/no-dev-stdout.patch b/no-dev-stdout.patch
index 3bb0b18..1a12ec7 100644
--- a/no-dev-stdout.patch
+++ b/no-dev-stdout.patch
@@ -1,5 +1,5 @@
---- modpagespeed-1.5.27.2/build/lastchange.sh~ 2013-05-03 20:30:46.000000000 +0200
-+++ modpagespeed-1.5.27.2/build/lastchange.sh 2013-12-03 11:46:18.047904200 +0100
+--- modpagespeed-1.9.32.4/build/lastchange.sh~ 2015-07-13 13:24:59.000000000 +0300
++++ modpagespeed-1.9.32.4/build/lastchange.sh 2015-07-13 13:28:24.998692401 +0300
@@ -24,7 +24,7 @@
SVN_PATH=$1
shift 1
@@ -9,10 +9,10 @@
while [ $# -ge 2 ]; do
case $1 in
-@@ -49,7 +49,15 @@
+@@ -49,8 +49,16 @@
if [ -z $DEFAULT_FILE ]; then
KEY='Last Changed Rev: '
- REVISION=`svn info $SVN_PATH | grep "$KEY" | sed "s#$KEY##"`
+ REVISION=$(git rev-list --all --count)
- echo LASTCHANGE=$REVISION > $OUT_FILE
+ if [ -z "$OUT_FILE" ]; then
+ echo LASTCHANGE=$REVISION
@@ -27,3 +27,4 @@
+ cat $DEFAULT_FILE > $OUT_FILE
+ fi
fi
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache-mod_pagespeed.git/commitdiff/7de28f263cde4557032a5696c84aad98bcfefa25
More information about the pld-cvs-commit
mailing list