diff --git a/digikam-4.1.0.tar.bz2 b/digikam-4.1.0.tar.bz2 deleted file mode 100644 index 60b856d..0000000 --- a/digikam-4.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9318439eb03dd8c972fef570f56aa7f4b7b424db244299eb4f59e46593782de -size 68921092 diff --git a/digikam-4.2.0.tar.bz2 b/digikam-4.2.0.tar.bz2 new file mode 100644 index 0000000..00bd154 --- /dev/null +++ b/digikam-4.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e86575b76672dfd0a7ed5f1d7b8b74425171804d7f16b0d743a5d2375c1c1b08 +size 68849613 diff --git a/digikam.changes b/digikam.changes index fb7f6e3..0d0d21d 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Tue Aug 5 14:08:33 UTC 2014 - nico.kruber@gmail.com + +- Update to 4.2.0 + digikam: + - AlbumGui : New view on left sidebar to search quickly items + with assigned Labels. + Details: http://mohamedanwer.wordpress.com/2014/07/17/the-great-merging-day/ + - AlbumGui : Tags view: add a new option to show items with + no tag. + Details: http://mohamedanwer.wordpress.com/2014/07/11/tags-left-sidebar-supports-new-action-now/ + - Geberal : Add retina display support with preview and + editor canvas under OSX. + - 16 fixed bugs + (kde#336851, kde#336650, kde#326019, kde#337231, kde#337392, + kde#262175, kde#262167, kde#286463, kde#337417, kde#160363, + kde#330976, kde#337507, kde#337688, kde#160363, kde#132827, + kde#337993) + kipi-plugins: + - 4 fixed bugs (kde#313203, kde#334089, kde#336835, kde#256466) +- adapt remove-gplv2-only.patch +- dropped QtGstreamer-1.0.patch (added upstream) + +------------------------------------------------------------------- +Thu Jul 24 10:34:36 UTC 2014 - hrvoje.senjan@gmail.com + +- Added QtGstreamer-1.0.patch to support QtGstreamer 1.x API (applied + on Factory/13.2 only) +- Build with gstreamer-plugins-qt-devel for those openSUSE versions + ------------------------------------------------------------------- Mon Jun 30 18:24:44 UTC 2014 - adrian@suse.de diff --git a/digikam.spec b/digikam.spec index 01c148c..e149402 100644 --- a/digikam.spec +++ b/digikam.spec @@ -17,9 +17,9 @@ Name: digikam -Version: 4.1.0 +Version: 4.2.0 Release: 0 -%define rversion 4.1.0 +%define rversion 4.2.0 Summary: A KDE Photo Manager License: GPL-2.0+ Group: Productivity/Graphics/Viewers @@ -42,8 +42,9 @@ BuildRequires: flex BuildRequires: gdk-pixbuf-devel BuildRequires: libxml2-devel BuildRequires: libxslt-devel -# TODO bring gstreamer-plugins-qt back for 13.2+ once we have them with gst1.0 -%if 0%{?suse_version} < 1320 +%if 0%{?suse_version} > 1310 +BuildRequires: gstreamer-plugins-qt-devel +%else BuildRequires: gstreamer-0_10-plugins-qt-devel %endif BuildRequires: lensfun-devel @@ -237,8 +238,8 @@ This package contains the development files for libmediawiki. # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') -sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" core/digikam/utils/version.h.cmake -sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/g" extra/kipi-plugins/common/libkipiplugins/tools/kpversion.h.cmake +sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" core/digikam/utils/version.h.cmake.in +sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/g" extra/kipi-plugins/common/libkipiplugins/tools/kpversion.h.cmake.in pushd extra/kipi-plugins # Remove GPL-v2 only files @@ -252,7 +253,7 @@ EXTRA_FLAGS="-DENABLE_LCMS2=OFF" %else EXTRA_FLAGS="-DENABLE_LCMS2=ON" %endif -%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=FALSE -DENABLE_INTERNALMYSQL=FALSE $EXTRA_FLAGS +%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=FALSE -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=TRUE $EXTRA_FLAGS # there are files in there that are so heavy to the compiler, that one is enough %make_jobs VERBOSE=1 diff --git a/remove-gplv2-only.patch b/remove-gplv2-only.patch index 9dde46d..0c36d7e 100644 --- a/remove-gplv2-only.patch +++ b/remove-gplv2-only.patch @@ -1,12 +1,7 @@ -Index: extra/kipi-plugins/gpssync/CMakeLists.txt -=================================================================== ---- extra/kipi-plugins/gpssync/CMakeLists.txt.orig -+++ extra/kipi-plugins/gpssync/CMakeLists.txt -@@ -34,10 +34,8 @@ SET(kipiplugin_gpssync_PART_SRCS - - IF(KDE4_BUILD_TESTS) - INCLUDE_DIRECTORIES(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/borrowed") -- ADD_DEFINITIONS(-DGPSSYNC_MODELTEST) +--- extra/kipi-plugins/gpssync/CMakeLists.txt.orig 2014-08-05 16:19:57.369791501 +0200 ++++ extra/kipi-plugins/gpssync/CMakeLists.txt 2014-08-05 16:20:37.535336329 +0200 +@@ -37,7 +37,6 @@ + #ADD_DEFINITIONS(-DGPSSYNC_MODELTEST) SET(kipiplugin_gpssync_PART_SRCS ${kipiplugin_gpssync_PART_SRCS} - ${CMAKE_CURRENT_SOURCE_DIR}/borrowed/modeltest.cpp