packages: opencv/opencv.spec - use more recent cmake macro features (macros...

[qboosh]

Author: qboosh                       Date: Thu Sep 22 16:05:07 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use more recent cmake macro features (macros >= 1.606)
- fixed python module packaging
- updated TODO; I'd suggest not to rename package each time upstream decides to change case of letters and back, it's too messy

---- Files affected:
packages/opencv:
   opencv.spec (1.33 -> 1.34) 

---- Diffs:

================================================================
Index: packages/opencv/opencv.spec
diff -u packages/opencv/opencv.spec:1.33 packages/opencv/opencv.spec:1.34
--- packages/opencv/opencv.spec:1.33	Wed Sep 21 09:37:42 2011
+++ packages/opencv/opencv.spec	Thu Sep 22 18:05:01 2011
@@ -1,7 +1,9 @@
 # $Revision$, $Date$
 #
-# TODO: - CUDA support (on bcond)
-#	- consider name change to OpenCV
+# TODO:
+# - CUDA support (on bcond)
+# - OpenNI (http://openni.org/) + PrimeSensor module
+# - XIMEA? cmake file seems to be Win32-specific, but ximea.com has some Linux package
 #
 # Conditional build:
 %bcond_without	gstreamer	# GStreamer support
@@ -60,7 +62,7 @@
 BuildRequires:	python-devel
 BuildRequires:	python-numpy-devel
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.600
+BuildRequires:	rpmbuild(macros) >= 1.606
 BuildRequires:	sed >= 4.0
 BuildRequires:	swig-python
 %{?with_tbb:BuildRequires:	tbb-devel}
@@ -151,8 +153,6 @@
 install -d build
 cd build
 %cmake .. \
-	-DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
-	-DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
 %ifarch pentium4 %{x8664}
 	-DENABLE_SSE=ON \
 	-DENABLE_SSE2=ON \
@@ -181,6 +181,10 @@
 install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
 install build/unix-install/opencv.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
 
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+%py_postclean
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -208,7 +212,7 @@
 %files -n python-opencv
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/cv2.so
-%{py_sitedir}/cv.py
+%{py_sitedir}/cv.py[co]
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -216,6 +220,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2011/09/22 16:05:01  qboosh
+- use more recent cmake macro features (macros >= 1.606)
+- fixed python module packaging
+- updated TODO; I'd suggest not to rename package each time upstream decides to change case of letters and back, it's too messy
+
 Revision 1.33  2011/09/21 07:37:42  lisu
 - lib64 not yet supported for python by upstream
 - multilib.patch restored
================================================================

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