diff --git a/.gitignore b/.gitignore index c1e1009..e8b231d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /digikam-1.9.0.tar.bz2 /digikam-2.5.0.tar.bz2 /digikam-software-compilation-2.6.0-rc.tar.bz2 +/digikam-2.6.0.tar.bz2 diff --git a/digikam-2.6.0-rc-lcms2.patch b/digikam-2.6.0-rc-lcms2.patch deleted file mode 100644 index 5c35651..0000000 --- a/digikam-2.6.0-rc-lcms2.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 6c1db4afb98e1718fa237c6310170b5980d4af81 -Author: Francesco Riosa -Date: Wed May 16 00:09:09 2012 +0200 - - dkCmsTakeProfileID allocate right size - - Thanks Kevin Kofler and Nucleo(Fedora) for squashing it. - BUG: 299886 - -diff --git a/libs/dklcms/digikam-lcms.cpp b/libs/dklcms/digikam-lcms.cpp -index 468eab6..f8542d6 100644 ---- a/libs/dklcms/digikam-lcms.cpp -+++ b/libs/dklcms/digikam-lcms.cpp -@@ -491,7 +491,7 @@ LCMSAPI DWORD LCMSEXPORT dkCmsTakeHeaderFlags(cmsHPROFILE hProfile) - - LCMSAPI const BYTE* LCMSEXPORT dkCmsTakeProfileID(cmsHPROFILE hProfile) - { -- cmsUInt8Number* ProfileID = new cmsUInt8Number(); -+ cmsUInt8Number* ProfileID = new cmsUInt8Number[16]; - cmsGetHeaderProfileID(hProfile, ProfileID); - return static_cast( ProfileID ); - } diff --git a/digikam.spec b/digikam.spec index d9f2285..5125c49 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,13 +1,13 @@ -%define pre rc +#define pre rc Name: digikam Version: 2.6.0 -Release: 0.10.%{?pre}%{?dist} +Release: 1%{?pre}%{?dist} Summary: A digital camera accessing & photo management application License: GPLv2+ URL: http://www.digikam.org/ -Source0: http://downloads.sourceforge.net/digikam/digikam-software-compilation-%{version}%{?pre:-%{pre}}.tar.bz2 +Source0: http://downloads.sourceforge.net/digikam/digikam-%{version}%{?pre:-%{pre}}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # digiKam not listed as a media handler for pictures in Nautilus (#516447) @@ -23,9 +23,6 @@ Patch0: digikam-2.5.0-clapack-atlas.patch ## upstreamable patches ## upstream patches -# dkCmsTakeProfileID allocate right size (kde#299886) -# http://commits.kde.org/digikam/6c1db4afb98e1718fa237c6310170b5980d4af81 -Patch100: digikam-2.6.0-rc-lcms2.patch # for clapack, see also the clapack-atlas patch BuildRequires: atlas-devel @@ -221,9 +218,6 @@ BuildArch: noarch %patch0 -p1 -b .clapack-atlas -pushd core -%patch100 -p1 -b .lcms2 -popd %build @@ -511,6 +505,9 @@ update-desktop-database -q &> /dev/null %changelog +* Tue Jun 5 2012 Alexey Kurov - 2.6.0-1 +- digikam-2.6.0 + * Tue May 29 2012 Rex Dieter 2.6.0-0.10.rc - rebuild (kde-4.9beta) diff --git a/sources b/sources index 0193234..3b8dcb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -271892857156464617a0513b5ec108d8 digikam-software-compilation-2.6.0-rc.tar.bz2 +5caf799b9a74d3bed3490d2cf66021dd digikam-2.6.0.tar.bz2