diff --git a/.gitignore b/.gitignore index bd95e5f..751fc72 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /digikam-2.5.0.tar.bz2 /digikam-2.9.0.tar.bz2 /digikam-3.0.0-beta1a.tar.bz2 +/digikam-3.0.0-beta2.tar.bz2 diff --git a/digikam-2.5.0-clapack-atlas.patch b/digikam-2.5.0-clapack-atlas.patch index 5b0f601..1e66733 100644 --- a/digikam-2.5.0-clapack-atlas.patch +++ b/digikam-2.5.0-clapack-atlas.patch @@ -25,7 +25,7 @@ diff -ur digikam-2.1.1/core/libs/dimg/filters/sharp/matrix.cpp digikam-2.1.1-cla int RefocusMatrix::dgesv(const int N, const int NRHS, double* A, const int lda, double* B, const int ldb) { -- int result = 0; +- int result = 0; - integer i_N = N, i_NHRS = NRHS, i_lda = lda, i_ldb = ldb, info; - QScopedArrayPointer ipiv(new integer[N]); + int result; diff --git a/digikam.spec b/digikam.spec index aa31454..948a033 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,8 +1,8 @@ -%define pre beta1a +%define pre beta2 Name: digikam Version: 3.0.0 -Release: 0.3.%{?pre}%{?dist} +Release: 0.4.%{?pre}%{?dist} Summary: A digital camera accessing & photo management application License: GPLv2+ @@ -43,7 +43,7 @@ BuildRequires: pkgconfig(libgphoto2_port) BuildRequires: pkgconfig(lqr-1) BuildRequires: pkgconfig(libpgf) >= 6.11.42 BuildRequires: pkgconfig(libpng) >= 1.2.7 -BuildRequires: pkgconfig(libkdcraw) >= 0.2.0 +BuildRequires: pkgconfig(libkdcraw) >= 2.2.0 BuildRequires: pkgconfig(libkexiv2) >= 1.0.0 BuildRequires: pkgconfig(libkipi) >= 2.0.0 BuildRequires: pkgconfig(sqlite3) @@ -478,7 +478,8 @@ update-desktop-database -q &> /dev/null %{_kde4_libdir}/kde4/kipiplugin_yandexfotki.so %{_kde4_libdir}/kde4/kipiplugin_wikimedia.so %{_kde4_libdir}/kde4/kipiplugin_dlnaexport.so -%{_kde4_libdir}/kde4/kipiplugin_photivointegration.so +# Plugin not yet ready for production +#{_kde4_libdir}/kde4/kipiplugin_photivointegration.so %{_kde4_libdir}/kde4/kipiplugin_videoslideshow.so %{_kde4_appsdir}/kipi/tips %{_kde4_appsdir}/kipi/*rc @@ -522,6 +523,9 @@ update-desktop-database -q &> /dev/null %changelog +* Sat Oct 13 2012 Alexey Kurov - 3.0.0-0.4.beta2 +- digikam-3.0.0-beta2 + * Wed Sep 26 2012 Rex Dieter 3.0.0-0.3.beta1a - rebuild for updated FindKipi.cmake in kdelibs (kde#307213) diff --git a/sources b/sources index 4112975..dde3516 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -71bad5e3c7b551a50ee7339321f9dfdc digikam-3.0.0-beta1a.tar.bz2 +823023ecf926853e6ecdc44b5b305649 digikam-3.0.0-beta2.tar.bz2