Bug 1194901
Summary: | Build digikam for EPEL7 | ||||||
---|---|---|---|---|---|---|---|
Product: | [Fedora] Fedora EPEL | Reporter: | Orion Poplawski <orion> | ||||
Component: | digikam | Assignee: | Rex Dieter <rdieter> | ||||
Status: | CLOSED ERRATA | QA Contact: | Fedora Extras Quality Assurance <extras-qa> | ||||
Severity: | low | Docs Contact: | |||||
Priority: | unspecified | ||||||
Version: | epel7 | CC: | alekcejk, rdieter, tis | ||||
Target Milestone: | --- | Keywords: | Patch | ||||
Target Release: | --- | ||||||
Hardware: | All | ||||||
OS: | Linux | ||||||
Whiteboard: | |||||||
Fixed In Version: | digikam-4.10.0-5.el7 | Doc Type: | Bug Fix | ||||
Doc Text: | Story Points: | --- | |||||
Clone Of: | Environment: | ||||||
Last Closed: | 2015-06-10 19:16:13 UTC | Type: | Bug | ||||
Regression: | --- | Mount Type: | --- | ||||
Documentation: | --- | CRM: | |||||
Verified Versions: | Category: | --- | |||||
oVirt Team: | --- | RHEL 7.3 requirements from Atomic Host: | |||||
Cloudforms Team: | --- | Target Upstream Version: | |||||
Embargoed: | |||||||
Bug Depends On: | 1195397 | ||||||
Bug Blocks: | |||||||
Attachments: |
|
Description
Orion Poplawski
2015-02-20 21:52:37 UTC
Well, looks like the opencv version in EL7 (2.4.5) will only support digikam 4.0.0 (4.1.0 requires 2.4.9. Perhaps we should should just push the 4.0.0 build. Needs libpgf too. baloo, kfilemetadata-devel and qtsoap-devel appear to be optional. Am now trying with hack to accept opencv 2.4.5 - http://copr-fe.cloud.fedoraproject.org/coprs/orion/digikam/build/78983/ Builds okay with the opencv hack: https://copr-be.cloud.fedoraproject.org/results/orion/digikam/epel-7-x86_64/digikam-4.7.0-2.fc23/ It doesn't build the dlnaexport kipi plugin due to missing deps. diff --git a/digikam.spec b/digikam.spec index c6cb7be..bbb0094 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,7 +1,7 @@ #define pre rc %if 0%{?fedora} -%define videoslideshow 1 +%global videoslideshow 1 %endif Name: digikam @@ -29,10 +29,12 @@ BuildRequires: eigen3-devel BuildRequires: desktop-file-utils BuildRequires: doxygen BuildRequires: gettext +%if 0%{?fedora} BuildRequires: baloo-devel BuildRequires: kfilemetadata-devel # for DLNAExport BuildRequires: qtsoap-devel +%endif # marble integration, http://bugzilla.redhat.com/470578 BuildRequires: marble-devel >= 1:4.6.80 # updated FindKipi.cmake https://bugs.kde.org/show_bug.cgi?id=307213 @@ -62,7 +64,7 @@ BuildRequires: sane-backends-devel ## htmlexport plugin BuildRequires: pkgconfig(libxslt) ## RemoveRedeye -BuildRequires: pkgconfig(opencv) >= 2.4.7 +BuildRequires: pkgconfig(opencv) >= 2.4.5 ## Shwup BuildRequires: pkgconfig(qca2) ## debianscreenshorts @@ -80,9 +82,11 @@ BuildRequires: bison BuildRequires: herqq-devel BuildRequires: pkgconfig(lensfun) >= 0.2.6 BuildRequires: pkgconfig(lqr-1) +%endif +%if 0%{?fedora} || 0%{?epel} >= 7 %define libgpod 1 BuildRequires: pkgconfig(libgpod-1.0) -BuildRequires: pkgconfig(libpgf) >= 6.11.42 +BuildRequires: pkgconfig(libpgf) >= 6.12.24 %endif # when lib(-devel) subpkgs were split @@ -237,8 +241,8 @@ BuildArch: noarch ## HACK to allow building with older opencv (for now), see # https://bugzilla.redhat.com/show_bug.cgi?id=1119036 -sed -i.opencv_247 -e 's|^DETECT_OPENCV(2.4.9 |DETECT_OPENCV(2.4.7 |' extra/libkface/CMakeLists.txt -sed -i.opencv_247 -e 's|OPENCV_MIN_VERSION "2.4.9"|OPENCV_MIN_VERSION "2.4.7"|' \ +sed -i.opencv_245 -e 's|^DETECT_OPENCV(2.4.9 |DETECT_OPENCV(2.4.5 |' extra/libkface/CMakeLists.txt +sed -i.opencv_245 -e 's|OPENCV_MIN_VERSION "2.4.9"|OPENCV_MIN_VERSION "2.4.5"|' \ core/CMakeLists.txt \ extra/kipi-plugins/CMakeLists.txt @@ -508,7 +512,9 @@ update-desktop-database -q &> /dev/null %{_kde4_libdir}/kde4/kipiplugin_vkontakte.so %{_kde4_libdir}/kde4/kipiplugin_yandexfotki.so %{_kde4_libdir}/kde4/kipiplugin_wikimedia.so +%if 0%{?fedora} %{_kde4_libdir}/kde4/kipiplugin_dlnaexport.so +%endif %{_kde4_libdir}/kde4/kipiplugin_jalbumexport.so # Plugin not yet ready for production #{_kde4_libdir}/kde4/kipiplugin_photivointegration.so @@ -525,7 +531,9 @@ update-desktop-database -q &> /dev/null %{_kde4_appsdir}/kipiplugin_panorama/ %{_kde4_appsdir}/kipiplugin_piwigoexport/ %{_kde4_appsdir}/kipiplugin_printimages/ +%if 0%{?fedora} %{_kde4_appsdir}/kipiplugin_dlnaexport/ +%endif %{_kde4_datadir}/applications/kde4/dngconverter.desktop %{_kde4_datadir}/applications/kde4/kipiplugins.desktop %{_kde4_datadir}/applications/kde4/expoblending.desktop Looks like qtsoap was ready to go, just not built, so we'll be able to enable that. Created attachment 995350 [details]
patch for epel support
Current proposed patch to spec.
Rex - any comments? I think you'll end up needing to have a version in your kde4 epel7 copr as well built with some of the newer libraries in there. thanks for the reminder, I'll try to work on this tomorrow. digikam-4.10.0-4.el7 has been submitted as an update for Fedora EPEL 7. https://admin.fedoraproject.org/updates/digikam-4.10.0-4.el7 digikam-4.10.0-4.el7 has been pushed to the Fedora EPEL 7 testing repository. There is one problem with digikam on epel7 testing. package: kipi-plugins-4.10.0-4.el7.x86_64 from epel-testing unresolved deps: hugin-base hugin is not available on epel7/rhel7. digikam-4.10.0-5.el7 has been pushed to the Fedora EPEL 7 testing repository. hugin appears to also need lensfun and libpano13 which are also missing. digikam-4.10.0-5.el7 has been pushed to the Fedora EPEL 7 stable repository. |