rpm/opencv
SHA256
1
0
Fork 0
forked from pool/opencv
Code Pull Requests Activity

Accepting request 350582 from KDE:Extra

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/350582
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=59
This commit is contained in:
Dominique Leuenberger 2015-12-27 00:59:41 +00:00 committed by Git OBS Bridge
parent e87f0f1d1f
commit 2f74eb90aa
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opencv-qt5.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Dec 23 16:51:20 UTC 2015 - alarrosa@suse.com
- Remove BuildRequirement for python-sphinx in SLE12, since it's
not available there and it's not a mandatory requirement.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 22 08:47:31 UTC 2015 - olaf@aepfle.de Tue Sep 22 08:47:31 UTC 2015 - olaf@aepfle.de

6
opencv-qt5.spec
View File

@ -85,7 +85,9 @@ BuildRequires: libpng16-compat-devel
BuildRequires: libpng16-devel BuildRequires: libpng16-devel
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: python-numpy-devel BuildRequires: python-numpy-devel
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
BuildRequires: python-sphinx BuildRequires: python-sphinx
%endif
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(glu)
Conflicts: opencv Conflicts: opencv
@ -193,7 +195,11 @@ make %{?_smp_mflags} VERBOSE=1
cd build cd build
make DESTDIR=%{?buildroot:%{buildroot}} install/fast make DESTDIR=%{?buildroot:%{buildroot}} install/fast
mkdir -p %{buildroot}%{_docdir} mkdir -p %{buildroot}%{_docdir}
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
mv %{buildroot}%{_datadir}/OpenCV/doc %{buildroot}%{_docdir}/%{name}-doc mv %{buildroot}%{_datadir}/OpenCV/doc %{buildroot}%{_docdir}/%{name}-doc
%else
mkdir -p %{buildroot}%{_docdir}/%{name}-doc
%endif
mv %{buildroot}%{_datadir}/OpenCV/samples %{buildroot}%{_docdir}/%{name}-doc/examples mv %{buildroot}%{_datadir}/OpenCV/samples %{buildroot}%{_docdir}/%{name}-doc/examples
# Fix rpmlint warning "doc-file-dependency" # Fix rpmlint warning "doc-file-dependency"

6
opencv.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Dec 23 16:51:20 UTC 2015 - alarrosa@suse.com
- Remove BuildRequirement for python-sphinx in SLE12, since it's
not available there and it's not a mandatory requirement.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 2 09:17:09 UTC 2015 - ohering@suse.de Wed Dec 2 09:17:09 UTC 2015 - ohering@suse.de

6
opencv.spec
View File

@ -77,7 +77,9 @@ BuildRequires: libpng16-compat-devel
BuildRequires: libpng16-devel BuildRequires: libpng16-devel
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: python-numpy-devel BuildRequires: python-numpy-devel
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
BuildRequires: python-sphinx BuildRequires: python-sphinx
%endif
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(glu)
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -179,7 +181,11 @@ make %{?_smp_mflags} VERBOSE=1
cd build cd build
make DESTDIR=%{?buildroot:%{buildroot}} install/fast make DESTDIR=%{?buildroot:%{buildroot}} install/fast
mkdir -p %{buildroot}%{_docdir} mkdir -p %{buildroot}%{_docdir}
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
mv %{buildroot}%{_datadir}/OpenCV/doc %{buildroot}%{_docdir}/%{name}-doc mv %{buildroot}%{_datadir}/OpenCV/doc %{buildroot}%{_docdir}/%{name}-doc
%else
mkdir -p %{buildroot}%{_docdir}/%{name}-doc
%endif
mv %{buildroot}%{_datadir}/OpenCV/samples %{buildroot}%{_docdir}/%{name}-doc/examples mv %{buildroot}%{_datadir}/OpenCV/samples %{buildroot}%{_docdir}/%{name}-doc/examples
# Fix rpmlint warning "doc-file-dependency" # Fix rpmlint warning "doc-file-dependency"