rpms/opencv/FC-5 .cvsignore, 1.2, 1.3 opencv.spec, 1.5, 1.6 sources, 1.2, 1.3
Ralf Corsépius (corsepiu)
fedora-extras-commits at redhat.com
Fri Sep 22 02:11:31 UTC 2006
Author: corsepiu
Update of /cvs/extras/rpms/opencv/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20099
Modified Files:
.cvsignore opencv.spec sources
Log Message:
Sync with devel.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/opencv/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 5 Mar 2006 19:45:57 -0000 1.2
+++ .cvsignore 22 Sep 2006 02:11:31 -0000 1.3
@@ -1 +1 @@
-opencv-0.9.7.tar.gz
+opencv-0.9.9.tar.gz
Index: opencv.spec
===================================================================
RCS file: /cvs/extras/rpms/opencv/FC-5/opencv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- opencv.spec 17 Mar 2006 18:25:19 -0000 1.5
+++ opencv.spec 22 Sep 2006 02:11:31 -0000 1.6
@@ -4,8 +4,8 @@
%define pyexecdir %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
Name: opencv
-Version: 0.9.7
-Release: 16%{?dist}
+Version: 0.9.9
+Release: 2%{?dist}
Summary: Collection of algorithms for computer vision
Group: Development/Libraries
@@ -13,11 +13,11 @@
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
-Patch1: opencv-0.9.7-pythondir.patch
+Patch0: opencv-0.9.9-pythondir.diff
+Patch1: opencv-0.9.9-configure.in.diff
+Patch2: opencv-0.9.9-autotools.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf, automake
BuildRequires: gtk2-devel, libpng-devel, libjpeg-devel, libtiff-devel
BuildRequires: swig >= 1.3.24, zlib-devel, pkgconfig
BuildRequires: python-devel
@@ -35,6 +35,7 @@
Summary: Development files for using the OpenCV library
Group: Development/Libraries
Requires: opencv = %{version}-%{release}
+Requires: pkgconfig
%description devel
This package contains the OpenCV C/C++ library and header files, as well as
@@ -54,17 +55,18 @@
%prep
%setup -q
-%patch0 -p1 -b .intrinsics
-%patch1 -p1 -b .pythondir
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%{__sed} -i 's/\r//' interfaces/swig/python/*.py \
samples/python/*.py
%{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \
interfaces/swig/python/__init__.py
-autoreconf -vif
+find -name Makefile.in | xargs touch
%build
-%configure --disable-static --enable-python --with-apps
+%configure --disable-static --enable-python --enable-apps
make %{?_smp_mflags}
@@ -79,7 +81,12 @@
$RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/facedetect.cmd \
$RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/makefile.gcc \
$RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/makefile.gen
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/Makefile
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/GNUmakefile
+
+
+%check
+# The test suite fails.
+make check ||:
%clean
@@ -115,15 +122,33 @@
%files python
-%dir %{pythondir}/opencv
-%{pythondir}/opencv/*.py
-%{pythondir}/opencv/*.pyc
-%ghost %{pythondir}/opencv/*.pyo
+%{pythondir}/opencv
+%if "%{pythondir}" != "%{pyexecdir}"
%{pyexecdir}/opencv
+%endif
+
%doc %{_datadir}/opencv/samples/python
%changelog
+* Thu Sep 21 2006 Ralf Corsépius <rc040203 at freenet.de> - 0.9.9-2
+- Stop configure.in from hacking CXXFLAGS.
+- Activate testsuite.
+- Let *-devel require pkgconfig.
+
+* Thu Sep 21 2006 Ralf Corsépius <rc040203 at freenet.de> - 0.9.9-1
+- Upstream update.
+- Don't BR: autotools.
+- Install samples' Makefile as GNUmakefile.
+
+* Thu Sep 21 2006 Ralf Corsépius <rc040203 at freenet.de> - 0.9.7-18
+- Un'%%ghost *.pyo.
+- Separate %%{pythondir} from %%{pyexecdir}.
+
+* Thu Sep 21 2006 Ralf Corsépius <rc040203 at freenet.de> - 0.9.7-17
+- Rebuild for FC6.
+- BR: libtool.
+
* Fri Mar 17 2006 Simon Perreault <nomis80 at nomis80.org> - 0.9.7-16
- Rebuild.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opencv/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 5 Mar 2006 19:45:57 -0000 1.2
+++ sources 22 Sep 2006 02:11:31 -0000 1.3
@@ -1 +1 @@
-39cdccd05edd12294db2c238f48ff2ab opencv-0.9.7.tar.gz
+e76c4f0cbf12128d7ae343e3abdfdabd opencv-0.9.9.tar.gz
More information about the fedora-extras-commits
mailing list