update to 2.4.11 [release 2.4.11-1mamba;Fri Aug 14 2015]

opencv.spec

@@ -1,8 +1,8 @@
 %define pkgver %(echo %version | sed "s|[a-z]||")
 %define javaver %(echo %version | cut -d. -f1-3 | tr -d .)
 Name:          opencv
-Version:       2.4.10
+Version:       2.4.11
-Release:       2mamba
+Release:       1mamba
 Summary:       Collection of algorithms for computer vision
 Group:         Development/Libraries
 Vendor:        openmamba
@@ -122,7 +122,29 @@ This package contains Python bindings for the OpenCV library.
 %ifarch %{ix86}
 %patch2 -p1
 %endif
-%patch3 -p1
+#%patch3 -p1
+
+%define _use_internal_dependency_generator 0
+
+# Cohexistance provides/requires for KDE4 legacy package
+%define __find_provides %{_builddir}/opencv-%{version}/find_provides.sh
+cat > %{_builddir}/opencv-%{version}/find_provides.sh <<_EOF
+#! /bin/sh
+grep -v %{buildroot}%{_kde4_libdir} | \
+%{_prefix}/lib/rpm/find-provides %{buildroot} %{_target_cpu}
+_EOF
+chmod +x %{_builddir}/opencv-%{version}/find_provides.sh
+
+%define __find_requires %{_builddir}/opencv-%{version}/find_requires.sh
+cat > %{_builddir}/opencv-%{version}/find_requires.sh <<_EOF
+#! /bin/sh
+%{_prefix}/lib/rpm/find-requires %{buildroot} %{_target_cpu} 2>/dev/null |
+while read line; do
+   [ "\${line:0:10}" == "libopencv_" ] || echo "\$line"
+done
+_EOF
+chmod +x %{_builddir}/opencv-%{version}/find_requires.sh
+
 
 # WARNING: don't reinstall with -D -T or cmake files will be incorrect
 #% ifarch arm
@@ -210,6 +232,7 @@ rm -rf %{buildroot}/opt/kde/lib/python*
 %{_bindir}/opencv_*
 
 %files -n libopencv
+%defattr(-,root,root)
 %{_libdir}/libopencv_*.so.*
 %dir %{_datadir}/OpenCV
 %dir %{_datadir}/OpenCV/haarcascades
@@ -225,10 +248,10 @@ rm -rf %{buildroot}/opt/kde/lib/python*
 %{_includedir}/opencv2/*
 %{_libdir}/libopencv_*.so
 %{_libdir}/libopencv_ts.a
-%{_datadir}/OpenCV/OpenCVModules-release.cmake
+%dir %{_datadir}/OpenCV
-%{_datadir}/OpenCV/OpenCVModules.cmake
+%dir %{_datadir}/OpenCV/doc
-%{_datadir}/OpenCV/OpenCVConfig.cmake
+%{_datadir}/OpenCV/doc/*
-%{_datadir}/OpenCV/OpenCVConfig-version.cmake
+%{_datadir}/OpenCV/*.cmake
 %{_libdir}/pkgconfig/opencv.pc
 
 %files -n java-opencv
@@ -265,6 +288,8 @@ rm -rf %{buildroot}/opt/kde/lib/python*
 %{_kde4_libdir}/libopencv_video.so.*
 %{_kde4_libdir}/libopencv_videostab.so.*
 %dir %{_kde4_sharedir}/OpenCV/
+%dir %{_kde4_sharedir}/OpenCV/doc
+%{_kde4_sharedir}/OpenCV/doc/*
 %dir %{_kde4_sharedir}/OpenCV/haarcascades
 %{_kde4_sharedir}/OpenCV/haarcascades/*
 %dir %{_kde4_sharedir}/OpenCV/lbpcascades
@@ -282,6 +307,9 @@ rm -rf %{buildroot}/opt/kde/lib/python*
 %{_kde4_libdir}/pkgconfig/opencv.pc
 
 %changelog
+* Fri Aug 14 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 2.4.11-1mamba
+- update to 2.4.11
+
 * Fri May 29 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 2.4.10-2mamba
 - build kde4 version with gstreamer 0.10 (should fix digikam)