[digikam] digikam-2.6.0-beta2

[nucleo]

commit 0553b3977662699ca7ee0b16e31c3f7e6089f24e
Author: nucleo <nucleo at fedoraproject.org>
Date:   Tue Mar 6 17:23:43 2012 +0200

    digikam-2.6.0-beta2

 .gitignore                        |    1 +
 digikam-2.6.0-beta1-docbook.patch |   58 -------------------------------------
 digikam.spec                      |   22 +++++++-------
 sources                           |    2 +-
 4 files changed, 13 insertions(+), 70 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6b4f86f..866b020 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /digikam-2.4.1.tar.bz2
 /digikam-2.5.0.tar.bz2
 /digikam-2.6.0-beta1.tar.bz2
+/digikam-2.6.0-beta2.tar.bz2
diff --git a/digikam.spec b/digikam.spec
index 4bdf3ae..368bf39 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,8 +1,8 @@
-%define pre beta1
+%define pre beta2
 
 Name:	 digikam
 Version: 2.6.0
-Release: 0.2.%{?pre}%{?dist}
+Release: 0.3.%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -23,8 +23,6 @@ Patch0: digikam-2.5.0-clapack-atlas.patch
 ## upstreamable patches
 
 ## upstream patches
-# https://bugs.kde.org/show_bug.cgi?id=293563
-Patch100: digikam-2.6.0-beta1-docbook.patch
 
 # for clapack, see also the clapack-atlas patch
 BuildRequires: atlas-devel
@@ -220,9 +218,6 @@ BuildArch: noarch
 
 %patch0 -p1 -b .clapack-atlas
 
-pushd doc/digikam
-%patch100 -p1 -b .docbook
-popd
 
 %build
 
@@ -300,10 +295,10 @@ kipiplugin_smug.lang kipiplugin_timeadjust.lang \
 kipiplugins.lang >> kipi-plugins.lang
 
 ## unpackaged files
-rm -f %{buildroot}%{_kde4_libdir}/libdigikamcore.so
-rm -f %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so
-rm -f %{buildroot}%{_kde4_libdir}/libkipiplugins.so
-rm -f %{buildroot}%{_kde4_libdir}/libPropertyBrowser.a
+rm %{buildroot}%{_kde4_libdir}/libdigikamcore.so
+rm %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so
+rm %{buildroot}%{_kde4_libdir}/libkipiplugins.so
+rm %{buildroot}%{_kde4_libdir}/libPropertyBrowser.a
 
 
 %check
@@ -451,6 +446,7 @@ update-desktop-database -q &> /dev/null
 %{_kde4_libdir}/kde4/kipiplugin_gpssync.so
 %{_kde4_libdir}/kde4/kipiplugin_htmlexport.so
 %{_kde4_libdir}/kde4/kipiplugin_imageviewer.so
+%{_kde4_libdir}/kde4/kipiplugin_imageshackexport.so
 %{_kde4_libdir}/kde4/kipiplugin_ipodexport.so
 %{_kde4_libdir}/kde4/kipiplugin_jpeglossless.so
 %{_kde4_libdir}/kde4/kipiplugin_kioexportimport.so
@@ -469,6 +465,7 @@ update-desktop-database -q &> /dev/null
 %{_kde4_libdir}/kde4/kipiplugin_timeadjust.so
 %{_kde4_libdir}/kde4/kipiplugin_vkontakte.so
 %{_kde4_libdir}/kde4/kipiplugin_yandexfotki.so
+%{_kde4_libdir}/kde4/kipiplugin_wikimedia.so
 %{_kde4_appsdir}/gpssync/
 %{_kde4_appsdir}/kipiplugin_flashexport/
 %{_kde4_appsdir}/kipiplugin_galleryexport/
@@ -508,6 +505,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Tue Mar  6 2012 Alexey Kurov <nucleo at fedoraproject.org> - 2.6.0-0.3.beta2
+- digikam-2.6.0-beta2
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.0-0.2.beta1
 - Rebuilt for c++ ABI breakage
 
diff --git a/sources b/sources
index e1d0d1c..11dd456 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83b4ae6a69502a0164130459c542a529  digikam-2.6.0-beta1.tar.bz2
+f1c5ac8b0ae94d7fe50c9849aa25caf4  digikam-2.6.0-beta2.tar.bz2