- skip building test parts as long we don't do testing

Changed files:
    apache-mod_pagespeed.spec -> 1.16
    gclient.conf -> 1.2

diff --git a/apache-mod_pagespeed.spec b/apache-mod_pagespeed.spec
index 17d4e58628c03587c929d1e2177739934663e2ac..03e2f5442c8735fe7fa44fcc449db21648532ed5 100644 (file)
--- a/apache-mod_pagespeed.spec
+++ b/apache-mod_pagespeed.spec
@@ -26,11 +26,11 @@
 Summary:       Apache module for rewriting web pages to reduce latency and bandwidth
 Name:          apache-mod_%{mod_name}
 Version:       0.10.22.4
-Release:       0.10
+Release:       0.11
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       modpagespeed-%{version}.tar.bz2
-# Source0-md5: 5a05827b25b66cdfb68bdce163f13e37
+# Source0-md5: 447f11184ab8b82f59b07a3e3b99425a
 Source1:       get-source.sh
 Patch0:                system-libs.patch
 Patch1:                gcc-headers.patch
@@ -43,6 +43,7 @@ BuildRequires:        freetype-devel
 BuildRequires: glib2-devel
 BuildRequires: gperf
 BuildRequires: gtk+2-devel
+BuildRequires: python-gyp >= 1-1175
 BuildRequires: libgcrypt-devel
 BuildRequires: libgnome-keyring-devel
 BuildRequires: libjpeg-devel
@@ -107,8 +108,9 @@ cd ..
 
 # makefile wrapper so we could just invoke "make" from shell
 cat > Makefile <<'EOF'
+# target names from build/all.gyp
 default:
-       $(MAKE) -C src \
+       $(MAKE) -C src mod_pagespeed \
        BUILDTYPE=%{!?debug:Release}%{?debug:Debug} \
        %{?with_verbose:V=1} \
        CC="%{__cc}" \

diff --git a/gclient.conf b/gclient.conf
index a1b34c20b76ec48e7ad94778f20e22600b37eeaf..7dd8e260ef40497493b360c0bfe0a07a066706f9 100644 (file)
--- a/gclient.conf
+++ b/gclient.conf
@@ -17,9 +17,17 @@ solutions = [
                "src/third_party/opencv/src/opencv/modules/imgproc": None,
                "src/third_party/opencv/src/opencv/modules/highgui": None,
 
+               "src/tools/gyp": None,
+
+               # these contain needed .gyp, need to checkout
 #              "src/third_party/zlib": None,
 #              "src/third_party/libjpeg": None,
 #              "src/third_party/serf/src": None,
+
+               # as we have no tests, just keep checkouts and tarball smaller
+#              "src/testing": None,
+#              "src/testing/gtest": None,
+#              "src/testing/gmock": None,
     },
     "safesync_url": "",
   },