rdieter pushed to digikam (epel7). "Merge branch 'master' into f20"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon May 18 19:43:15 UTC 2015
From 782a6d657831850e22de64290e2d26bb2a758f6b Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 26 Jun 2014 11:20:44 -0500
Subject: epel7 love
diff --git a/digikam.spec b/digikam.spec
index c1ccf5a..b11665e 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,6 +1,6 @@
#define pre rc
-%if 0%{?fedora} || 0%{?rhel} > 6
+%if 0%{?fedora}
%define videoslideshow 1
%endif
@@ -39,18 +39,15 @@ BuildRequires: libtiff-devel
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(jasper)
BuildRequires: pkgconfig(lcms2)
-BuildRequires: pkgconfig(lensfun) >= 0.2.6
# libusb required for GPhoto2 support https://bugs.kde.org/268267
# but libgphoto2 switched to libusbx https://bugzilla.redhat.com/997880
BuildRequires: pkgconfig(libusb)
BuildRequires: pkgconfig(libgphoto2_port)
-BuildRequires: pkgconfig(lqr-1)
-BuildRequires: pkgconfig(libpgf) >= 6.11.42
BuildRequires: pkgconfig(libpng) >= 1.2.7
BuildRequires: pkgconfig(libkdcraw) >= 2.2.0
BuildRequires: pkgconfig(libkexiv2) >= 1.0.0
BuildRequires: pkgconfig(libkipi) >= 2.0.0
-BuildRequires: mysql-server
+BuildRequires: mariadb-server
BuildRequires: pkgconfig(exiv2)
## DNG converter
BuildRequires: expat-devel
@@ -71,10 +68,15 @@ BuildRequires: pkgconfig(QJson)
BuildRequires: pkgconfig(QtGStreamer-0.10)
BuildRequires: pkgconfig(ImageMagick)
%endif
-BuildRequires: herqq-devel
# Panorama plugin requires flex and bison
BuildRequires: flex
BuildRequires: bison
+%if 0%{?fedora}
+BuildRequires: herqq-devel
+BuildRequires: pkgconfig(lensfun) >= 0.2.6
+BuildRequires: pkgconfig(lqr-1)
+BuildRequires: pkgconfig(libpgf) >= 6.11.42
+%endif
# when lib(-devel) subpkgs were split
Obsoletes: digikam-devel < 2.0.0-2
--
cgit v0.10.2
From 237dc40b71e438b99fb5510284caf60e95352c2a Mon Sep 17 00:00:00 2001
From: nucleo <nucleo at fedoraproject.org>
Date: Sun, 29 Jun 2014 19:03:55 +0300
Subject: digikam-4.1.0
diff --git a/.gitignore b/.gitignore
index cf4c435..616ab78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/digikam-4.0.0.tar.bz2
+/digikam-4.1.0.tar.bz2
diff --git a/digikam.spec b/digikam.spec
index b11665e..5308a9c 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -5,8 +5,8 @@
%endif
Name: digikam
-Version: 4.0.0
-Release: 3%{?pre}%{?dist}
+Version: 4.1.0
+Release: 1%{?pre}%{?dist}
Summary: A digital camera accessing & photo management application
License: GPLv2+
@@ -532,6 +532,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Sun Jun 29 2014 Alexey Kurov <nucleo at fedoraproject.org> - 4.1.0-1
+- digikam-4.1.0
+
* Thu Jun 19 2014 Rex Dieter <rdieter at fedoraproject.org> 4.0.0-3
- BR: kdelibs4-webkit-devel
diff --git a/sources b/sources
index cff2755..5af44af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03438cc1aeb9a266dcf1f2523ffe983d digikam-4.0.0.tar.bz2
+6a142b3f7dc81e4d0ccde6d834223cdf digikam-4.1.0.tar.bz2
--
cgit v0.10.2
From b3a509837bd9a0ff7f6f035825771c8d19fabc26 Mon Sep 17 00:00:00 2001
From: nucleo <nucleo at fedoraproject.org>
Date: Sun, 29 Jun 2014 22:05:51 +0300
Subject: OpenCV >= 2.4.9 required
diff --git a/digikam.spec b/digikam.spec
index 5308a9c..7105cd7 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -58,7 +58,7 @@ BuildRequires: sane-backends-devel
## htmlexport plugin
BuildRequires: pkgconfig(libxslt)
## RemoveRedeye
-BuildRequires: pkgconfig(opencv)
+BuildRequires: pkgconfig(opencv) >= 2.4.9
## Shwup
BuildRequires: pkgconfig(qca2)
## debianscreenshorts
@@ -534,6 +534,7 @@ update-desktop-database -q &> /dev/null
%changelog
* Sun Jun 29 2014 Alexey Kurov <nucleo at fedoraproject.org> - 4.1.0-1
- digikam-4.1.0
+- OpenCV >= 2.4.9 required for libkface
* Thu Jun 19 2014 Rex Dieter <rdieter at fedoraproject.org> 4.0.0-3
- BR: kdelibs4-webkit-devel
--
cgit v0.10.2
From 8092681f5b26adaa06076aa5a8de734863095e6d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 30 Jun 2014 08:34:44 -0500
Subject: .spec cleanup, drop old/unused patch
diff --git a/digikam-3.1.0-opencv20.patch b/digikam-3.1.0-opencv20.patch
deleted file mode 100644
index ee613c6..0000000
--- a/digikam-3.1.0-opencv20.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff -up digikam-3.1.0/core/libs/dimg/filters/nr/libopencv.h.opencv20 digikam-3.1.0/core/libs/dimg/filters/nr/libopencv.h
---- digikam-3.1.0/core/digikam/utils/libopencv.h.opencv20 2013-03-11 03:24:28.000000000 -0500
-+++ digikam-3.1.0/core/digikam/utils/libopencv.h 2013-03-24 20:15:32.499498390 -0500
-@@ -28,7 +28,7 @@
-
- // OpenCV includes
-
--#include <opencv2/core/version.hpp>
-+#include <cvver.h>
-
- #define OPENCV_MAKE_VERSION(major,minor,patch) (((major) << 16) | ((minor) << 8) | (patch))
- #define OPENCV_VERSION OPENCV_MAKE_VERSION(CV_MAJOR_VERSION,CV_MINOR_VERSION,CV_SUBMINOR_VERSION)
-diff -up digikam-3.1.0/extra/kipi-plugins/removeredeyes/plugin/libopencv.h.opencv20 digikam-3.1.0/extra/kipi-plugins/removeredeyes/plugin/libopencv.h
---- digikam-3.1.0/extra/kipi-plugins/removeredeyes/plugin/libopencv.h.opencv20 2013-03-11 03:24:07.000000000 -0500
-+++ digikam-3.1.0/extra/kipi-plugins/removeredeyes/plugin/libopencv.h 2013-03-24 20:05:41.132932117 -0500
-@@ -35,7 +35,7 @@
-
- // OpenCV includes
-
--#include <opencv2/core/version.hpp>
-+#include <cvver.h>
-
- #define OPENCV_MAKE_VERSION(major,minor,patch) (((major) << 16) | ((minor) << 8) | (patch))
- #define OPENCV_VERSION OPENCV_MAKE_VERSION(CV_MAJOR_VERSION,CV_MINOR_VERSION,CV_SUBMINOR_VERSION)
-diff -up digikam-3.1.0/extra/libkface/libkface/database.cpp.opencv20 digikam-3.1.0/extra/libkface/libkface/database.cpp
---- digikam-3.1.0/extra/libkface/libkface/database.cpp.opencv20 2013-03-11 03:24:20.000000000 -0500
-+++ digikam-3.1.0/extra/libkface/libkface/database.cpp 2013-03-24 20:05:41.132932117 -0500
-@@ -80,7 +80,7 @@ public:
- }
- catch (cv::Exception& e)
- {
-- kError() << "cv::Exception:" << e.what();
-+ kError() << "cv::Exception:" << e.code;
- }
- catch(...)
- {
-@@ -108,7 +108,7 @@ public:
- }
- catch (cv::Exception& e)
- {
-- kError() << "cv::Exception:" << e.what();
-+ kError() << "cv::Exception:" << e.code;
- }
- catch(...)
- {
-@@ -148,7 +148,7 @@ Database::Database(InitFlags flags, cons
- }
- catch (cv::Exception& e)
- {
-- kError() << "cv::Exception:" << e.what();
-+ kError() << "cv::Exception:" << e.code;
- }
- catch(...)
- {
-@@ -190,7 +190,7 @@ QList<Face> Database::detectFaces(const
- }
- catch (cv::Exception& e)
- {
-- kError() << "cv::Exception:" << e.what();
-+ kError() << "cv::Exception:" << e.code;
- }
- catch(...)
- {
-@@ -231,7 +231,7 @@ bool Database::updateFaces(QList<Face>&
- }
- catch (cv::Exception& e)
- {
-- kError() << "cv::Exception:" << e.what();
-+ kError() << "cv::Exception:" << e.code;
- }
- catch(...)
- {
-@@ -278,7 +278,7 @@ QList<double> Database::recognizeFaces(Q
- }
- catch (cv::Exception& e)
- {
-- kError() << "cv::Exception:" << e.what();
-+ kError() << "cv::Exception:" << e.code;
- }
- catch(...)
- {
-diff -up digikam-3.1.0/extra/libkface/libkface/kfaceutils.cpp.opencv20 digikam-3.1.0/extra/libkface/libkface/kfaceutils.cpp
---- digikam-3.1.0/extra/libkface/libkface/kfaceutils.cpp.opencv20 2013-03-11 03:24:20.000000000 -0500
-+++ digikam-3.1.0/extra/libkface/libkface/kfaceutils.cpp 2013-03-24 20:05:41.132932117 -0500
-@@ -94,7 +94,7 @@ IplImage* KFaceUtils::QImage2GrayscaleIp
- }
- catch (cv::Exception& e)
- {
-- kError() << "Cannot allocate IplImage:" << e.what();
-+ kError() << "Cannot allocate IplImage:" << e.code;
- return 0;
- }
- catch(...)
-@@ -132,7 +132,7 @@ IplImage* KFaceUtils::Data2GrayscaleIplI
- }
- catch (cv::Exception& e)
- {
-- kError() << "Cannot allocate IplImage:" << e.what();
-+ kError() << "Cannot allocate IplImage:" << e.code;
- return 0;
- }
- catch(...)
-@@ -229,7 +229,7 @@ QImage KFaceUtils::IplImage2QImage(const
- }
- catch (cv::Exception& e)
- {
-- kError() << "Cannot convert OpenCV Image to QImage:" << e.what();
-+ kError() << "Cannot convert OpenCV Image to QImage:" << e.code;
- }
- catch(...)
- {
-diff -up digikam-3.1.0/extra/libkface/libkface/libopencv.h.opencv20 digikam-3.1.0/extra/libkface/libkface/libopencv.h
---- digikam-3.1.0/extra/libkface/libkface/libopencv.h.opencv20 2013-03-11 03:24:20.000000000 -0500
-+++ digikam-3.1.0/extra/libkface/libkface/libopencv.h 2013-03-24 20:05:41.133932105 -0500
-@@ -28,7 +28,7 @@
-
- // OpenCV includes
-
--#include <opencv2/core/version.hpp>
-+#include <cvver.h>
-
- #define OPENCV_MAKE_VERSION(major,minor,patch) (((major) << 16) | ((minor) << 8) | (patch))
- #define OPENCV_VERSION OPENCV_MAKE_VERSION(CV_MAJOR_VERSION,CV_MINOR_VERSION,CV_SUBMINOR_VERSION)
diff --git a/digikam.spec b/digikam.spec
index 7105cd7..ead630e 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -17,10 +17,7 @@ Source0: http://download.kde.org/%{?pre:un}stable/digikam/digikam-%{version}%{?p
# TODO: upstream me
Source1: digikam-import.desktop
-
## upstreamable patches
-# fix build against opencv-2.0
-Patch51: digikam-3.1.0-opencv20.patch
## upstream patches
@@ -227,17 +224,12 @@ BuildArch: noarch
%prep
%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
-%if 0%{?rhel} == 6
-%patch51 -p1 -b .opencv20
-%endif
-
# 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
+mv -f cmake/modules/FindKipi.cmake cmake/modules/FindKipi.cmake.ORIG
%build
-
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} -DENABLE_LCMS2=ON ..
@@ -247,8 +239,6 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
-rm -rf %{buildroot}
-
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
desktop-file-install --vendor="" \
--
cgit v0.10.2
From 252276dbd1a75bc04adea680a549fa1371c69db2 Mon Sep 17 00:00:00 2001
From: nucleo <nucleo at fedoraproject.org>
Date: Wed, 2 Jul 2014 13:05:02 +0300
Subject: fix %%files
diff --git a/digikam.spec b/digikam.spec
index ead630e..2ea91cf 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -328,7 +328,7 @@ update-desktop-database -q &> /dev/null
%files -f digikam.lang
%doc core/AUTHORS core/ChangeLog core/COPYING
%doc core/NEWS core/README core/TODO
-%doc core/README.FACE core/TODO.FACE core/TODO.MYSQLPORT
+%doc core/TODO.FACE core/TODO.MYSQLPORT
%{_kde4_bindir}/digikam
%{_kde4_bindir}/digitaglinktree
%{_kde4_bindir}/cleanup_digikamdb
@@ -364,6 +364,8 @@ update-desktop-database -q &> /dev/null
%postun -n libkface -p /sbin/ldconfig
%files -n libkface
+%doc extra/libkface/AUTHORS extra/libkface/COPYING
+%doc extra/libkface/README extra/libkface/COPYING.LIB
%{_kde4_appsdir}/libkface/
%{_kde4_libdir}/libkface.so.2*
@@ -377,6 +379,8 @@ update-desktop-database -q &> /dev/null
%postun -n libkgeomap -p /sbin/ldconfig
%files -n libkgeomap -f libkgeomap.lang
+%doc extra/libkgeomap/AUTHORS extra/libkgeomap/COPYING
+%doc extra/libkgeomap/README extra/libkgeomap/COPYING.LIB
%{_kde4_appsdir}/libkgeomap/
%{_kde4_libdir}/libkgeomap.so.1*
@@ -390,6 +394,8 @@ update-desktop-database -q &> /dev/null
%postun -n libmediawiki -p /sbin/ldconfig
%files -n libmediawiki
+%doc extra/libmediawiki/AUTHORS extra/libmediawiki/COPYING
+%doc extra/libmediawiki/README extra/libmediawiki/COPYING.LIB
%{_kde4_libdir}/libmediawiki.so.1*
%files -n libmediawiki-devel
@@ -402,6 +408,7 @@ update-desktop-database -q &> /dev/null
%postun -n libkvkontakte -p /sbin/ldconfig
%files -n libkvkontakte
+%doc extra/libkvkontakte/COPYING extra/libkvkontakte/COPYING.LIB
%{_libdir}/libkvkontakte.so.1*
%files -n libkvkontakte-devel
--
cgit v0.10.2
From 22788db3dd8005313b7752b680f7640f6c9c64d3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 14 Jul 2014 19:26:27 -0500
Subject: rebuild (marble)
diff --git a/digikam.spec b/digikam.spec
index 2ea91cf..110fb1a 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
Name: digikam
Version: 4.1.0
-Release: 1%{?pre}%{?dist}
+Release: 2%{?pre}%{?dist}
Summary: A digital camera accessing & photo management application
License: GPLv2+
@@ -529,6 +529,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Mon Jul 14 2014 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-2
+- rebuild (marble)
+
* Sun Jun 29 2014 Alexey Kurov <nucleo at fedoraproject.org> - 4.1.0-1
- digikam-4.1.0
- OpenCV >= 2.4.9 required for libkface
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/digikam.git/commit/?h=epel7&id=005e2c2c5257e40ad93dd7cbefcc710f97351264
More information about the scm-commits
mailing list