diff --git a/buildfix.patch b/buildfix.patch deleted file mode 100644 index 58b9a88..0000000 --- a/buildfix.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- libs/imageproperties/worldmapwidget.cpp 2009/12/23 12:51:42 1065505 -+++ libs/imageproperties/worldmapwidget.cpp 2010/01/07 01:47:54 1070931 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - // KDE includes - ---- libs/imageproperties/markerclusterholder.h 2009/12/27 22:51:46 1066798 -+++ libs/imageproperties/markerclusterholder.h 2010/01/07 01:47:54 1070931 -@@ -27,6 +27,10 @@ - - #include - -+// Qt includes -+ -+#include -+ - // Marble includes - - #include diff --git a/digikam-1.1.0.tar.bz2 b/digikam-1.1.0.tar.bz2 deleted file mode 100644 index 169b07a..0000000 --- a/digikam-1.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d26921e83bdb85342a0455df919f33bc2f23533c96e9293e80cd79ff92bfa8f -size 15385611 diff --git a/digikam-1.2.0.tar.bz2 b/digikam-1.2.0.tar.bz2 new file mode 100644 index 0000000..a5528ea --- /dev/null +++ b/digikam-1.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206 +size 13970098 diff --git a/digikam.changes b/digikam.changes index 3c64011..4a79076 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Mar 29 21:03:34 UTC 2010 - wstephenson@novell.com + +- update to version 1.2.0 + * AlbumGUI : All Album tree views are ported to pure + Qt4 model/view implementation. + * ImageEditor : Most tools are now multithreaded for performance + * BatchQueueManager : Many more tools can now be used in batch + processing + * 99 bugfixes: http://www.digikam.org/drupal/node/511 + ------------------------------------------------------------------- Sun Jan 31 16:14:09 UTC 2010 - wstephenson@novell.com diff --git a/digikam.spec b/digikam.spec index 423d69c..522b110 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,5 +1,5 @@ # -# spec file for package digikam (Version 1.1.0) +# spec file for package digikam (Version 1.2.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,12 +26,12 @@ Url: http://www.digikam.org/ License: GPLv2+ Group: Productivity/Graphics/Viewers Summary: A KDE Photo Manager -Version: 1.1.0 +Version: 1.2.0 Release: 1 -%define tar_version 1.1.0 +%define tar_version 1.2.0 Source0: %name-%{tar_version}.tar.bz2 Source1: %{name}-docs.tar.bz2 -Patch0: buildfix.patch +Patch0: r1109177.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %kde4_pimlibs_requires @@ -53,12 +53,15 @@ delete your images, is provided. Authors: -------- - Renchi Raju + Gilles Caulier + Marcel Wiesweg + Andi Clemens + Renchi Raju (Original author, retired) %package devel License: GPLv2+ -Group: Productivity/Graphics/Viewers -Summary: A KDE Photo Manager Build Environment +Group: Development/Libraries/KDE +Summary: Development Headers for Digikam Requires: %name = %{version} %description devel @@ -69,6 +72,9 @@ package contains its build environment. Authors: -------- + Gilles Caulier + Marcel Wiesweg + Andi Clemens Renchi Raju %package doc @@ -84,12 +90,16 @@ package contains its build environment. Authors: -------- + Gilles Caulier + Marcel Wiesweg + Andi Clemens Renchi Raju %lang_package %prep %setup -q -n %name-%{tar_version} -a 1 +%patch0 echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt echo "add_subdirectory( doc-translations )" >> CMakeLists.txt @@ -156,32 +166,13 @@ rm -rf filelists /usr/bin/digitaglinktree /usr/bin/showfoto /usr/bin/cleanup_digikamdb -%_kde4_modules/digikamimageplugin_adjustcurves.so -%_kde4_modules/digikamimageplugin_adjustlevels.so -%_kde4_modules/digikamimageplugin_blurfx.so -%_kde4_modules/digikamimageplugin_border.so -%_kde4_modules/digikamimageplugin_channelmixer.so -%_kde4_modules/digikamimageplugin_charcoal.so -%_kde4_modules/digikamimageplugin_colorfx.so -%_kde4_modules/digikamimageplugin_core.so -%_kde4_modules/digikamimageplugin_distortionfx.so -%_kde4_modules/digikamimageplugin_emboss.so -%_kde4_modules/digikamimageplugin_filmgrain.so -%_kde4_modules/digikamimageplugin_freerotation.so -%_kde4_modules/digikamimageplugin_hotpixels.so -%_kde4_modules/digikamimageplugin_infrared.so -%_kde4_modules/digikamimageplugin_inpainting.so -%_kde4_modules/digikamimageplugin_inserttext.so -%_kde4_modules/digikamimageplugin_lenscorrection.so -%_kde4_modules/digikamimageplugin_oilpaint.so -%_kde4_modules/digikamimageplugin_perspective.so -%_kde4_modules/digikamimageplugin_raindrop.so -%_kde4_modules/digikamimageplugin_restoration.so -%_kde4_modules/digikamimageplugin_sheartool.so -%_kde4_modules/digikamimageplugin_superimpose.so -%_kde4_modules/digikamimageplugin_texture.so -%_kde4_modules/digikamimageplugin_whitebalance.so -%_kde4_modules/digikamimageplugin_contentawareresizing.so +# new +%_kde4_modules/digikamimageplugin_color.so +%_kde4_modules/digikamimageplugin_decorate.so +%_kde4_modules/digikamimageplugin_enhance.so +%_kde4_modules/digikamimageplugin_fxfilters.so +%_kde4_modules/digikamimageplugin_transform.so +# old %_kde4_modules/kio_digikamalbums.so %_kde4_modules/kio_digikamdates.so %_kde4_modules/kio_digikamsearch.so @@ -197,32 +188,11 @@ rm -rf filelists %_kde_share_dir/apps/showfoto %_kde_share_dir/services/digikamalbums.protocol %_kde_share_dir/services/digikamdates.protocol -%_kde_share_dir/services/digikamimageplugin_adjustcurves.desktop -%_kde_share_dir/services/digikamimageplugin_adjustlevels.desktop -%_kde_share_dir/services/digikamimageplugin_blurfx.desktop -%_kde_share_dir/services/digikamimageplugin_border.desktop -%_kde_share_dir/services/digikamimageplugin_channelmixer.desktop -%_kde_share_dir/services/digikamimageplugin_charcoal.desktop -%_kde_share_dir/services/digikamimageplugin_colorfx.desktop -%_kde_share_dir/services/digikamimageplugin_core.desktop -%_kde_share_dir/services/digikamimageplugin_distortionfx.desktop -%_kde_share_dir/services/digikamimageplugin_emboss.desktop -%_kde_share_dir/services/digikamimageplugin_filmgrain.desktop -%_kde_share_dir/services/digikamimageplugin_freerotation.desktop -%_kde_share_dir/services/digikamimageplugin_hotpixels.desktop -%_kde_share_dir/services/digikamimageplugin_infrared.desktop -%_kde_share_dir/services/digikamimageplugin_inpainting.desktop -%_kde_share_dir/services/digikamimageplugin_inserttext.desktop -%_kde_share_dir/services/digikamimageplugin_lenscorrection.desktop -%_kde_share_dir/services/digikamimageplugin_oilpaint.desktop -%_kde_share_dir/services/digikamimageplugin_perspective.desktop -%_kde_share_dir/services/digikamimageplugin_raindrop.desktop -%_kde_share_dir/services/digikamimageplugin_restoration.desktop -%_kde_share_dir/services/digikamimageplugin_sheartool.desktop -%_kde_share_dir/services/digikamimageplugin_superimpose.desktop -%_kde_share_dir/services/digikamimageplugin_texture.desktop -%_kde_share_dir/services/digikamimageplugin_whitebalance.desktop -%_kde_share_dir/services/digikamimageplugin_contentawareresizing.desktop +%_kde_share_dir/services/digikamimageplugin_color.desktop +%_kde_share_dir/services/digikamimageplugin_decorate.desktop +%_kde_share_dir/services/digikamimageplugin_enhance.desktop +%_kde_share_dir/services/digikamimageplugin_fxfilters.desktop +%_kde_share_dir/services/digikamimageplugin_transform.desktop %_kde_share_dir/services/digikamsearch.protocol %_kde_share_dir/services/digikamtags.protocol %_kde_share_dir/servicetypes/digikamimageplugin.desktop @@ -240,7 +210,5 @@ rm -rf filelists %endif %_kde4_modules/digikamnepomukservice.so %_kde_share_dir/services/digikamnepomukservice.desktop -%_kde4_modules/digikamimageplugin_localcontrast.so -%_kde_share_dir/services/digikamimageplugin_localcontrast.desktop %changelog diff --git a/r1109177.diff b/r1109177.diff new file mode 100644 index 0000000..2bea8db --- /dev/null +++ b/r1109177.diff @@ -0,0 +1,14 @@ +Index: digikam/ratingwidget.cpp +=================================================================== +--- digikam/ratingwidget.cpp (revision 1109176) ++++ digikam/ratingwidget.cpp (revision 1109177) +@@ -165,7 +165,7 @@ + void RatingWidget::setFadingValue(int value) + { + d->fadingValue = value; +- if (d->fadingValue >= 255) ++ if (d->fadingValue >= 255 && d->fadingTimeLine) + { + d->fadingTimeLine->stop(); + } +