Hello community, here is the log from the commit of package kipi-plugins for openSUSE:Factory checked in at 2012-01-09 21:42:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kipi-plugins (Old) and /work/SRC/openSUSE:Factory/.kipi-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kipi-plugins", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kipi-plugins/kipi-plugins.changes 2011-10-06 17:22:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kipi-plugins.new/kipi-plugins.changes 2012-01-09 21:42:56.000000000 +0100 @@ -1,0 +2,36 @@ +Wed Jan 4 08:59:40 UTC 2012 - tittiatc...@gmail.com + +- Update to version 2.5.0 + * Bug-fix release, with a total of 41 fixed bugs + +------------------------------------------------------------------- +Wed Dec 21 09:03:09 UTC 2011 - tittiatc...@gmail.com + +- Update to version 2.4.1 + * Bugfixes and translation updates + +------------------------------------------------------------------- +Sat Nov 12 20:56:11 UTC 2011 - asterios.dra...@gmail.com + +- Spec file updates: + * Added libkvkontakte-devel in BuildRequires: and removed the duplicate + libqjson-devel. + * Removed %kde4_pimlibs_requires from the main package (fix for rpmlint + warning "suse-kde4-excessive-dependency"). + * Updated Summary: for acquireimage and geolocation subpackages. + * Simplified License: to GPL-2.0+ and Adobe for geolocation subpackage also. + * Don't install the libkgeomap.mo files (they belong to libkgeomap package). + * Fixed rpmlint warning "wrong-icon-size" for flash.png icon. + * Exclude kipiplugin_gpssync.desktop from the main package (it is included in + kipi-plugins-geolocation). +- Updated non-executable-script.patch to also fix the rpmlint warning + "non-executable-script" for the panoramagui.desktop file. + +------------------------------------------------------------------- +Mon Nov 7 10:49:27 UTC 2011 - adr...@suse.de + +- update to version 2.3.0 + * new flash export plugin + * bugfix release + +------------------------------------------------------------------- Old: ---- digikam-2.2.0.tar.bz2 New: ---- digikam-2.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kipi-plugins.spec ++++++ --- /var/tmp/diff_new_pack.4vKrfN/_old 2012-01-09 21:43:07.000000000 +0100 +++ /var/tmp/diff_new_pack.4vKrfN/_new 2012-01-09 21:43:07.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kipi-plugins # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,23 @@ # - Name: kipi-plugins -Version: 2.2.0 +Version: 2.5.0 Release: 0 -License: GPL-2.0+ and Adobe Summary: KDE Plug-Ins for Image Manipulation -Url: http://www.kipi-plugins.org/ +License: GPL-2.0+ and Adobe Group: Productivity/Graphics/Other +Url: http://www.kipi-plugins.org/ Source: http://sourceforge.net/projects/digikam/files/digikam/%{version}/digikam-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE desktop-files.diff -- Remove Icon= entry (the icon is missing) Patch0: desktop-files.diff # PATCH-FIX-OPENSUSE non-executable-script.patch asterios.dra...@gmail.com -- Fix rpmlint warning "non-executable-script" Patch1: non-executable-script.patch -# PATCH-FIX-OPENSUSE remove-gplv2-only.patch idoen...@suse.de bnc #711963 -- Remove GPLv2 only files from the build system +# PATCH-FIX-OPENSUSE remove-gplv2-only.patch idoen...@suse.de bnc#711963 -- Remove GPLv2 only files from the build system Patch2: remove-gplv2-only.patch -# CHECK ON NEXT VERSION UPDATE: reference to missing icon +# PATCH-FIX-OPENSUSE fix-broken-icon-reference.diff adr...@suse.de -- CHECK ON NEXT VERSION UPDATE: reference to missing icon Patch3: fix-broken-icon-reference.diff +# Only needed to patch broken images in the upstream tarball BuildRequires: ImageMagick BuildRequires: fdupes %if 0%{?suse_version} == 1130 @@ -47,8 +47,8 @@ BuildRequires: libkexiv2-devel BuildRequires: libkgeomap-devel BuildRequires: libkipi-devel -BuildRequires: libqjson-devel BuildRequires: libksane-devel +BuildRequires: libkvkontakte-devel BuildRequires: libmediawiki-devel BuildRequires: libqca2-devel BuildRequires: libqjson-devel @@ -60,7 +60,6 @@ Recommends: hugin BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires -%kde4_pimlibs_requires %description A set of plug-ins for the KDE KIPI interface, used by some KDE imaging @@ -70,8 +69,7 @@ # kipi-plugins package to be included on livecd (acquireimage # requires sane-backends, which is blocked for livecd) %package acquireimage -License: GPL-2.0+ and Adobe -Summary: KDE Plug-Ins for Image Manipulation +Summary: KDE Plug-Ins for Image Manipulation - Acquireimage plugin Group: Productivity/Graphics/Other Requires: %{name} = %{version} Supplements: packageand(kipi-plugins:sane-backends) @@ -84,8 +82,7 @@ # kipi-plugins package to be included on livecd (geolocation # requires marble, which is blocked for livecd) %package geolocation -License: GPLv2+ and LGPLv2+ and X11 (BSD like) and BSD3c (or similar) and MIT License (or similar) and DNG SDK (Adobe) and GFDL -Summary: KDE Plug-Ins for Image Manipulation +Summary: KDE Plug-Ins for Image Manipulation - Geolocation plugin Group: Productivity/Graphics/Other Requires: %{name} = %{version} Supplements: packageand(kipi-plugins:marble) @@ -97,20 +94,23 @@ %lang_package %prep %setup -q -n digikam-%{version} -mv doc/kipi-plugins extra/kipi-plugins/doc -cp -r po extra/kipi-plugins/po -find extra/kipi-plugins/po -name digikam.po | xargs rm - +pushd extra/kipi-plugins +%patch0 +popd %patch1 %patch2 %patch3 -cd extra/kipi-plugins -%patch0 + +pushd extra/kipi-plugins # 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\"/g" common/libkipiplugins/pluginsversion.h.cmake -# Add docs & translations +# Add docs & translations only for kipi-plugins +mv ../../doc/kipi-plugins doc +mv ../../po po +find po -name digikam.po | xargs rm +find po -name libkgeomap.po | xargs rm echo "find_package(Gettext)" >> CMakeLists.txt echo "add_subdirectory( doc )" >> CMakeLists.txt echo "add_subdirectory( po )" >> CMakeLists.txt @@ -118,17 +118,18 @@ # Remove GPL-v2 only files rm gpssync/borrowed/modeltest.cpp rm gpssync/borrowed/modeltest.h +popd %build -cd extra/kipi-plugins +pushd extra/kipi-plugins %cmake_kde4 -d build %make_jobs -cd .. +popd %install -cd extra/kipi-plugins/build +pushd extra/kipi-plugins/build %kde4_makeinstall -cd .. +popd # Not needed, the package doesn't actually provide any shared libraries rm -f %{buildroot}%{_kde4_libdir}/libkipiplugins.so @@ -138,6 +139,7 @@ # Fix "wrong-icon-size" rpmlint warning mogrify -scale 22x22 -background transparent %{buildroot}%{_kde4_iconsdir}/hicolor/22x22/actions/slideshow.png mogrify -extent 64x64 -background transparent -gravity "center" %{buildroot}%{_kde4_iconsdir}/hicolor/64x64/actions/metadataedit.png +mogrify -extent 128x128 -background transparent -gravity "south" %{buildroot}%{_kde4_iconsdir}/hicolor/128x128/actions/flash.png # Make a link in hicolor icon theme to dngconverter.png from oxygen icon theme in order to fix an rpm post build error "Icon file not installed for dngconverter.desktop" for res in 16 22 32 48 64 128 @@ -154,7 +156,9 @@ %endif %find_lang %{name} --all-name + %fdupes -s %{buildroot} + %kde_post_install %post -p /sbin/ldconfig @@ -178,6 +182,7 @@ %{_kde4_bindir}/expoblending %{_kde4_bindir}/panoramagui %{_kde4_bindir}/photolayoutseditor +%{_kde4_bindir}/multithread %{_kde4_iconsdir}/hicolor/*/actions/*.* %exclude %{_kde4_iconsdir}/hicolor/*/actions/gpsimagetag.png %{_kde4_iconsdir}/hicolor/*/apps/dngconverter.* @@ -189,11 +194,9 @@ %exclude %{_kde4_modulesdir}/kipiplugin_gpssync.so %{_kde4_servicesdir}/kipiplugin_*.desktop %exclude %{_kde4_servicesdir}/kipiplugin_acquireimages.desktop -%exclude %{_kde4_servicesdir}/kipiplugin_acquireimages.desktop +%exclude %{_kde4_servicesdir}/kipiplugin_gpssync.desktop %{_kde4_libdir}/libkipiplugins.so.* %doc %{_kde4_htmldir}/en/kipi-plugins/ -%{_kde4_modulesdir}/photolayoutseditorborderplugin_*.so -%{_kde4_servicesdir}/photolayoutseditorborderplugin_*.desktop %{_kde4_appsdir}/photolayoutseditor %{_kde4_configkcfgdir}/PLEConfigSkeleton.kcfgc %{_kde4_servicetypesdir}/photolayoutseditorborderplugin.desktop @@ -213,7 +216,7 @@ %{_kde4_modulesdir}/kipiplugin_gpssync.so %{_kde4_servicesdir}/kipiplugin_gpssync.desktop -%files lang -f extra/kipi-plugins/%{name}.lang +%files lang -f %{name}.lang %defattr(-,root,root,-) %exclude %{_kde4_htmldir}/en/kipi-plugins/ ++++++ digikam-2.2.0.tar.bz2 -> digikam-2.5.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kipi-plugins/digikam-2.2.0.tar.bz2 /work/SRC/openSUSE:Factory/.kipi-plugins.new/digikam-2.5.0.tar.bz2 differ: char 11, line 1 ++++++ non-executable-script.patch ++++++ --- /var/tmp/diff_new_pack.4vKrfN/_old 2012-01-09 21:43:07.000000000 +0100 +++ /var/tmp/diff_new_pack.4vKrfN/_new 2012-01-09 21:43:07.000000000 +0100 @@ -5,3 +5,10 @@ [Desktop Entry] Categories=Qt;KDE;Graphics; Comment=A tool to blend bracketed images +--- extra/kipi-plugins/panorama/plugin/panoramagui.desktop.orig 2011-11-07 09:50:25.000000000 +0200 ++++ extra/kipi-plugins/panorama/plugin/panoramagui.desktop 2011-11-12 22:14:39.809000013 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env xdg-open + [Desktop Entry] + Categories=Qt;KDE;Graphics; + Comment=A tool to assemble images as a panorama ++++++ remove-gplv2-only.patch ++++++ --- /var/tmp/diff_new_pack.4vKrfN/_old 2012-01-09 21:43:07.000000000 +0100 +++ /var/tmp/diff_new_pack.4vKrfN/_new 2012-01-09 21:43:07.000000000 +0100 @@ -1,10 +1,15 @@ ---- extra/kipi-plugins/gpssync/CMakeLists.txt 2011-07-28 01:27:36.000000000 +0200 -+++ extra/kipi-plugins/gpssync/CMakeLists.txt 2011-08-12 11:42:50.197812043 +0200 -@@ -26,7 +26,6 @@ - searchwidget.cpp - setup.cpp - setup_general.cpp -- borrowed/modeltest.cpp - backend-geonamesUS-rg.cpp - rgtagmodel.cpp - tests/simpletreemodel/simpletreemodel.cpp +Index: extra/kipi-plugins/gpssync/CMakeLists.txt +=================================================================== +--- extra/kipi-plugins/gpssync/CMakeLists.txt.orig ++++ extra/kipi-plugins/gpssync/CMakeLists.txt +@@ -33,10 +33,8 @@ SET(kipiplugin_gpssync_PART_SRCS + + IF(KDE4_BUILD_TESTS) + INCLUDE_DIRECTORIES(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/borrowed") +- ADD_DEFINITIONS(-DGPSSYNC_MODELTEST) + SET(kipiplugin_gpssync_PART_SRCS + ${kipiplugin_gpssync_PART_SRCS} +- ${CMAKE_CURRENT_SOURCE_DIR}/borrowed/modeltest.cpp + ) + ENDIF(KDE4_BUILD_TESTS) + -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
