fix opencv linking

opencv .pc has full path to .so files, not library names

diff --git a/apache-mod_pagespeed.spec b/apache-mod_pagespeed.spec
index 1a37f230f791822f94aa94eddb070eb8de262897..a17fae6626b7a56217db1652ea9fbcd8060d87c5 100644 (file)
--- a/apache-mod_pagespeed.spec
+++ b/apache-mod_pagespeed.spec
@@ -35,6 +35,7 @@ Source2:      gclient.conf
 Patch0:                system-libs.patch
 Patch1:                gcc-headers.patch
 Patch2:                bug-632.patch
+Patch3:                opencv.patch
 URL:           https://developers.google.com/speed/pagespeed/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.2
@@ -83,6 +84,7 @@ site is maintained.
 %patch0 -p2
 %patch1 -p2
 %patch2 -p2
+%patch3 -p3
 
 %build
 # re-gen makefiles

diff --git a/opencv.patch b/opencv.patch
new file mode 100644 (file)
index 0000000..e50d867
--- /dev/null
+++ b/opencv.patch
@@ -0,0 +1,11 @@
+--- apache-mod_pagespeed/modpagespeed/src/third_party/opencv/opencv.gyp~       2013-03-02 14:27:03.587319085 +0200
++++ apache-mod_pagespeed/modpagespeed/src/third_party/opencv/opencv.gyp        2013-03-02 14:58:26.304299923 +0200
+@@ -190,7 +190,7 @@
+               '<!@(pkg-config --libs-only-L --libs-only-other opencv)',
+             ],
+             'libraries': [
+-              '<!@(pkg-config --libs-only-l opencv)',
++              '<!@(pkg-config --libs opencv)',
+             ],
+           },
+         },