[digikam] digikam-2.5.0

[nucleo]

commit c5cb927747d280b901422e1426ba16e3459665eb
Author: nucleo <nucleo at fedoraproject.org>
Date:   Tue Jan 3 16:40:02 2012 +0200

    digikam-2.5.0

 .gitignore                                         |    1 +
 ...tlas.patch => digikam-2.5.0-clapack-atlas.patch |   13 ++++++-------
 digikam.spec                                       |    9 ++++++---
 sources                                            |    2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b390cf1..1b37c4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /digikam-2.3.0.tar.bz2
 /digikam-2.4.0.tar.bz2
 /digikam-2.4.1.tar.bz2
+/digikam-2.5.0.tar.bz2
diff --git a/digikam-2.1.1-clapack-atlas.patch b/digikam-2.5.0-clapack-atlas.patch
similarity index 79%
rename from digikam-2.1.1-clapack-atlas.patch
rename to digikam-2.5.0-clapack-atlas.patch
index a43ab15..5b0f601 100644
--- a/digikam-2.1.1-clapack-atlas.patch
+++ b/digikam-2.5.0-clapack-atlas.patch
@@ -21,21 +21,20 @@ diff -ur digikam-2.1.1/core/libs/dimg/filters/sharp/matrix.cpp digikam-2.1.1-cla
  #include "clapack.h"
  }
  
-@@ -653,15 +652,13 @@
+@@ -653,14 +653,12 @@
  
- int RefocusMatrix::dgesv (const int N, const int NRHS, double* A, const int lda, double* B, const int ldb)
+ int RefocusMatrix::dgesv(const int N, const int NRHS, double* A, const int lda, double* B, const int ldb)
  {
 -    int result = 0;
 -    integer i_N = N, i_NHRS = NRHS, i_lda = lda, i_ldb = ldb, info;
--    integer* ipiv = new integer[N];
+-    QScopedArrayPointer<integer> ipiv(new integer[N]);
 +    int result;
-+    int* ipiv = new int[N];
++    QScopedArrayPointer<int> ipiv(new int[N]);
  
      // Clapack call.
--    dgesv_ (&i_N, &i_NHRS, A, &i_lda, ipiv, B, &i_ldb, &info);
-+    result = clapack_dgesv (CblasColMajor, N, NRHS, A, lda, ipiv, B, ldb);
+-    dgesv_(&i_N, &i_NHRS, A, &i_lda, ipiv.data(), B, &i_ldb, &info);
++    result = clapack_dgesv (CblasColMajor, N, NRHS, A, lda, ipiv.data(), B, ldb);
  
-     delete [] ipiv;
 -    result = info;
      return (result);
  }
diff --git a/digikam.spec b/digikam.spec
index aabb95e..78023db 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,7 +1,7 @@
 
 Name:	 digikam
-Version: 2.4.1
-Release: 2%{?dist}
+Version: 2.5.0
+Release: 1%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -17,7 +17,7 @@ Source1: digikam-import.desktop
 # also patch matrix.cpp for the ATLAS clapack API
 # The latter part is probably not upstreamable as is, and the former on its own
 # isn't helpful.
-Patch0: digikam-2.1.1-clapack-atlas.patch
+Patch0: digikam-2.5.0-clapack-atlas.patch
 
 ## upstreamable patches
 # move dngconverter icons oxygen->hicolor so visible outside of kde
@@ -472,6 +472,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Tue Jan  3 2012 Alexey Kurov <nucleo at fedoraproject.org> - 2.5.0-1
+- digikam-2.5.0
+
 * Fri Dec 09 2011 Rex Dieter <rdieter at fedoraproject.org> 2.4.1-2
 - make dngconverter app icons to hicolor so usable outside of kde (#682055)
 
diff --git a/sources b/sources
index b3eceb0..6785efa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e36b8cc33f5ac589e4b45b22c902fdd  digikam-2.4.1.tar.bz2
+770355060d2033a044c21b0f155be00c  digikam-2.5.0.tar.bz2