pool/digikam
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 281486 from KDE:Extra

Browse Source 
libkface has been split off from digikam upstream and should now be provided as a separate package.  libkface can only be accepted together with this digikam update

OBS-URL: https://build.opensuse.org/request/show/281486
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=133
This commit is contained in:
Stephan Kulow 2015-01-21 21:13:12 +00:00 committed by Git OBS Bridge
commit 007ff49caa
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
digikam.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 15 14:09:02 UTC 2015 - tittiatcoke@gmail.com
- libkface is now a separate package. Do not use the bundled
version on opensUSE 13.2 and higher.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 3 17:58:02 UTC 2015 - nico.kruber@gmail.com Sat Jan 3 17:58:02 UTC 2015 - nico.kruber@gmail.com

14
digikam.spec
View File

@ -48,6 +48,9 @@ BuildRequires: libxslt-devel
BuildRequires: baloo-devel BuildRequires: baloo-devel
%endif %endif
%if 0%{?suse_version} > 1310 %if 0%{?suse_version} > 1310
BuildRequires: libkface-devel
%endif
%if 0%{?suse_version} > 1310
BuildRequires: gstreamer-plugins-qt-devel BuildRequires: gstreamer-plugins-qt-devel
%else %else
BuildRequires: gstreamer-0_10-plugins-qt-devel BuildRequires: gstreamer-0_10-plugins-qt-devel
@ -188,6 +191,7 @@ Currently supported map engine are:
- GoogleMap - GoogleMap
This library is used by kipi-plugins, digiKam and other kipi host programs. This library is used by kipi-plugins, digiKam and other kipi host programs.
%if 0%{?suse_version} < 1320
%package -n libkface-devel %package -n libkface-devel
Summary: Development files for libkface Summary: Development files for libkface
License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT
@ -207,6 +211,7 @@ Obsoletes: libkface2
%description -n libkface3 %description -n libkface3
Libkface is a Qt/C++ wrapper around LibFace to perform face recognition and Libkface is a Qt/C++ wrapper around LibFace to perform face recognition and
detection over pictures. detection over pictures.
%endif
%package -n libmediawiki1 %package -n libmediawiki1
Summary: Interface for MediaWiki based web services Summary: Interface for MediaWiki based web services
@ -259,11 +264,12 @@ popd
%build %build
%if 0%{?suse_version} < 1320 %if 0%{?suse_version} < 1320
EXTRA_FLAGS="-DENABLE_LCMS2=OFF" EXTRA_FLAGS="-DENABLE_LCMS2=OFF -DDIGIKAMSC_COMPILE_LIBKFACE=TRUE"
%else %else
EXTRA_FLAGS="-DENABLE_LCMS2=ON" EXTRA_FLAGS="-DENABLE_LCMS2=ON"
%endif %endif
%cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=TRUE -DDIGIKAMSC_COMPILE_LIBKFACE=TRUE -DDIGIKAMSC_COMPILE_LIBKGEOMAP=TRUE -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=TRUE $EXTRA_FLAGS %cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=TRUE -DDIGIKAMSC_COMPILE_LIBKGEOMAP=TRUE -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=TRUE $EXTRA_FLAGS
# there are files in there that are so heavy to the compiler, that one is enough # there are files in there that are so heavy to the compiler, that one is enough
%make_jobs VERBOSE=1 %make_jobs VERBOSE=1
@ -331,9 +337,11 @@ popd
%postun -n libkgeomap2 -p /sbin/ldconfig %postun -n libkgeomap2 -p /sbin/ldconfig
%if 0%{?suse_version} < 1320
%post -n libkface3 -p /sbin/ldconfig %post -n libkface3 -p /sbin/ldconfig
%postun -n libkface3 -p /sbin/ldconfig %postun -n libkface3 -p /sbin/ldconfig
%endif
%post -n libmediawiki1 -p /sbin/ldconfig %post -n libmediawiki1 -p /sbin/ldconfig
@ -453,6 +461,7 @@ popd
%{_kde4_appsdir}/libkgeomap/ %{_kde4_appsdir}/libkgeomap/
%{_kde4_libdir}/libkgeomap.so.2* %{_kde4_libdir}/libkgeomap.so.2*
%if 0%{?suse_version} < 1320
%files -n libkface3 %files -n libkface3
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_kde4_appsdir}/libkface %{_kde4_appsdir}/libkface
@ -466,6 +475,7 @@ popd
%{_kde4_libdir}/pkgconfig/libkface.pc %{_kde4_libdir}/pkgconfig/libkface.pc
%dir %{_kde4_libdir}/cmake/Kface-3.5.0/ %dir %{_kde4_libdir}/cmake/Kface-3.5.0/
%{_kde4_libdir}/cmake/Kface-3.5.0/*.cmake %{_kde4_libdir}/cmake/Kface-3.5.0/*.cmake
%endif
%files -n libmediawiki1 %files -n libmediawiki1
%defattr(-,root,root,-) %defattr(-,root,root,-)