rpms/opencv/F-9 opencv-1.0.0-pkgconfig.diff, NONE, 1.1 opencv.spec, 1.20, 1.21

[Ralf Corsépius (corsepiu)]

Author: corsepiu

Update of /cvs/pkgs/rpms/opencv/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30219

Modified Files:
	opencv.spec 
Added Files:
	opencv-1.0.0-pkgconfig.diff 
Log Message:
* Sun May 11 2008 Ralf Corsépius <rc040203 at freenet.de> - 1.0.0-8
- Adjust library order in opencv.pc.in (BZ 445937).


opencv-1.0.0-pkgconfig.diff:

--- NEW FILE opencv-1.0.0-pkgconfig.diff ---
--- 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}


Index: opencv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opencv/F-9/opencv.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- opencv.spec	18 Feb 2008 23:02:14 -0000	1.20
+++ opencv.spec	12 May 2008 05:19:29 -0000	1.21
@@ -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 @@
 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 @@
 %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 @@
 
 
 %changelog
+* Sun May 11 2008 Ralf Corsépius <rc040203 at freenet.de> - 1.0.0-8
+- Adjust library order in opencv.pc.in (BZ 445937).
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.0-7
 - Autorebuild for GCC 4.3