Author: glen Date: Thu Nov 4 21:20:14 2010 GMT Module: packages Tag: BINARY ---- Log message: - repackage from .rpm package until we're able to build ourself (not tested if it is compatible with our apache mpm)
---- Files affected: packages/apache-mod_pagespeed: apache-mod_pagespeed.spec (1.3 -> 1.3.2.1) ---- Diffs: ================================================================ Index: packages/apache-mod_pagespeed/apache-mod_pagespeed.spec diff -u packages/apache-mod_pagespeed/apache-mod_pagespeed.spec:1.3 packages/apache-mod_pagespeed/apache-mod_pagespeed.spec:1.3.2.1 --- packages/apache-mod_pagespeed/apache-mod_pagespeed.spec:1.3 Thu Nov 4 22:06:03 2010 +++ packages/apache-mod_pagespeed/apache-mod_pagespeed.spec Thu Nov 4 22:20:09 2010 @@ -1,64 +1,34 @@ # $Revision$, $Date$ -# NOTE -# - use make < 3.82 (from th-obsolete) to hack on code, because 3.82 -# invalidates built objects and it's annoying to wait if all is recompiled -# each time you invoke make -# TODO -# - c++ errors on 64bit/32bit gcc 4.5.1-4: -# /usr/include/c++/4.5.1/bits/stl_map.h:87:5: instantiated from here -# /usr/include/c++/4.5.1/bits/stl_pair.h:77:11: error: ‘std::pair<_T1, _T2>::second’ has incomplete type -# ./net/instaweb/util/public/cache_interface.h:28:7: error: forward declaration of ‘struct net_instaweb::SharedString’ -# make[1]: *** [out/Release/obj.target/mod_pagespeed_test/net/instaweb/util/cache_fetcher_test.o] Error 1 -# http://pastebin.com/Eu88BPSQ -# - sizeof(apr_int32_t) == sizeof(apr_int64_t) on 32bit (!?!): -# third_party/apache/apr/src/strings/apr_snprintf.c: In function 'conv_os_thread_t': -# third_party/apache/apr/src/strings/apr_snprintf.c:500:5: error: duplicate case value -# third_party/apache/apr/src/strings/apr_snprintf.c:498:5: error: previously used here -# third_party/apache/apr/src/strings/apr_snprintf.c: In function 'conv_os_thread_t_hex': -# third_party/apache/apr/src/strings/apr_snprintf.c:671:5: error: duplicate case value -# third_party/apache/apr/src/strings/apr_snprintf.c:669:5: error: previously used here -# - possible sysdeps (uses release tags) -# "serf_src": "http://serf.googlecode.com/svn/tags/0.3.1";, -# "apr_src": "http://svn.apache.org/repos/asf/apr/apr/tags/1.4.2";, -# "aprutil_src": "http://svn.apache.org/repos/asf/apr/apr-util/tags/1.3.9";, -# "apache_httpd_src": "http://svn.apache.org/repos/asf/httpd/httpd/tags/2.2.15";, -# "opencv_src": "https://code.ros.org/svn/opencv/tags/2.1";, -# "gflags_root": "http://google-gflags.googlecode.com/svn/tags/gflags-1.3/src";, -# "google_sparsehash_root": "http://google-sparsehash.googlecode.com/svn/tags/sparsehash-1.8.1/src";, - -%define svndate 20101104 +%define svnrev 128 %define rel 0.1 %define mod_name pagespeed %define apxs %{_sbindir}/apxs Summary: Apache module for rewriting web pages to reduce latency and bandwidth Name: apache-mod_%{mod_name} Version: 0.9.0.0 -Release: 0.1 +Release: 0.2 License: Apache v2.0 Group: Networking/Daemons/HTTP -# svn co http://src.chromium.org/svn/trunk/tools/depot_tools -# install -d modpagespeed -# cd modpagespeed -# ../depot_tools/gclient config http://modpagespeed.googlecode.com/svn/trunk/src -# ../depot_tools/gclient sync -# Populate the LASTCHANGE file template as we no longer have the VCS files at this point -# (cd src/build && svnversion > LASTCHANGE.in) -# cd .. -# tar -cjf modpagespeed-$(date +%Y%m%d).tar.bz2 --exclude-vcs modpagespeed -# ../dropin modpagespeed-$(date +%Y%m%d).tar.bz2 & -Source0: modpagespeed-%{svndate}.tar.bz2 -# Source0-md5: 1640f3c7226ffd3ba4a67f0064241495 +Source0: https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-beta_current_i386.rpm +# Source0-md5: f2c98801bce8bd69d07bb1dcc951f88d +Source1: https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-beta_current_x86_64.rpm +# Source1-md5: fe63524cbcae79034767caccc56da7df URL: http://code.google.com/p/modpagespeed/ BuildRequires: %{apxs} BuildRequires: apache-devel >= 2.2 BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: sed >= 4.0 Requires: apache(modules-api) = %apache_modules_api Suggests: apache-mod_deflate +ExclusiveArch: %{ix86} %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) %define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d +%define _enable_debug_packages 0 +%define no_install_post_strip 1 + %description mod_pagespeed automates the application of those rules in an Apache server. HTML, CSS, JavaScript, and images are changed dynamically @@ -67,36 +37,45 @@ site is maintained. %prep -%setup -q -n modpagespeed - -cat > apache.conf <<EOF -LoadModule %{mod_name}_module modules/mod_%{mod_name}.so > apache.conf +%setup -qcT +%ifarch %{ix86} +SOURCE=%{S:0} +%endif +%ifarch %{x8664} +SOURCE=%{S:1} +%endif + +V=$(rpm -qp --nodigest --nosignature --qf '%{V}' $SOURCE) +R=$(rpm -qp --nodigest --nosignature --qf '%{R}' $SOURCE) +if [ version:$V != version:%{version} -o svnrev:$R != svnrev:%{svnrev} ]; then + exit 1 +fi +rpm2cpio $SOURCE | cpio -i -d -$(cat src/install/common/pagespeed.conf.template) -EOF +mv etc/httpd/conf.d/pagespeed.conf apache.conf +mv usr/lib/httpd/modules . -%build -cat > Makefile <<'EOF' -default: - $(MAKE) -C src \ - BUILDTYPE=%{!?debug:Release}%{?debug:Debug} \ - %{?with_verbose:V=1} \ - CC="%{__cc}" \ - CXX="%{__cxx}" \ - CC.host="%{__cc}" \ - CXX.host="%{__cxx}" \ - LINK.host="%{__cxx}" \ - CFLAGS="%{rpmcflags} %{rpmcppflags}" \ - CXXFLAGS="%{rpmcxxflags} %{rpmcppflags}" \ -EOF -%{__make} +%{__sed} -i -e ' + # fix module load path + s,/''usr/lib/httpd/modules/mod_pagespeed.so,%{_pkglibdir}/mod_%{mod_name}.so, + + # drop loading of deflate module + 3,6d + + # fixup paths + s,/var/mod_pagespeed/cache/,/var/cache/mod_%{mod_name}/, + s,/var/mod_pagespeed/files/,/var/lib/mod_%{mod_name}/, +' apache.conf %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}} -install -p mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir} +install -p modules/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir} cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf +# cache and files dir +install -d $RPM_BUILD_ROOT/var/{cache,lib}/mod_%{mod_name} + %clean rm -rf $RPM_BUILD_ROOT @@ -112,6 +91,8 @@ %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf %attr(755,root,root) %{_pkglibdir}/mod_%{mod_name}.so +%attr(770,root,http) /var/cache/mod_%{mod_name} +%attr(770,root,http) /var/lib/mod_%{mod_name} %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -119,6 +100,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3.2.1 2010/11/04 21:20:09 glen +- repackage from .rpm package until we're able to build ourself (not tested if it is compatible with our apache mpm) + Revision 1.3 2010/11/04 21:06:03 glen - note the full error ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_pagespeed/apache-mod_pagespeed.spec?r1=1.3&r2=1.3.2.1&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
