From: Elan Ruusamäe Date: Sat, 7 Jul 2012 19:04:49 +0000 (+0000) Subject: - cleanup unused (bogus) deps, add missing BR detected by cleanbuild X-Git-Tag: auto/th/apache-mod_pagespeed-0_10_22_4-1~5 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache-mod_pagespeed.git;a=commitdiff_plain;h=3f27b9989152a97f13398c437bdd0bfe31d9ebc0 - cleanup unused (bogus) deps, add missing BR detected by cleanbuild - default config loads mod_headers, depend on the package - cleanup outdated todo - fix install without hacking around ap24.so - package examples Changed files: apache-mod_pagespeed.spec -> 1.14 --- diff --git a/apache-mod_pagespeed.spec b/apache-mod_pagespeed.spec index 1a068dc..2b9792b 100644 --- a/apache-mod_pagespeed.spec +++ b/apache-mod_pagespeed.spec @@ -7,23 +7,9 @@ # - http://wiki.mediatemple.net/w/(dv)_HOWTO:_Install_mod_pagespeed # TODO # - add unit tests running -# - 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 # - use only source for modpagespeed if system headers are used (remove copies from tarball) # - possible sysdeps (uses release tags) # "serf_src": "http://serf.googlecode.com/svn/tags/0.3.1", -# "apache_httpd_src": "http://svn.apache.org/repos/asf/httpd/httpd/tags/2.2.15", # "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", # protobuf_lite @@ -40,7 +26,7 @@ Summary: Apache module for rewriting web pages to reduce latency and bandwidth Name: apache-mod_%{mod_name} Version: 0.10.22.4 -Release: 0.7 +Release: 0.9 License: Apache v2.0 Group: Networking/Daemons/HTTP Source0: modpagespeed-%{version}.tar.bz2 @@ -55,8 +41,8 @@ BuildRequires: dbus-glib-devel BuildRequires: fontconfig-devel BuildRequires: freetype-devel BuildRequires: glib2-devel +BuildRequires: gperf BuildRequires: gtk+2-devel -BuildRequires: ibus-devel >= 1.3.99.20110425 BuildRequires: libgcrypt-devel BuildRequires: libgnome-keyring-devel BuildRequires: libjpeg-devel @@ -65,6 +51,7 @@ BuildRequires: libselinux-devel BuildRequires: libstdc++-devel >= 5:4.1 BuildRequires: opencv-devel BuildRequires: openssl-devel +BuildRequires: pkgconfig BuildRequires: python-devel >= 1:2.6 BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: xorg-lib-libX11-devel @@ -77,6 +64,7 @@ BuildRequires: __cc >= 4.0 %endif Requires: apache(modules-api) = %apache_modules_api Requires: apache-mod_authz_host +Requires: apache-mod_headers Suggests: apache-mod_deflate BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -113,7 +101,6 @@ CXX="%{__cxx}" \ -Duse_system_libpng=1 \ -Duse_system_opencv=1 \ -Duse_system_zlib=1 \ - -Duse_ibus=1 \ %{nil} cd .. @@ -135,29 +122,28 @@ default: EOF %{__make} -# install.gyp needs fixing, not to install ap24.so, for now duplicate -ln -f src/out/Release/libmod_pagespeed{,_ap24}.so - %install rm -rf $RPM_BUILD_ROOT -%{__make} -j1 -C src/install staging \ +install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir},%{cachedir}/{cache,files}} +%{__make} -j1 -C src/install staging_except_module \ HOSTNAME=localhost \ APACHE_ROOT=%{_pkgrootdir} \ - APACHE_MODULES=%{_pkglibdir} \ + APACHE_MODULES=modules \ APACHE_DOC_ROOT=%{htdocsdir} \ MOD_PAGESPEED_FILE_ROOT=%{cachedir} \ STAGING_DIR=staging +install -p src/out/Release/libmod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so cd src/install/staging -install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}} -install -p mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir} -install -d $RPM_BUILD_ROOT%{cachedir}/{cache,files} cat > $RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf <