packages: opencv/opencv.spec - files updated

[arekm]

Author: arekm                        Date: Fri Aug 13 11:59:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- files updated

---- Files affected:
packages/opencv:
   opencv.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/opencv/opencv.spec
diff -u packages/opencv/opencv.spec:1.10 packages/opencv/opencv.spec:1.11
--- packages/opencv/opencv.spec:1.10	Fri Aug 13 13:07:23 2010
+++ packages/opencv/opencv.spec	Fri Aug 13 13:59:47 2010
@@ -3,7 +3,7 @@
 Summary:	A library of programming functions mainly aimed at real time computer vision
 Name:		opencv
 Version:	2.1.0
-Release:	0.1
+Release:	1
 Epoch:		1
 License:	BSD
 Group:		Libraries
@@ -84,6 +84,7 @@
 install -d build
 cd build
 %cmake \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 %ifarch i686 pentium4 athlon %{x8664}
 	-DENABLE_SSE2=ON \
 %endif
@@ -95,9 +96,9 @@
 	-DWITH_1394=ON \
 	-DWITH_FFMPEG=ON \
 	-DWITH_GTK=ON \
-	-DWITH_V4L=PN \
+	-DWITH_V4L=ON \
 %if "%{_lib}" == "lib64"
-		-DLIB_SUFFIX=64 \
+	-DLIB_SUFFIX=64 \
 %endif
 	../
 
@@ -110,6 +111,9 @@
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
+install build/unix-install/opencv.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -118,28 +122,28 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog THANKS TODO
-%doc docs/*.{htm,rtf,png,txt} docs/papers docs/ref
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*so.*.*
-%attr(755,root,root) %ghost %{_libdir}/lib*.so.2
+%attr(755,root,root) %ghost %{_libdir}/lib*.so.2.1
+%dir %{_datadir}/opencv
+%{_datadir}/opencv/doc
+%{_datadir}/opencv/haarcascades
+%{_datadir}/opencv/lbpcascades
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
 %{_includedir}/opencv
+%{_datadir}/opencv/OpenCVConfig.cmake
 %{_pkgconfigdir}/*.pc
 
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+#%files static
+#%defattr(644,root,root,755)
+#%{_libdir}/lib*.a
 
 %files -n python-opencv
 %defattr(644,root,root,755)
-%dir %{py_sitedir}/opencv
-%attr(755,root,root) %{py_sitedir}/opencv/*.so
-%{py_sitedir}/opencv/*.py[co]
+%attr(755,root,root) %{py_sitedir}/cv.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -147,6 +151,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2010/08/13 11:59:47  arekm
+- files updated
+
 Revision 1.10  2010/08/13 11:07:23  lisu
 - build with -D__STDC_CONSTANT_MACROS flag to avoid errors (-cflags.patch)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opencv/opencv.spec?r1=1.10&r2=1.11&f=u