X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_pagespeed.spec;h=65f02b3d97b5d5ec30d99495695d51def3e9c970;hb=59548b66c21e48d0a9cce0f94fea7c755a987bb6;hp=5edbacbb9dfce6376baee25378afb65a5632cb0e;hpb=1a9213c5c5e34d9ea7d9bc1f7662bfacf3a22e20;p=packages%2Fapache-mod_pagespeed.git

diff --git a/apache-mod_pagespeed.spec b/apache-mod_pagespeed.spec
index 5edbacb..65f02b3 100644
--- a/apache-mod_pagespeed.spec
+++ b/apache-mod_pagespeed.spec
@@ -3,6 +3,7 @@
 %bcond_without	verbose		# verbose build (V=1)
 
 # NOTE
+# - relase notes: https://developers.google.com/speed/pagespeed/module/release_notes
 # - http://code.google.com/p/modpagespeed/wiki/HowToBuild
 # - http://wiki.mediatemple.net/w/(dv)_HOWTO:_Install_mod_pagespeed
 # TODO
@@ -13,33 +14,28 @@
 #  "google_sparsehash_root": "http://google-sparsehash.googlecode.com/svn/tags/sparsehash-1.8.1/src",
 #  protobuf_lite
 
-%if "%{pld_release}" == "ac"
-# add suffix, but allow ccache, etc in ~/.rpmmacros
-%{expand:%%define	__cc	%(echo '%__cc' | sed -e 's,-gcc,-gcc4,')}
-%{expand:%%define	__cxx	%(echo '%__cxx' | sed -e 's,-g++,-g++4,')}
-%{expand:%%define	__cpp	%(echo '%__cpp' | sed -e 's,-gcc,-gcc4,')}
-%endif
-
 %define		mod_name	pagespeed
-%define 	apxs		%{_sbindir}/apxs
+%define		apxs		%{_sbindir}/apxs
 Summary:	Apache module for rewriting web pages to reduce latency and bandwidth
 Name:		apache-mod_%{mod_name}
-Version:	1.3.25.3
-Release:	0.5
+Version:	1.5.27.2
+Release:	3
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	modpagespeed-%{version}.tar.xz
-# Source0-md5:	7df9bf6b1aacec28d81b1678192652ca
+# Source0-md5:	fa8d6a80fc4ca7f929910fa4eeb4a941
 Source1:	get-source.sh
+Source2:	gclient.conf
 Patch0:		system-libs.patch
 Patch1:		gcc-headers.patch
 Patch2:		bug-632.patch
-URL:		https://developers.google.com/speed/pagespeed/
+Patch3:		opencv.patch
+Patch4:		no-dev-stdout.patch
+URL:		https://developers.google.com/speed/pagespeed/module
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.2
 BuildRequires:	glib2-devel
 BuildRequires:	gperf
-BuildRequires:	libjpeg-devel
 BuildRequires:	libselinux-devel
 BuildRequires:	libstdc++-devel >= 5:4.1
 BuildRequires:	opencv-devel >= 2.3.1
@@ -49,16 +45,12 @@ BuildRequires:	python-devel >= 1:2.6
 # 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:	python-gyp >= 0.1-0.svn1602.1
 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"
-BuildRequires:	__cc >= 4.0
-%endif
 Requires:	apache(modules-api) = %apache_modules_api
 Requires:	apache-mod_authz_host
 Requires:	apache-mod_headers
@@ -82,7 +74,9 @@ site is maintained.
 %setup -q -n modpagespeed-%{version}
 %patch0 -p2
 %patch1 -p2
-%patch2 -p2
+%patch2 -p1
+%patch3 -p3
+%patch4 -p1
 
 %build
 # re-gen makefiles