From 8a43529416d816205a5fb1e0b2f3eac4d31007ad Mon Sep 17 00:00:00 2001 From: corsepiu Date: May 12 2008 05:19:29 +0000 Subject: - Adjust library order in opencv.pc.in (BZ 445937). --- diff --git a/opencv-1.0.0-pkgconfig.diff b/opencv-1.0.0-pkgconfig.diff new file mode 100644 index 0000000..4e08ede --- /dev/null +++ b/opencv-1.0.0-pkgconfig.diff @@ -0,0 +1,9 @@ +--- opencv-1.0.0.orig/opencv.pc.in 2006-08-02 19:13:34.000000000 +0200 ++++ opencv-1.0.0/opencv.pc.in 2008-05-11 06:27:54.000000000 +0200 +@@ -8,5 +8,5 @@ + Name: OpenCV + Description: Intel(R) Open Source Computer Vision Library + Version: @VERSION@ +-Libs: -L${libdir} -lcxcore -lcv -lhighgui -lcvaux -lml ++Libs: -L${libdir} -lhighgui -lcvaux -lcv -lml -lcxcore + Cflags: -I${includedir} diff --git a/opencv.spec b/opencv.spec index 981725d..d090593 100644 --- a/opencv.spec +++ b/opencv.spec @@ -5,7 +5,7 @@ Name: opencv Version: 1.0.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -16,6 +16,7 @@ Source1: opencv-samples-Makefile Patch0: opencv-1.0.0-pythondir.diff Patch1: opencv-1.0.0-configure.in.diff Patch2: opencv-1.0.0-autotools.diff +Patch3: opencv-1.0.0-pkgconfig.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, libpng-devel, libjpeg-devel, libtiff-devel @@ -57,6 +58,7 @@ This package contains Python bindings for the OpenCV library. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %{__sed} -i 's/\r//' interfaces/swig/python/*.py \ samples/python/*.py %{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \ @@ -127,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun May 11 2008 Ralf Corsépius - 1.0.0-8 +- Adjust library order in opencv.pc.in (BZ 445937). + * Mon Feb 18 2008 Fedora Release Engineering - 1.0.0-7 - Autorebuild for GCC 4.3