[opencv] Fix opencv2 header location

Nicolas Chauvet kwizart at fedoraproject.org
Thu Jan 6 16:58:19 UTC 2011


commit 60743dbfb3428b8cbb455a3b117efad0b1bce1b8
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Thu Jan 6 15:52:41 2011 +0100

    Fix opencv2 header location

 opencv.spec |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/opencv.spec b/opencv.spec
index 2255dcc..34987fd 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -184,10 +184,6 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/opencv/{doc/,samples/octave/}
 # Remove Rpath in python shared objects:
 find $RPM_BUILD_ROOT%{python_sitearch} -name "*.so" -exec chrpath -d {} ';'
 
-#Move opencv2 headers into the appropriate directory
-mv $RPM_BUILD_ROOT%{_includedir}/opencv2 \
-  $RPM_BUILD_ROOT%{_includedir}/opencv
-
 
 %check
 # Check fails since we don't support most video
@@ -220,6 +216,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/opencv
+%{_includedir}/opencv2
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/opencv.pc
 # own cmake dir avoiding dep on cmake


More information about the scm-commits mailing list