From 6fb4b561a3242f139a78841693b73bcd4cab179e Mon Sep 17 00:00:00 2001 From: nucleo Date: Jul 08 2012 10:51:41 +0000 Subject: digikam-2.7.0 --- diff --git a/.gitignore b/.gitignore index 07bb94b..c4708d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /digikam-1.9.0.tar.bz2 /digikam-2.5.0.tar.bz2 /digikam-2.6.0.tar.bz2 +/digikam-2.7.0.tar.bz2 diff --git a/digikam-2.6.0-cmake_lensfun.patch b/digikam-2.6.0-cmake_lensfun.patch deleted file mode 100644 index 61c2f27..0000000 --- a/digikam-2.6.0-cmake_lensfun.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up digikam-2.6.0/core/cmake/modules/FindLensFun.cmake.lensfun digikam-2.6.0/core/cmake/modules/FindLensFun.cmake ---- digikam-2.6.0/core/cmake/modules/FindLensFun.cmake.lensfun 2012-06-04 15:38:56.000000000 -0500 -+++ digikam-2.6.0/core/cmake/modules/FindLensFun.cmake 2012-06-28 10:31:32.250644214 -0500 -@@ -34,6 +34,7 @@ else (LENSFUN_LIBRARIES AND LENSFUN_INCL - ${_lensfunIncDir} - /opt/local/include - /sw/include -+ PATH_SUFFIXES lensfun - ) - - find_library(LENSFUN_LIBRARY diff --git a/digikam.spec b/digikam.spec index 48085a4..e49e551 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,8 +1,8 @@ #define pre rc Name: digikam -Version: 2.6.0 -Release: 3%{?pre}%{?dist} +Version: 2.7.0 +Release: 1%{?pre}%{?dist} Summary: A digital camera accessing & photo management application License: GPLv2+ @@ -23,9 +23,6 @@ Patch0: digikam-2.5.0-clapack-atlas.patch ## upstreamable patches ## upstream patches -# fix fix detection of newer lensfun-0.2.6+ -# http://commits.kde.org/digikam/eb454a581dc8668e1dc3c3b8b4ffd4d9a617ad12 -Patch100: digikam-2.6.0-cmake_lensfun.patch # for clapack, see also the clapack-atlas patch BuildRequires: atlas-devel @@ -220,7 +217,6 @@ BuildArch: noarch %setup -q -n %{name}-%{version}%{?pre:-%{pre}} %patch0 -p1 -b .clapack-atlas -%patch100 -p1 -b .cmake_lensfun %build @@ -510,6 +506,9 @@ update-desktop-database -q &> /dev/null %changelog +* Sun Jul 8 2012 Alexey Kurov - 2.7.0-1 +- digikam-2.7.0 + * Thu Jun 28 2012 Rex Dieter 2.6.0-3 - fix build for newer lensfun-0.2.6+ diff --git a/sources b/sources index 3b8dcb7..c16758c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5caf799b9a74d3bed3490d2cf66021dd digikam-2.6.0.tar.bz2 +428e5234fa4daa6f154bf23c63787bdd digikam-2.7.0.tar.bz2