rdieter pushed to digikam (epel7). "Merge branch 'master' into f20 (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon May 18 19:43:45 UTC 2015 

From ae8a70b098a02dd5d8686eb1b9af402fc9d74dc1 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 26 Jun 2014 11:26:02 -0500
Subject: Revert "backport "Reorder mutex lock" fix (#1091113)"

This reverts commit 21d678989d96339290eae39c89049f9866f1fdfc.

diff --git a/0765-Reorder-mutex-locks-the-ImageInfo-ReadWriteLock-must.patch b/0765-Reorder-mutex-locks-the-ImageInfo-ReadWriteLock-must.patch
deleted file mode 100644
index cb6aa1f..0000000
--- a/0765-Reorder-mutex-locks-the-ImageInfo-ReadWriteLock-must.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 010d0293d322ce458d00ef1ff35ac90562ef7da6 Mon Sep 17 00:00:00 2001
-From: Marcel Wiesweg <marcel.wiesweg at gmx.de>
-Date: Tue, 4 Mar 2014 13:41:50 +0100
-Subject: [PATCH 765/804] Reorder mutex locks - the ImageInfo ReadWriteLock
- must remain an "inner", transparent mutex. It is called from a place where
- DatabaseAccess is locked, so DatabaseAccess must not be locked from a place
- where the ImageInfo lock is held. To reduce by one or two mutex locks,
- consolidate read operations at one place and return the hash from a local
- variable which is in sync with the cached hash. (note: we do not rule out a
- parallel operation between the DatabaseAccess and the writing of the cached
- values. it's so far acceptable for a read cache.)
-
-CCMAIL: mike at mghansen.de
-BUG: 331578
----
- libs/database/imageinfo.cpp | 33 ++++++++++++++++++++++-----------
- 1 file changed, 22 insertions(+), 11 deletions(-)
-
-diff --git a/libs/database/imageinfo.cpp b/libs/database/imageinfo.cpp
-index 631dda7..223ec13 100644
---- a/libs/database/imageinfo.cpp
-+++ b/libs/database/imageinfo.cpp
-@@ -1711,24 +1711,32 @@ QDebug& operator<<(QDebug& stream, const ImageInfo& info)
- 
- ImageInfo::DatabaseFieldsHashRaw ImageInfo::getDatabaseFieldsRaw(const DatabaseFields::Set& requestedSet) const
- {
--    if (!m_data)
-+    if (!m_data || (!m_data->hasVideoMetadata && !m_data->hasImageMetadata))
-     {
-         return DatabaseFieldsHashRaw();
-     }
- 
--    // keep the system locked to make sure all fields are taken from the same cache state
--    /// @todo Actually we need a read-write-lock, but we only have a write lock.
--    ImageInfoWriteLocker writeLocker;
-+    DatabaseFields::VideoMetadataMinSizeType cachedVideoMetadata;
-+    DatabaseFields::ImageMetadataMinSizeType cachedImageMetadata;
-+    ImageInfo::DatabaseFieldsHashRaw cachedHash;
-+    // consolidate to one ReadLocker. In particular, the shallow copy of the QHash must be done under protection
-+    {
-+        ImageInfoReadLocker lock;
-+        cachedVideoMetadata = m_data->videoMetadataCached;
-+        cachedImageMetadata = m_data->imageMetadataCached;
-+        cachedHash = m_data->databaseFieldsHashRaw;
-+    }
-+
-     if (requestedSet.hasFieldsFromVideoMetadata() && m_data->hasVideoMetadata)
-     {
-         const DatabaseFields::VideoMetadata requestedVideoMetadata = requestedSet.getVideoMetadata();
-+        const DatabaseFields::VideoMetadata missingVideoMetadata = requestedVideoMetadata & ~cachedVideoMetadata;
- 
--        const DatabaseFields::VideoMetadata missingVideoMetadata = requestedVideoMetadata & ~m_data->videoMetadataCached;
--//         kDebug()<<QString("videometadata: requested: %1 missing: %3").arg(requestedVideoMetadata, 0, 16).arg(missingVideoMetadata, 0, 16);
-         if (missingVideoMetadata)
-         {
-             const QVariantList fieldValues = DatabaseAccess().db()->getVideoMetadata(m_data->id, missingVideoMetadata);
- 
-+            ImageInfoWriteLocker lock;
-             if (fieldValues.isEmpty())
-             {
-                 m_data.constCastData()->hasVideoMetadata = false;
-@@ -1746,21 +1754,23 @@ ImageInfo::DatabaseFieldsHashRaw ImageInfo::getDatabaseFieldsRaw(const DatabaseF
-                     m_data.constCastData()->databaseFieldsHashRaw.insertField(*it, fieldValue);
-                 }
- 
--                m_data.constCastData()->videoMetadataCached|=missingVideoMetadata;
-+                m_data.constCastData()->videoMetadataCached |= missingVideoMetadata;
-             }
-+            // update for return value
-+            cachedHash = m_data->databaseFieldsHashRaw;
-         }
-     }
- 
-     if (requestedSet.hasFieldsFromImageMetadata() && m_data->hasImageMetadata)
-     {
-         const DatabaseFields::ImageMetadata requestedImageMetadata = requestedSet.getImageMetadata();
-+        const DatabaseFields::ImageMetadata missingImageMetadata   = requestedImageMetadata & ~cachedImageMetadata;
- 
--        const DatabaseFields::ImageMetadata missingImageMetadata = requestedImageMetadata & ~m_data->imageMetadataCached;
--//         kDebug()<<QString("imagemetadata: requested: %1 missing: %3").arg(requestedImageMetadata, 0, 16).arg(missingImageMetadata, 0, 16);
-         if (missingImageMetadata)
-         {
-             const QVariantList fieldValues = DatabaseAccess().db()->getImageMetadata(m_data->id, missingImageMetadata);
- 
-+            ImageInfoWriteLocker lock;
-             if (fieldValues.isEmpty())
-             {
-                 m_data.constCastData()->hasImageMetadata = false;
-@@ -1778,13 +1788,14 @@ ImageInfo::DatabaseFieldsHashRaw ImageInfo::getDatabaseFieldsRaw(const DatabaseF
-                     m_data.constCastData()->databaseFieldsHashRaw.insertField(*it, fieldValue);
-                 }
- 
--                m_data.constCastData()->imageMetadataCached|=missingImageMetadata;
-+                m_data.constCastData()->imageMetadataCached |= missingImageMetadata;
-             }
-+            cachedHash = m_data->databaseFieldsHashRaw;
-         }
-     }
- 
-     // We always return all fields, the caller can just retrieve the ones he needs.
--    return m_data->databaseFieldsHashRaw;
-+    return cachedHash;
- }
- 
- QVariant ImageInfo::getDatabaseFieldRaw(const DatabaseFields::Set& requestedField) const
--- 
-1.9.0
-
diff --git a/digikam.spec b/digikam.spec
index cdd3401..e4cd082 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
 
 Name:    digikam
 Version: 3.5.0
-Release: 5%{?pre}%{?dist}
+Release: 4%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -25,8 +25,6 @@ Patch51:  digikam-3.1.0-opencv20.patch
 ## upstream patches
 # git 3d1a27f9
 Patch100: digikam-3.5.0-panorama-crasher.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1091113
-Patch101: 0765-Reorder-mutex-locks-the-ImageInfo-ReadWriteLock-must.patch
 
 BuildRequires: eigen3-devel
 BuildRequires: desktop-file-utils
@@ -233,9 +231,6 @@ BuildArch: noarch
 %endif
 
 %patch100 -p1 -b .panaroma-crasher
-pushd core
-%patch101 -p1 -b .mutex
-popd
 
 # don't use bundled/old FindKipi.cmake in favor of kdelibs' version
 # see http:/bugs.kde.org/307213
@@ -537,9 +532,6 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
-* Fri Apr 25 2014 Rex Dieter <rdieter at fedoraproject.org> 3.5.0-5
-- backport "Reorder mutex lock" fix (#1091113)
-
 * Tue Feb 04 2014 Rex Dieter <rdieter at fedoraproject.org> 3.5.0-4
 - rebuild (kde-4.12)
 
-- 
cgit v0.10.2


From 8916abc85240d9b82d2e5d94c51f6a703832ddf0 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 26 Jun 2014 11:26:04 -0500
Subject: Revert "rebuild (kde-4.12)"

This reverts commit c1659ffa844f0b973fcea2bedc6424330c9feacb.

diff --git a/digikam.spec b/digikam.spec
index e4cd082..0c13b7c 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
 
 Name:    digikam
 Version: 3.5.0
-Release: 4%{?pre}%{?dist}
+Release: 2%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -532,9 +532,6 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
-* Tue Feb 04 2014 Rex Dieter <rdieter at fedoraproject.org> 3.5.0-4
-- rebuild (kde-4.12)
-
 * Thu Dec 12 2013 Jaroslav Reznik <jreznik at redhat.com> - 3.5.0-2
 - fix panorama crasher rhbz#1040922
 
-- 
cgit v0.10.2


From e1936f8e42f2b4ea140e10dce8dca729581ef085 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 26 Jun 2014 11:26:07 -0500
Subject: Revert "fix panorama crasher rhbz#1040922"

This reverts commit ebd338de11ddfee7156e2d31f963ed52d2712959.

diff --git a/digikam-3.5.0-panorama-crasher.patch b/digikam-3.5.0-panorama-crasher.patch
deleted file mode 100644
index 1d6901b..0000000
--- a/digikam-3.5.0-panorama-crasher.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up digikam-3.5.0/extra/kipi-plugins/panorama/importwizard/lastpage.cpp.panorama-crasher digikam-3.5.0/extra/kipi-plugins/panorama/importwizard/lastpage.cpp
---- digikam-3.5.0/extra/kipi-plugins/panorama/importwizard/lastpage.cpp.panorama-crasher	2013-10-01 08:23:09.000000000 +0200
-+++ digikam-3.5.0/extra/kipi-plugins/panorama/importwizard/lastpage.cpp	2013-12-12 11:50:14.199493306 +0100
-@@ -91,11 +91,7 @@ LastPage::LastPage(Manager* const mngr,
- 
-     QLabel *fileTemplateLabel = new QLabel(i18n("File name template:"), d->saveSettingsGroupBox);
-     formatVBox->addWidget(fileTemplateLabel);
--    QString first = d->mngr->itemsList().front().fileName();
--    QString last = d->mngr->itemsList().back().fileName();
--//     QString file = "panorama";
--    QString file = QString("%1-%2").arg(first.left(first.lastIndexOf('.'))).arg(last.left(last.lastIndexOf('.')));
--    d->fileTemplateKLineEdit  = new KLineEdit(file, d->saveSettingsGroupBox);
-+    d->fileTemplateKLineEdit  = new KLineEdit("panorama", d->saveSettingsGroupBox);
-     d->fileTemplateKLineEdit->setToolTip(i18n("Name of the panorama file (without its extension)."));
-     d->fileTemplateKLineEdit->setWhatsThis(i18n("<b>File name template</b>: Set here the base name of the files that "
-                                                 "will be saved. For example, if your template is <i>panorama</i> and if "
-@@ -146,6 +142,11 @@ LastPage::~LastPage()
- 
- void LastPage::resetTitle()
- {
-+    QString first = d->mngr->itemsList().front().fileName();
-+    QString last = d->mngr->itemsList().back().fileName();
-+    QString file = QString("%1-%2").arg(first.left(first.lastIndexOf('.'))).arg(last.left(last.lastIndexOf('.')));
-+    d->fileTemplateKLineEdit->setText(file);
-+
-     slotTemplateChanged(d->fileTemplateKLineEdit->text());
-     checkFiles();
- }
diff --git a/digikam.spec b/digikam.spec
index 0c13b7c..4259159 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
 
 Name:    digikam
 Version: 3.5.0
-Release: 2%{?pre}%{?dist}
+Release: 1%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -23,8 +23,6 @@ Source1: digikam-import.desktop
 Patch51:  digikam-3.1.0-opencv20.patch
 
 ## upstream patches
-# git 3d1a27f9
-Patch100: digikam-3.5.0-panorama-crasher.patch
 
 BuildRequires: eigen3-devel
 BuildRequires: desktop-file-utils
@@ -230,8 +228,6 @@ BuildArch: noarch
 %patch51 -p1 -b .opencv20
 %endif
 
-%patch100 -p1 -b .panaroma-crasher
-
 # don't use bundled/old FindKipi.cmake in favor of kdelibs' version
 # see http:/bugs.kde.org/307213
 mv cmake/modules/FindKipi.cmake cmake/modules/FindKipi.cmake.ORIG
@@ -532,9 +528,6 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
-* Thu Dec 12 2013 Jaroslav Reznik <jreznik at redhat.com> - 3.5.0-2
-- fix panorama crasher rhbz#1040922
-
 * Wed Oct  9 2013 Alexey Kurov <nucleo at fedoraproject.org> - 3.5.0-1
 - digikam-3.5.0
 
-- 
cgit v0.10.2


From 695837e46a7aa8015ed1b8b435d261227251b133 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 21 Jul 2014 12:24:48 -0500
Subject: ExcludeArch: ppc64 (rhel)

rhel7/ppc64 lacks some dependencies, including: libkdcraw, libkexiv2, libkipi

diff --git a/digikam.spec b/digikam.spec
index b11665e..75b4714 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -12,6 +12,10 @@ Summary: A digital camera accessing & photo management application
 License: GPLv2+
 URL:     http://www.digikam.org/
 Source0: http://download.kde.org/%{?pre:un}stable/digikam/digikam-%{version}%{?pre:-%{pre}}.tar.bz2
+%if 0%{?rhel}
+# rhel7/ppc64 lacks some dependencies, including libkdcraw, libkexiv2, libkipi
+ExcludeArch: ppc64
+%endif
 
 # digiKam not listed as a media handler for pictures in Nautilus (#516447)
 # TODO: upstream me
-- 
cgit v0.10.2


From 629a4e1a211a521b71248f8f822b3cb41500efaa Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 21 Jul 2014 19:19:30 -0500
Subject: libgpod support fedora-only


diff --git a/digikam.spec b/digikam.spec
index 75b4714..3443715 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -55,7 +55,6 @@ BuildRequires: mariadb-server
 BuildRequires: pkgconfig(exiv2)
 ## DNG converter
 BuildRequires: expat-devel
-BuildRequires: pkgconfig(libgpod-1.0)
 # until when/if libksane-devel grows a depn on sane-backends-devel
 BuildRequires: pkgconfig(libksane) 
 BuildRequires: sane-backends-devel
@@ -79,6 +78,8 @@ BuildRequires: bison
 BuildRequires: herqq-devel
 BuildRequires: pkgconfig(lensfun) >= 0.2.6
 BuildRequires: pkgconfig(lqr-1)
+%define libgpod 1
+BuildRequires: pkgconfig(libgpod-1.0)
 BuildRequires: pkgconfig(libpgf) >= 6.11.42
 %endif
 
@@ -284,7 +285,9 @@ mv kipi-plugins.lang kipi-plugins-doc.lang
 %find_lang kipiplugin_gpssync
 %find_lang kipiplugin_htmlexport
 %find_lang kipiplugin_imageviewer
+%if 0%{?libgpod}
 %find_lang kipiplugin_ipodexport
+%endif
 %find_lang kipiplugin_jpeglossless
 %find_lang kipiplugin_kioexportimport
 %find_lang kipiplugin_metadataedit
@@ -303,7 +306,7 @@ kipiplugin_dngconverter.lang kipiplugin_expoblending.lang \
 kipiplugin_facebook.lang kipiplugin_flashexport.lang \
 kipiplugin_flickrexport.lang kipiplugin_galleryexport.lang \
 kipiplugin_gpssync.lang kipiplugin_htmlexport.lang \
-kipiplugin_imageviewer.lang kipiplugin_ipodexport.lang \
+kipiplugin_imageviewer.lang \
 kipiplugin_jpeglossless.lang kipiplugin_kioexportimport.lang \
 kipiplugin_metadataedit.lang kipiplugin_picasawebexport.lang \
 kipiplugin_piwigoexport.lang kipiplugin_printimages.lang \
@@ -311,6 +314,11 @@ kipiplugin_rawconverter.lang kipiplugin_removeredeyes.lang \
 kipiplugin_sendimages.lang kipiplugin_shwup.lang \
 kipiplugin_smug.lang kipiplugin_timeadjust.lang \
 kipiplugins.lang >> kipi-plugins.lang
+%if 0%{?libgpod}
+cat kipiplugin_ipodexport.lang >> kipi-plugins.lang
+%else
+rm -fv %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/kipiplugin_ipodexport.mo
+%endif
 
 ## unpackaged files
 rm -fv %{buildroot}%{_kde4_libdir}/libdigikamcore.so
@@ -468,7 +476,9 @@ update-desktop-database -q &> /dev/null
 %{_kde4_libdir}/kde4/kipiplugin_imageviewer.so
 %{_kde4_libdir}/kde4/kipiplugin_imageshackexport.so
 %{_kde4_libdir}/kde4/kipiplugin_imgurexport.so
+%if 0%{?libgpod}
 %{_kde4_libdir}/kde4/kipiplugin_ipodexport.so
+%endif
 %{_kde4_libdir}/kde4/kipiplugin_jpeglossless.so
 %{_kde4_libdir}/kde4/kipiplugin_kioexportimport.so
 %{_kde4_libdir}/kde4/kipiplugin_kmlexport.so
-- 
cgit v0.10.2


From b6a105db9836e1a0012b3225fc2fc6555e465d5a Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Wed, 23 Jul 2014 21:10:25 +0200
Subject: backport QtGStreamer 1 support (#1092659)

* Wed Jul 23 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.1.0-3
- apply upstream patch to handle QtGstreamer API 1.0 in VideoSlideShow tool;
  whether to build against QtGStreamer 0.10 or 1.x is autodetected (#1092659)

diff --git a/digikam.spec b/digikam.spec
index f5dda93..eaf46ca 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
 
 Name:    digikam
 Version: 4.1.0
-Release: 2%{?pre}%{?dist}
+Release: 3%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -24,6 +24,10 @@ Source1: digikam-import.desktop
 ## upstreamable patches
 
 ## upstream patches
+# handle QtGstreamer API 1.0 in VideoSlideShow tool (Andreas Cord-Landwehr)
+# The patch autodetects whether we have QtGStreamer 0.10 or 1.x.
+# http://commits.kde.org/kipi-plugins/cbc59f1060fe4cf770d35800bbcefb1f89f882de
+Patch100: kipi-plugins-gstreamer1.patch
 
 BuildRequires: eigen3-devel
 BuildRequires: desktop-file-utils
@@ -65,7 +69,8 @@ BuildRequires: pkgconfig(qca2)
 BuildRequires: pkgconfig(QJson) 
 %if 0%{?videoslideshow}
 ## VideoSlideShow
-BuildRequires: pkgconfig(QtGStreamer-0.10)
+# pkgconfig(QtGStreamer-1.0) vs. pkgconfig(QtGStreamer-0.10) is autodetected
+BuildRequires: qt-gstreamer-devel
 BuildRequires: pkgconfig(ImageMagick)
 %endif
 # Panorama plugin requires flex and bison
@@ -229,6 +234,11 @@ BuildArch: noarch
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
+# applied unconditionally, it autodetects the version of QtGStreamer to use
+pushd extra/kipi-plugins
+patch100 -p1 -b .gstreamer1
+popd
+
 # don't use bundled/old FindKipi.cmake in favor of kdelibs' version
 # see http:/bugs.kde.org/307213
 mv -f cmake/modules/FindKipi.cmake cmake/modules/FindKipi.cmake.ORIG
@@ -543,6 +553,10 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Wed Jul 23 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.1.0-3
+- apply upstream patch to handle QtGstreamer API 1.0 in VideoSlideShow tool;
+  whether to build against QtGStreamer 0.10 or 1.x is autodetected (#1092659)
+
 * Mon Jul 14 2014 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-2
 - rebuild (marble)
 
diff --git a/kipi-plugins-gstreamer1.patch b/kipi-plugins-gstreamer1.patch
new file mode 100644
index 0000000..dff2dbd
--- /dev/null
+++ b/kipi-plugins-gstreamer1.patch
@@ -0,0 +1,106 @@
+commit cbc59f1060fe4cf770d35800bbcefb1f89f882de
+Author: Gilles Caulier <caulier.gilles at gmail.com>
+Date:   Thu Jul 10 09:59:49 2014 +0200
+
+    apply patch to handle QtGstreamer API 1.0 in VideoSlideShow tool
+    REVIEW: 119073
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cb1e04c..ff42bb0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -349,6 +349,24 @@ PRINT_PLUGIN_COMPILE_STATUS("Panorama"           FLEX_FOUND AND BISON_FOUND)
+ PRINT_PLUGIN_COMPILE_STATUS("VideoSlideshow"     ImageMagick_FOUND AND QTGSTREAMER_FOUND)
+ PRINT_PLUGIN_COMPILE_STATUS("Wallpaper"          BUILD_WALLPAPER)
+ 
++
++# set QtGStreamer API version
++MESSAGE(STATUS "----------------------------------------------------------------------------------")
++MESSAGE(STATUS "")
++IF((${QtGStreamer_VERSION_MAJOR} EQUAL 1 AND ${QtGStreamer_VERSION_MINOR} EQUAL 1 AND ${QtGStreamer_VERSION_PATCH} GREATER 80)
++    OR (${QtGStreamer_VERSION_MAJOR} EQUAL 1 AND ${QtGStreamer_VERSION_MINOR} GREATER 1))
++    SET(GSTREAMER_API_1 TRUE)
++ELSE((${QtGStreamer_VERSION_MAJOR} EQUAL 1 AND ${QtGStreamer_VERSION_MINOR} EQUAL 1 AND ${QtGStreamer_VERSION_PATCH} GREATER 80)
++    OR (${QtGStreamer_VERSION_MAJOR} EQUAL 1 AND ${QtGStreamer_VERSION_MINOR} GREATER 1))
++    SET(GSTREAMER_API_1 FALSE)
++ENDIF((${QtGStreamer_VERSION_MAJOR} EQUAL 1 AND ${QtGStreamer_VERSION_MINOR} EQUAL 1 AND ${QtGStreamer_VERSION_PATCH} GREATER 80)
++    OR (${QtGStreamer_VERSION_MAJOR} EQUAL 1 AND ${QtGStreamer_VERSION_MINOR} GREATER 1))
++CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/gstreamerapi.h.in_cmake" "${CMAKE_CURRENT_BINARY_DIR}/gstreamerapi.h" @ONLY)
++
++MESSAGE(STATUS "Found QtGstreamer version : ${QtGStreamer_VERSION}")
++MESSAGE(STATUS "Using GStreamer API 1: ${GSTREAMER_API_1}")
++
++
+ MESSAGE(STATUS "----------------------------------------------------------------------------------")
+ MESSAGE(STATUS "")
+ 
+diff --git a/cmake/templates/gstreamerapi.h.in_cmake b/cmake/templates/gstreamerapi.h.in_cmake
+new file mode 100644
+index 0000000..ec5a196
+--- /dev/null
++++ b/cmake/templates/gstreamerapi.h.in_cmake
+@@ -0,0 +1,6 @@
++#ifndef GSTREAMERAPI_H
++#define GSTREAMERAPI_H
++
++#cmakedefine01 GSTREAMER_API_1
++
++#endif
+diff --git a/videoslideshow/manager/encoderdecoder.cpp b/videoslideshow/manager/encoderdecoder.cpp
+index 23eca8a..b25ddd7 100644
+--- a/videoslideshow/manager/encoderdecoder.cpp
++++ b/videoslideshow/manager/encoderdecoder.cpp
+@@ -23,6 +23,7 @@
+  * ============================================================ */
+ 
+ #include "encoderdecoder.moc"
++#include "../../gstreamerapi.h"
+ 
+ // Qt includes
+ 
+@@ -50,6 +51,27 @@ EncoderDecoder::EncoderDecoder()
+ {
+     QGst::init();
+ 
++#if GSTREAMER_API_1
++    m_audioPipelines.append("filesrc location=\"%1\" ! decodebin ! audioconvert ! audioresample !"
++                          "audio/x-raw, rate=%2 ! avenc_mp2 bitrate=%3 ! queue");
++
++    m_audioPipelines.append("filesrc location=\"%1\" ! decodebin ! audioconvert ! audioresample !"
++                          "audio/x-raw, rate=%2 ! lamemp3enc bitrate=%3 ! id3v2mux ! queue");
++
++    m_videoPipelines.append("multifilesrc location=\"%1\" caps=image/ppm,framerate=%2 ! avdec_ppm ! videoconvert !"
++                          " y4menc ! y4mdec ! videoscale ! mpeg2enc format=%3 norm=%4 bitrate=%5 aspect=%6 ! "
++                          " filesink location=\"%7\"");
++
++    m_videoPipelines.append("multifilesrc location=\"%1\" caps=image/ppm,framerate=%2 ! avdec_ppm ! videoconvert !"
++                          " avenc_mpeg4 ! avimux ! filesink location=\"%3\"");
++
++    m_videoPipelines.append("multifilesrc location=\"%1\" caps=image/ppm,framerate=%2 ! avdec_ppm ! videoconvert !"
++                          " theoraenc ! oggmux ! filesink location=\"%3\"");
++
++    m_videoPipelines.append("multifilesrc location=\"%1\" caps=image/ppm,framerate=%2 ! avdec_ppm ! videoconvert ! "
++                          " avenc_mpeg4 ! queue ! mux. filesrc location =\"%3\" ! decodebin ! audioconvert !"
++                          " audio/x-raw, rate=44100 ! lamemp3enc ! queue ! mux. avimux name=mux ! filesink location=\"%4\"");
++#else
+     m_audioPipelines.append("filesrc location=\"%1\" ! decodebin ! audioconvert ! audioresample !"
+                           "audio/x-raw-int, rate=%2 ! ffenc_mp2 bitrate=%3 ! queue");
+ 
+@@ -69,6 +91,8 @@ EncoderDecoder::EncoderDecoder()
+     m_videoPipelines.append("multifilesrc location=\"%1\" caps=image/ppm,framerate=%2 ! ffdec_ppm ! ffmpegcolorspace ! "
+                           " xvidenc ! queue ! mux. filesrc location =\"%3\" ! decodebin ! audioconvert !"
+                           " audio/x-raw-int, rate=44100 ! lamemp3enc ! queue ! mux. avimux name=mux ! filesink location=\"%4\"");
++#endif
++
+ }
+ 
+ EncoderDecoder::~EncoderDecoder()
+@@ -293,7 +317,7 @@ void EncoderDecoder::encodeVideo(const QString& destination, const QString& audi
+ }
+ 
+ /*
+- * 
++ *
+ QGst::BinPtr EncoderDecoder::createAudioSrcBin(QString file, AUDIO_TYPE type, int sampleRate, int bitRate)
+ {
+     QGst::BinPtr audioBin;
-- 
cgit v0.10.2


From 5aaeb4ebd2d324de7bd2c0f76e1f674ed7725fe9 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Wed, 23 Jul 2014 21:34:18 +0200
Subject: fix specfile typo


diff --git a/digikam.spec b/digikam.spec
index eaf46ca..4e9ad67 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -236,7 +236,7 @@ BuildArch: noarch
 
 # applied unconditionally, it autodetects the version of QtGStreamer to use
 pushd extra/kipi-plugins
-patch100 -p1 -b .gstreamer1
+%patch100 -p1 -b .gstreamer1
 popd
 
 # don't use bundled/old FindKipi.cmake in favor of kdelibs' version
-- 
cgit v0.10.2


From 5ce94c4aa6451c86415e46ac564274ef020f8d79 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sun, 3 Aug 2014 12:25:42 -0500
Subject: make kio_mtp fedora only


diff --git a/digikam.spec b/digikam.spec
index 3443715..3c7183c 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
 
 Name:    digikam
 Version: 4.0.0
-Release: 3%{?pre}%{?dist}
+Release: 4%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -90,7 +90,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
 # http://bugzilla.redhat.com/761184
 Requires: kcm_colors
-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0%{?fedora}
 # better default access to mtp-enabled devices
 Requires: kio_mtp
 %endif
@@ -546,6 +546,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Sun Aug 03 2014 Rex Dieter <rdieter at fedoraproject.org> 4.0.0-4
+- make kio_mtp fedora only
+
 * Thu Jun 19 2014 Rex Dieter <rdieter at fedoraproject.org> 4.0.0-3
 - BR: kdelibs4-webkit-devel
 
-- 
cgit v0.10.2


From 5104639ea8ddba8a58b0d69bff0e0a961eb9c722 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sun, 3 Aug 2014 12:27:12 -0500
Subject: fix changelog


diff --git a/digikam.spec b/digikam.spec
index 4205bac..d2ccdc9 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -553,7 +553,7 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
-* Sun Aug 03 2014 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-3
+* Sun Aug 03 2014 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-4
 - make kio_mtp fedora only
 
 * Wed Jul 23 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.1.0-3
-- 
cgit v0.10.2


From c121904eb3003529f90332b97c38aae896bb1edf Mon Sep 17 00:00:00 2001
From: nucleo <nucleo at fedoraproject.org>
Date: Mon, 4 Aug 2014 21:32:30 +0300
Subject: digikam-4.2.0


diff --git a/.gitignore b/.gitignore
index 616ab78..cc8c948 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /digikam-4.0.0.tar.bz2
 /digikam-4.1.0.tar.bz2
+/digikam-4.2.0.tar.bz2
diff --git a/digikam.spec b/digikam.spec
index d2ccdc9..98206bf 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -5,8 +5,8 @@
 %endif
 
 Name:    digikam
-Version: 4.1.0
-Release: 4%{?pre}%{?dist}
+Version: 4.2.0
+Release: 1%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -24,10 +24,6 @@ Source1: digikam-import.desktop
 ## upstreamable patches
 
 ## upstream patches
-# handle QtGstreamer API 1.0 in VideoSlideShow tool (Andreas Cord-Landwehr)
-# The patch autodetects whether we have QtGStreamer 0.10 or 1.x.
-# http://commits.kde.org/kipi-plugins/cbc59f1060fe4cf770d35800bbcefb1f89f882de
-Patch100: kipi-plugins-gstreamer1.patch
 
 BuildRequires: eigen3-devel
 BuildRequires: desktop-file-utils
@@ -234,11 +230,6 @@ BuildArch: noarch
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
-# applied unconditionally, it autodetects the version of QtGStreamer to use
-pushd extra/kipi-plugins
-%patch100 -p1 -b .gstreamer1
-popd
-
 # don't use bundled/old FindKipi.cmake in favor of kdelibs' version
 # see http:/bugs.kde.org/307213
 mv -f cmake/modules/FindKipi.cmake cmake/modules/FindKipi.cmake.ORIG
@@ -553,6 +544,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Mon Aug  4 2014 Alexey Kurov <nucleo at fedoraproject.org> - 4.2.0-1
+- digikam-4.2.0
+
 * Sun Aug 03 2014 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-4
 - make kio_mtp fedora only
 
diff --git a/kipi-plugins-gstreamer1.patch b/kipi-plugins-gstreamer1.patch
deleted file mode 100644
index dff2dbd..0000000
--- a/kipi-plugins-gstreamer1.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-commit cbc59f1060fe4cf770d35800bbcefb1f89f882de
-Author: Gilles Caulier <caulier.gilles at gmail.com>
-Date:   Thu Jul 10 09:59:49 2014 +0200
-
-    apply patch to handle QtGstreamer API 1.0 in VideoSlideShow tool
-    REVIEW: 119073
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cb1e04c..ff42bb0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -349,6 +349,24 @@ PRINT_PLUGIN_COMPILE_STATUS("Panorama"           FLEX_FOUND AND BISON_FOUND)
- PRINT_PLUGIN_COMPILE_STATUS("VideoSlideshow"     ImageMagick_FOUND AND QTGSTREAMER_FOUND)
- PRINT_PLUGIN_COMPILE_STATUS("Wallpaper"          BUILD_WALLPAPER)
- 
-+
-+# set QtGStreamer API version
-+MESSAGE(STATUS "----------------------------------------------------------------------------------")
-+MESSAGE(STATUS "")
-+IF((${QtGStreamer_VERSION_MAJOR} EQUAL 1 AND ${QtGStreamer_VERSION_MINOR} EQUAL 1 AND ${QtGStreamer_VERSION_PATCH} GREATER 80)
-+    OR (${QtGStreamer_VERSION_MAJOR} EQUAL 1 AND ${QtGStreamer_VERSION_MINOR} GREATER 1))
-+    SET(GSTREAMER_API_1 TRUE)
-+ELSE((${QtGStreamer_VERSION_MAJOR} EQUAL 1 AND ${QtGStreamer_VERSION_MINOR} EQUAL 1 AND ${QtGStreamer_VERSION_PATCH} GREATER 80)
-+    OR (${QtGStreamer_VERSION_MAJOR} EQUAL 1 AND ${QtGStreamer_VERSION_MINOR} GREATER 1))
-+    SET(GSTREAMER_API_1 FALSE)
-+ENDIF((${QtGStreamer_VERSION_MAJOR} EQUAL 1 AND ${QtGStreamer_VERSION_MINOR} EQUAL 1 AND ${QtGStreamer_VERSION_PATCH} GREATER 80)
-+    OR (${QtGStreamer_VERSION_MAJOR} EQUAL 1 AND ${QtGStreamer_VERSION_MINOR} GREATER 1))
-+CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/gstreamerapi.h.in_cmake" "${CMAKE_CURRENT_BINARY_DIR}/gstreamerapi.h" @ONLY)
-+
-+MESSAGE(STATUS "Found QtGstreamer version : ${QtGStreamer_VERSION}")
-+MESSAGE(STATUS "Using GStreamer API 1: ${GSTREAMER_API_1}")
-+
-+
- MESSAGE(STATUS "----------------------------------------------------------------------------------")
- MESSAGE(STATUS "")
- 
-diff --git a/cmake/templates/gstreamerapi.h.in_cmake b/cmake/templates/gstreamerapi.h.in_cmake
-new file mode 100644
-index 0000000..ec5a196
---- /dev/null
-+++ b/cmake/templates/gstreamerapi.h.in_cmake
-@@ -0,0 +1,6 @@
-+#ifndef GSTREAMERAPI_H
-+#define GSTREAMERAPI_H
-+
-+#cmakedefine01 GSTREAMER_API_1
-+
-+#endif
-diff --git a/videoslideshow/manager/encoderdecoder.cpp b/videoslideshow/manager/encoderdecoder.cpp
-index 23eca8a..b25ddd7 100644
---- a/videoslideshow/manager/encoderdecoder.cpp
-+++ b/videoslideshow/manager/encoderdecoder.cpp
-@@ -23,6 +23,7 @@
-  * ============================================================ */
- 
- #include "encoderdecoder.moc"
-+#include "../../gstreamerapi.h"
- 
- // Qt includes
- 
-@@ -50,6 +51,27 @@ EncoderDecoder::EncoderDecoder()
- {
-     QGst::init();
- 
-+#if GSTREAMER_API_1
-+    m_audioPipelines.append("filesrc location=\"%1\" ! decodebin ! audioconvert ! audioresample !"
-+                          "audio/x-raw, rate=%2 ! avenc_mp2 bitrate=%3 ! queue");
-+
-+    m_audioPipelines.append("filesrc location=\"%1\" ! decodebin ! audioconvert ! audioresample !"
-+                          "audio/x-raw, rate=%2 ! lamemp3enc bitrate=%3 ! id3v2mux ! queue");
-+
-+    m_videoPipelines.append("multifilesrc location=\"%1\" caps=image/ppm,framerate=%2 ! avdec_ppm ! videoconvert !"
-+                          " y4menc ! y4mdec ! videoscale ! mpeg2enc format=%3 norm=%4 bitrate=%5 aspect=%6 ! "
-+                          " filesink location=\"%7\"");
-+
-+    m_videoPipelines.append("multifilesrc location=\"%1\" caps=image/ppm,framerate=%2 ! avdec_ppm ! videoconvert !"
-+                          " avenc_mpeg4 ! avimux ! filesink location=\"%3\"");
-+
-+    m_videoPipelines.append("multifilesrc location=\"%1\" caps=image/ppm,framerate=%2 ! avdec_ppm ! videoconvert !"
-+                          " theoraenc ! oggmux ! filesink location=\"%3\"");
-+
-+    m_videoPipelines.append("multifilesrc location=\"%1\" caps=image/ppm,framerate=%2 ! avdec_ppm ! videoconvert ! "
-+                          " avenc_mpeg4 ! queue ! mux. filesrc location =\"%3\" ! decodebin ! audioconvert !"
-+                          " audio/x-raw, rate=44100 ! lamemp3enc ! queue ! mux. avimux name=mux ! filesink location=\"%4\"");
-+#else
-     m_audioPipelines.append("filesrc location=\"%1\" ! decodebin ! audioconvert ! audioresample !"
-                           "audio/x-raw-int, rate=%2 ! ffenc_mp2 bitrate=%3 ! queue");
- 
-@@ -69,6 +91,8 @@ EncoderDecoder::EncoderDecoder()
-     m_videoPipelines.append("multifilesrc location=\"%1\" caps=image/ppm,framerate=%2 ! ffdec_ppm ! ffmpegcolorspace ! "
-                           " xvidenc ! queue ! mux. filesrc location =\"%3\" ! decodebin ! audioconvert !"
-                           " audio/x-raw-int, rate=44100 ! lamemp3enc ! queue ! mux. avimux name=mux ! filesink location=\"%4\"");
-+#endif
-+
- }
- 
- EncoderDecoder::~EncoderDecoder()
-@@ -293,7 +317,7 @@ void EncoderDecoder::encodeVideo(const QString& destination, const QString& audi
- }
- 
- /*
-- * 
-+ *
- QGst::BinPtr EncoderDecoder::createAudioSrcBin(QString file, AUDIO_TYPE type, int sampleRate, int bitRate)
- {
-     QGst::BinPtr audioBin;
diff --git a/sources b/sources
index 5af44af..b93c150 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a142b3f7dc81e4d0ccde6d834223cdf  digikam-4.1.0.tar.bz2
+8e12775115604dd4e1d91d345781214b  digikam-4.2.0.tar.bz2
-- 
cgit v0.10.2


From 83618c01862b061f2149b58947961d8508c7addc Mon Sep 17 00:00:00 2001
From: nucleo <nucleo at fedoraproject.org>
Date: Tue, 5 Aug 2014 18:17:31 +0300
Subject: backport linking fix


diff --git a/digikam-4.2.0-fix-linking.patch b/digikam-4.2.0-fix-linking.patch
new file mode 100644
index 0000000..143d3bc
--- /dev/null
+++ b/digikam-4.2.0-fix-linking.patch
@@ -0,0 +1,33 @@
+--- digikam-4.2.0/core/CMakeLists.txt	2014-08-04 02:25:59.000000000 +0300
++++ digikam-4.2.0/core/CMakeLists.txt	2014-08-05 18:12:32.189542242 +0300
+@@ -103,7 +103,7 @@
+ 
+ INCLUDE(MacroUtils)
+ INCLUDE(MacroOpenCV)
+-DETECT_OPENCV(2.4.6 core highgui imgproc)
++DETECT_OPENCV(2.4.9 core highgui objdetect contrib legacy imgproc)
+ 
+ # check the libkdcraw version
+ 
+--- digikam-4.2.0/extra/kipi-plugins/CMakeLists.txt	2014-08-04 02:26:07.000000000 +0300
++++ digikam-4.2.0/extra/kipi-plugins/CMakeLists.txt	2014-08-05 18:09:46.758224538 +0300
+@@ -119,7 +119,7 @@
+ 
+ INCLUDE(MacroUtils)
+ INCLUDE(MacroOpenCV)
+-DETECT_OPENCV(2.4.6 core highgui objdetect contrib)
++DETECT_OPENCV(2.4.9 core highgui objdetect contrib legacy imgproc)
+ 
+ # OpenMP detection requires CMake >= 2.6.3
+ 
+--- digikam-4.2.0/extra/libkface/CMakeLists.txt	2014-08-04 02:26:00.000000000 +0300
++++ digikam-4.2.0/extra/libkface/CMakeLists.txt	2014-08-05 18:10:22.216863850 +0300
+@@ -47,7 +47,7 @@
+ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+ 
+ INCLUDE(MacroOpenCV)
+-DETECT_OPENCV(2.4.9 core highgui objdetect contrib)
++DETECT_OPENCV(2.4.9 core highgui objdetect contrib legacy imgproc)
+ 
+ INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIRS})
+ 
diff --git a/digikam.spec b/digikam.spec
index 98206bf..88a5578 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -24,6 +24,9 @@ Source1: digikam-import.desktop
 ## upstreamable patches
 
 ## upstream patches
+# https://bugs.kde.org/show_bug.cgi?id=338037
+Patch100: digikam-4.2.0-fix-linking.patch
+
 
 BuildRequires: eigen3-devel
 BuildRequires: desktop-file-utils
@@ -230,6 +233,8 @@ BuildArch: noarch
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
+%patch100 -p1 -b .fix-linking
+
 # don't use bundled/old FindKipi.cmake in favor of kdelibs' version
 # see http:/bugs.kde.org/307213
 mv -f cmake/modules/FindKipi.cmake cmake/modules/FindKipi.cmake.ORIG
-- 
cgit v0.10.2


From 33ecfd38da25564765f83c92928bd486ea3384e2 Mon Sep 17 00:00:00 2001
From: nucleo <nucleo at fedoraproject.org>
Date: Wed, 6 Aug 2014 00:20:51 +0300
Subject: enable kdepimlibs support disabled by default in 4.2.0 (kde#338055)


diff --git a/digikam.spec b/digikam.spec
index 88a5578..6686409 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
 
 Name:    digikam
 Version: 4.2.0
-Release: 1%{?pre}%{?dist}
+Release: 2%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -243,7 +243,7 @@ mv -f cmake/modules/FindKipi.cmake cmake/modules/FindKipi.cmake.ORIG
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} -DENABLE_LCMS2=ON ..
+%{cmake_kde4} -DENABLE_LCMS2=ON -DENABLE_KDEPIMLIBSSUPPORT=ON ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -549,6 +549,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Wed Aug  6 2014 Alexey Kurov <nucleo at fedoraproject.org> - 4.2.0-2
+- enable kdepimlibs support disabled by default in 4.2.0 (kde#338055)
+
 * Mon Aug  4 2014 Alexey Kurov <nucleo at fedoraproject.org> - 4.2.0-1
 - digikam-4.2.0
 
-- 
cgit v0.10.2


From 03c725a51a0259d836e56d86356d1c4695dd8eb0 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 7 Aug 2014 14:04:12 -0500
Subject: rebuild (marble)


diff --git a/digikam.spec b/digikam.spec
index 6686409..95a87db 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
 
 Name:    digikam
 Version: 4.2.0
-Release: 2%{?pre}%{?dist}
+Release: 3%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -549,6 +549,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Thu Aug 07 2014 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-3
+- rebuild (marble)
+
 * Wed Aug  6 2014 Alexey Kurov <nucleo at fedoraproject.org> - 4.2.0-2
 - enable kdepimlibs support disabled by default in 4.2.0 (kde#338055)
 
-- 
cgit v0.10.2


From d300c40865a6e93f40cc629159c26f33253b78a5 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 13 Aug 2014 09:55:23 -0500
Subject: hack to allow build with older opencv (#1119036)


diff --git a/digikam.spec b/digikam.spec
index 95a87db..7e7e340 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
 
 Name:    digikam
 Version: 4.2.0
-Release: 3%{?pre}%{?dist}
+Release: 4%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -61,7 +61,7 @@ BuildRequires: sane-backends-devel
 ## htmlexport plugin
 BuildRequires: pkgconfig(libxslt)
 ## RemoveRedeye
-BuildRequires: pkgconfig(opencv) >= 2.4.9
+BuildRequires: pkgconfig(opencv) >= 2.4.7
 ## Shwup
 BuildRequires: pkgconfig(qca2)
 ## debianscreenshorts
@@ -234,6 +234,11 @@ BuildArch: noarch
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
 %patch100 -p1 -b .fix-linking
+## 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/kipi-plugins/CMakeLists.txt \
+  extra/libkface/CMakeLists.txt \
 
 # don't use bundled/old FindKipi.cmake in favor of kdelibs' version
 # see http:/bugs.kde.org/307213
@@ -549,6 +554,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Wed Aug 13 2014 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-4
+- hack to allow build with older opencv (#1119036)
+
 * Thu Aug 07 2014 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-3
 - rebuild (marble)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/digikam.git/commit/?h=epel7&id=c14ec3f065b5644236087ca0af401ca8f779caf2

More information about the scm-commits mailing list