rpms/opencv/FC-4 opencv-0.9.7-pythondir.patch, NONE, 1.1 opencv.spec, 1.4, 1.5
Simon Perreault (nomis80)
fedora-extras-commits at redhat.com
Tue Mar 7 16:11:19 UTC 2006
Author: nomis80
Update of /cvs/extras/rpms/opencv/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22150
Modified Files:
opencv.spec
Added Files:
opencv-0.9.7-pythondir.patch
Log Message:
* Tue Mar 7 2006 Simon Perreault <nomis80 at nomis80.org> - 0.9.7-6
- Fixed Python bindings location on x86_64.
opencv-0.9.7-pythondir.patch:
--- NEW FILE opencv-0.9.7-pythondir.patch ---
diff -urp opencv-0.9.7.orig/interfaces/swig/python/Makefile.am opencv-0.9.7/interfaces/swig/python/Makefile.am
--- opencv-0.9.7.orig/interfaces/swig/python/Makefile.am 2006-03-06 22:58:41.000000000 -0500
+++ opencv-0.9.7/interfaces/swig/python/Makefile.am 2006-03-07 09:42:55.000000000 -0500
@@ -18,7 +18,7 @@ AM_CPPFLAGS = \
if BUILD_PYTHON_WRAPPERS
- pkgpython_LTLIBRARIES = _cv.la _highgui.la
+ pkgpyexec_LTLIBRARIES = _cv.la _highgui.la
pkgpython_PYTHON = \
__init__.py \
Index: opencv.spec
===================================================================
RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- opencv.spec 7 Mar 2006 04:07:32 -0000 1.4
+++ opencv.spec 7 Mar 2006 16:11:17 -0000 1.5
@@ -1,8 +1,11 @@
%define with_ffmpeg 0
+%define pythondir %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
+%define pyexecdir %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
+
Name: opencv
Version: 0.9.7
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Collection of algorithms for computer vision
Group: Development/Libraries
@@ -10,7 +13,8 @@
URL: http://www.intel.com/technology/computing/opencv/index.htm
Source0: http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz
Source1: opencv-samples-Makefile
-Patch0: opencv-0.9.7-intrinsics-simple.patch
+Patch0: opencv-0.9.7-intrinsics.patch
+Patch1: opencv-0.9.7-pythondir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel, libpng-devel, libjpeg-devel, libtiff-devel
@@ -41,7 +45,7 @@
Summary: Python bindings for apps which use OpenCV
Group: Development/Libraries
Requires: opencv = %{version}-%{release}
-Requires: %{_libdir}/python%(echo `python -c "import sys; print sys.version[0:3]"`)
+Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
%description python
This package contains Python bindings for the OpenCV library.
@@ -49,7 +53,8 @@
%prep
%setup -q
-%patch -p1 -b .intrinsics
+%patch0 -p1 -b .intrinsics
+%patch1 -p1 -b .pythondir
%{__sed} -i 's/\r//' interfaces/swig/python/*.py \
samples/python/*.py
%{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \
@@ -57,15 +62,19 @@
%build
-%configure --disable-static --enable-python --with-apps
+%configure --enable-maintainer-mode --disable-static --enable-python --with-apps
make %{?_smp_mflags}
+%check
+make check
+
+
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \
- $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/opencv/*.la \
+ $RPM_BUILD_ROOT%{pyexecdir}/opencv/*.la \
$RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/build_all.sh \
$RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/cvsample.dsp \
$RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/cvsample.vcproj \
@@ -108,11 +117,18 @@
%files python
-%{_libdir}/python*/site-packages/opencv
+%dir %{pythondir}/opencv
+%{pythondir}/opencv/*.py
+%{pythondir}/opencv/*.pyc
+%ghost %{pythondir}/opencv/*.pyo
+%{pyexecdir}/opencv
%doc %{_datadir}/opencv/samples/python
%changelog
+* Tue Mar 7 2006 Simon Perreault <nomis80 at nomis80.org> - 0.9.7-6
+- Fixed Python bindings location on x86_64.
+
* Mon Mar 6 2006 Simon Perreault <nomis80 at nomis80.org> - 0.9.7-5
- SSE2 support on x86_64.
More information about the fedora-extras-commits
mailing list