Hello community, here is the log from the commit of package opencv for openSUSE:Factory checked in at Tue Oct 18 14:24:19 CEST 2011.
-------- --- openSUSE:Factory/opencv/opencv.changes 2011-09-23 02:15:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/opencv/opencv.changes 2011-10-18 10:19:46.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Oct 18 08:19:10 UTC 2011 - [email protected] + +- uncomment libraries not in 12.1 for now + +------------------------------------------------------------------- +Fri Oct 7 15:15:32 UTC 2011 - [email protected] + +- Changed groups (fix for RPMLINT warning) +- Added check for duplicate files (fix for RPMLINT warning) +- Added py_requires macros and python-base dependencies (fix for RPMLINT warning) +- Escaped macros (fix for RPMLINT warning) +- Fixed end-of-line encoding problems (fix for RPMLINT warning) +- Added libeigen2-devel buildrequires +- Added libunicap and libucil buildrequires (libunicap supports requires libucil) +- Cleaned up spec file formatting + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- OpenCV-2.3.1.tar.bz2 New: ---- OpenCV-2.3.1a.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencv.spec ++++++ --- /var/tmp/diff_new_pack.Ozb8M6/_old 2011-10-18 14:24:16.000000000 +0200 +++ /var/tmp/diff_new_pack.Ozb8M6/_new 2011-10-18 14:24:16.000000000 +0200 @@ -21,50 +21,39 @@ Name: opencv %define libname lib%{name} %define soname 2_3 -Version: 2.3.1 +Version: 2.3.1a Release: 1 +%define dirver 2.3.1 License: BSD3c Summary: Collection of algorithms for computer vision Url: http://%{name}.willowgarage.com/wiki/ -Group: Development/Libraries -Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-unix/%{version}/OpenCV-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM %{name}-libdir.patch [email protected] -- Add an option to install libraries and python packages in lib64. +Group: Development/Libraries/C and C++ +Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-unix/%{dirver}/OpenCV-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM %%{name}-libdir.patch [email protected] -- Add an option to install libraries and python packages in lib64. Patch0: %{name}-libdir.patch -# PATCH-FIX-UPSTREAM %{name}-samples.patch [email protected] -- Improve samples installation. +# PATCH-FIX-UPSTREAM %%{name}-samples.patch [email protected] -- Improve samples installation. Patch1: %{name}-samples.patch -# PATCH-FIX-UPSTREAM %{name}-2.3-underlinking.patch [email protected] -- Make libopencv_highgui.so link to libv4l2 since it's using symbols defined there. +# PATCH-FIX-UPSTREAM %%{name}-2.3-underlinking.patch [email protected] -- Make libopencv_highgui.so link to libv4l2 since it's using symbols defined there. Patch3: %{name}-2.3-underlinking.patch -# PATCH-FIX-OPENSUSE %{name}-datadir.patch [email protected] -- Install data files in share/opencv instead of share/OpenCV. +# PATCH-FIX-OPENSUSE %%{name}-datadir.patch [email protected] -- Install data files in share/opencv instead of share/OpenCV. Patch9: %{name}-datadir.patch -%if 0%{?suse_version} >= 1120 -BuildRequires: gstreamer-0_10-plugins-base-devel -BuildRequires: gstreamer-0_10-devel -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1110 -BuildRequires: libdc1394-devel -BuildRequires: libxine-devel -%else -BuildRequires: xine-devel -%endif BuildRequires: OpenEXR-devel BuildRequires: cmake -BuildRequires: gcc-c++ +BuildRequires: dos2unix +BuildRequires: fdupes +BuildRequires: gstreamer-0_10-plugins-base-devel +BuildRequires: libdc1394-devel +BuildRequires: libeigen2-devel BuildRequires: libjasper-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: libtiff-devel -BuildRequires: python-devel -BuildRequires: zlib-devel BuildRequires: libqt4-devel +#BuildRequires: libucil-devel +#BuildRequires: libunicap-devel +BuildRequires: libxine-devel +BuildRequires: python-numpy-devel %if %{with ffmpeg} BuildRequires: libffmpeg-devel %endif -%if 0%{?suse_version} >= 1130 -BuildRequires: python-numpy-devel -%else -BuildRequires: python-numpy -%endif %if 0%{?suse_version} < 1210 BuildRequires: libv4l-devel %else @@ -77,10 +66,8 @@ Computer Vision algorithms. %package -n %{libname}%{soname} - - Summary: Development files for using the OpenCV library -Group: Development/Libraries +Group: Development/Libraries/C and C++ %description -n %{libname}%{soname} The Open Computer Vision Library is a collection of algorithms and sample code @@ -88,10 +75,8 @@ utilizes Intel Integrated Performance Primitives for better performance. %package devel -License: BSD3c - Summary: Development files for using the OpenCV library -Group: Development/Libraries +Group: Development/Libraries/C and C++ Requires: %{libname}%{soname} = %{version} Requires: %{name} = %{version} @@ -101,20 +86,18 @@ use the OpenCV library. %package -n python-%{name} - - Summary: Python bindings for apps which use OpenCV -Group: Development/Libraries -Requires: python-base +Group: Development/Libraries/Python +Requires: python-base = %{py_ver} +%py_requires %description -n python-%{name} This package contains Python bindings for the OpenCV library. %package -n %{name}-doc - - Summary: Documentation and examples for OpenCV -Group: Documentation +Group: Development/Libraries/C and C++ +Recommends: python # Since this package also contains examples that need -devel to be compiled Recommends: %{name}-devel @@ -122,7 +105,7 @@ This package contains the documentation and examples for the OpenCV library. %prep -%setup -qn OpenCV-%{version} +%setup -qn OpenCV-%{dirver} %patch0 -p1 %patch1 -p1 %patch3 @@ -141,19 +124,18 @@ export CXXFLAGS="%{optflags}" mkdir build cd build -cmake -DCMAKE_SKIP_RPATH=ON \ +cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX='%{_prefix}' \ + -DCMAKE_SKIP_RPATH=ON \ + -DBUILD_TESTS=OFF \ + -DINSTALL_C_EXAMPLES=ON \ + -DINSTALL_PYTHON_EXAMPLES=ON \ -DLIB_SUFFIX=$(echo %{_lib} | cut -b4-) \ - -DCMAKE_BUILD_TYPE=Release \ -DUSE_OMIT_FRAME_POINTER=OFF \ - -DWITH_XINE=ON \ -DWITH_QT=ON \ -%if 0%{?suse_version} >= 1130 -DWITH_QT_OPENGL=ON \ -%endif - -DBUILD_TESTS=OFF \ - -DINSTALL_C_EXAMPLES=ON \ - -DINSTALL_PYTHON_EXAMPLES=ON \ + -DWITH_UNICAP=ON \ + -DWITH_XINE=ON \ .. make %{?_smp_mflags} VERBOSE=1 @@ -163,6 +145,9 @@ mkdir -p %{buildroot}%{_docdir} mv %{buildroot}%{_datadir}/%{name}/doc %{buildroot}%{_docdir}/%{name}-doc mv %{buildroot}%{_datadir}/%{name}/samples %{buildroot}%{_docdir}/%{name}-doc/examples +dos2unix %{buildroot}%{_docdir}/%{name}-doc/examples/python*/*.py +dos2unix %{buildroot}%{_docdir}/%{name}-doc/examples/gpu/*.cpp +%fdupes -s %{buildroot}%{_docdir}/%{name}-doc/examples %clean rm -rf %{buildroot} @@ -191,13 +176,8 @@ %files -n python-%{name} %defattr(0644, root, root, 0755) -%if 0%{?suse_version} < 1120 -%{py_sitedir}/cv.py -%{py_sitedir}/cv2.so -%else %{python_sitearch}/cv.py %{python_sitearch}/cv2.so -%endif %files -n %{name}-doc %defattr(-, root, root, 0755) ++++++ OpenCV-2.3.1.tar.bz2 -> OpenCV-2.3.1a.tar.bz2 ++++++ openSUSE:Factory/opencv/OpenCV-2.3.1.tar.bz2 /mounts/work_src_done/STABLE/opencv/OpenCV-2.3.1a.tar.bz2 differ: char 11, line 1 continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
