commit 4623c72a8ff2253fc9e1c50c364846270d6ddd97
Author: Elan Ruusamäe <[email protected]>
Date: Wed Oct 10 23:29:27 2012 +0300
- up to 0.10.22.7; use .xz source
apache-mod_pagespeed.spec | 15 ++++++++++-----
gclient.conf | 17 ++++++++++++-----
get-source.sh | 11 ++++++++---
3 files changed, 30 insertions(+), 13 deletions(-)
---
diff --git a/apache-mod_pagespeed.spec b/apache-mod_pagespeed.spec
index 02df668..f3d010d 100644
--- a/apache-mod_pagespeed.spec
+++ b/apache-mod_pagespeed.spec
@@ -25,12 +25,12 @@
%define apxs %{_sbindir}/apxs
Summary: Apache module for rewriting web pages to reduce latency and
bandwidth
Name: apache-mod_%{mod_name}
-Version: 0.10.22.4
+Version: 0.10.22.7
Release: 1
License: Apache v2.0
Group: Networking/Daemons/HTTP
-Source0: modpagespeed-%{version}.tar.bz2
-# Source0-md5: 447f11184ab8b82f59b07a3e3b99425a
+Source0: modpagespeed-%{version}.tar.xz
+# Source0-md5: 1c67625812d18899ce6a47da069c6043
Source1: get-source.sh
Patch0: system-libs.patch
Patch1: gcc-headers.patch
@@ -42,13 +42,18 @@ BuildRequires: gperf
BuildRequires: libjpeg-devel
BuildRequires: libselinux-devel
BuildRequires: libstdc++-devel >= 5:4.1
-BuildRequires: opencv-devel
+BuildRequires: opencv-devel >= 2.3.1
BuildRequires: openssl-devel
BuildRequires: pkgconfig
BuildRequires: python-devel >= 1:2.6
-BuildRequires: python-gyp
+# This version of gyp is new enough that it knows to use make for Linux 3.x
+# and FreeBSD, but old enough that 'type': 'settings' works and
+# LINKER_SUPPORTS_ICF hasn't been removed yet.
+BuildRequires: python-gyp >= 1-1175
BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: tar >= 1:1.22
BuildRequires: util-linux
+BuildRequires: xz
BuildRequires: zlib-devel
# gcc4 might be installed, but not current __cc
%if "%(echo %{cc_version} | cut -d. -f1,2)" < "4.0"
diff --git a/gclient.conf b/gclient.conf
index 7dd8e26..e6de3a5 100644
--- a/gclient.conf
+++ b/gclient.conf
@@ -1,22 +1,29 @@
solutions = [
{ "name" : "src",
- "url" :
"http://modpagespeed.googlecode.com/svn/tags/0.10.22.4/src";,
+ "url" :
"http://modpagespeed.googlecode.com/svn/tags/0.10.22.7/src";,
"deps_file" : "DEPS",
"managed" : True,
+
+ # deps that can be overriden, are top rooted for names in 'deps' in
src/DEPS
"custom_deps" : {
+ # apr >= 1.4.2
"src/third_party/apr/src": None,
+
+ # apr-util >= 1.3.9
"src/third_party/aprutil/src": None,
+ # apache >= 2.2.15
"src/third_party/httpd/src/include": None,
"src/third_party/httpd/src/os": None,
+
+ # apache >= 2.4.1
"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,
+ # need opencv >= 2.3.1
+ "src/third_party/opencv/src/opencv/": None,
+ # need gyp <= @1175
"src/tools/gyp": None,
# these contain needed .gyp, need to checkout
diff --git a/get-source.sh b/get-source.sh
old mode 100644
new mode 100755
index 68c1b61..ae32ec8
--- a/get-source.sh
+++ b/get-source.sh
@@ -2,6 +2,9 @@
# Usage:
# ./get-source.sh
# Author: Elan Ruusamäe <[email protected]>
+#
+# To see release notes, see this page:
+# https://developers.google.com/speed/docs/mod_pagespeed/release_notes
pkg=modpagespeed
baseurl=http://modpagespeed.googlecode.com/svn
@@ -34,11 +37,11 @@ fi
if [ "$version" = "trunk" ]; then
echo "Using trunk"
svnurl=$baseurl/trunk/src
- tarball=$pkg-$(date +%Y%m%d).tar.bz2
+ tarball=$pkg-$(date +%Y%m%d).tar.xz
else
echo "Version: $version"
svnurl=$baseurl/tags/$version/src
- tarball=$pkg-$version.tar.bz2
+ tarball=$pkg-$version.tar.xz
fi
if [ -f $tarball -a $force != 1 ]; then
@@ -54,6 +57,8 @@ fi
# http://www.chromium.org/developers/how-tos/install-depot-tools
test -d depot_tools || {
+ # could also checkout:
+ # svn co http://src.chromium.org/svn/trunk/tools/depot_tools
wget -c https://src.chromium.org/svn/trunk/tools/depot_tools.zip
unzip -qq depot_tools.zip
# cd depot_tools
@@ -83,6 +88,6 @@ sed -i -re '/"url"/ s,"http[^"]+","'$svnurl'",' .gclient
(cd src/build && svnversion > LASTCHANGE.in)
cd ..
-tar -cjf $tarball --exclude-vcs $pkg
+tar -cJf $tarball --exclude-vcs $pkg
../md5 $spec
../dropin $tarball &
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache-mod_pagespeed.git/commitdiff/4623c72a8ff2253fc9e1c50c364846270d6ddd97
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
