- Adjust library order in opencv.pc.in (BZ 445937).
This commit is contained in:
parent
14e45bab1f
commit
de7b8fa204
9
opencv-1.0.0-pkgconfig.diff
Normal file
9
opencv-1.0.0-pkgconfig.diff
Normal file
@ -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}
|
13
opencv.spec
13
opencv.spec
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
Name: opencv
|
Name: opencv
|
||||||
Version: 1.0.0
|
Version: 1.0.0
|
||||||
Release: 5%{?dist}
|
Release: 8%{?dist}
|
||||||
Summary: Collection of algorithms for computer vision
|
Summary: Collection of algorithms for computer vision
|
||||||
|
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
@ -16,6 +16,7 @@ Source1: opencv-samples-Makefile
|
|||||||
Patch0: opencv-1.0.0-pythondir.diff
|
Patch0: opencv-1.0.0-pythondir.diff
|
||||||
Patch1: opencv-1.0.0-configure.in.diff
|
Patch1: opencv-1.0.0-configure.in.diff
|
||||||
Patch2: opencv-1.0.0-autotools.diff
|
Patch2: opencv-1.0.0-autotools.diff
|
||||||
|
Patch3: opencv-1.0.0-pkgconfig.diff
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: gtk2-devel, libpng-devel, libjpeg-devel, libtiff-devel
|
BuildRequires: gtk2-devel, libpng-devel, libjpeg-devel, libtiff-devel
|
||||||
@ -57,6 +58,7 @@ This package contains Python bindings for the OpenCV library.
|
|||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
%{__sed} -i 's/\r//' interfaces/swig/python/*.py \
|
%{__sed} -i 's/\r//' interfaces/swig/python/*.py \
|
||||||
samples/python/*.py
|
samples/python/*.py
|
||||||
%{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \
|
%{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \
|
||||||
@ -127,6 +129,15 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun May 11 2008 Ralf Corsépius <rc040203@freenet.de> - 1.0.0-8
|
||||||
|
- Adjust library order in opencv.pc.in (BZ 445937).
|
||||||
|
|
||||||
|
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.0.0-7
|
||||||
|
- Autorebuild for GCC 4.3
|
||||||
|
|
||||||
|
* Sun Feb 10 2008 Ralf Corsépius <rc040203@freenet.de> - 1.0.0-6
|
||||||
|
- Rebuild for gcc43.
|
||||||
|
|
||||||
* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.0.0-5
|
* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.0.0-5
|
||||||
- Rebuild for selinux ppc32 issue.
|
- Rebuild for selinux ppc32 issue.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user