Hello community, here is the log from the commit of package kipi-plugins for openSUSE:Factory checked in at Mon Aug 15 14:35:16 CEST 2011.
-------- --- KDE/kipi-plugins/kipi-plugins.changes 2011-08-03 23:37:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/kipi-plugins/kipi-plugins.changes 2011-08-12 11:47:44.000000000 +0200 @@ -1,0 +2,29 @@ +Fri Aug 12 09:44:19 UTC 2011 - [email protected] + +- Add remove-gplv2-only.patch, remove GPLv2 only files from the + buildsystem, bnc #711963 + +------------------------------------------------------------------- +Mon Aug 8 22:00:32 UTC 2011 - [email protected] + +- Spec file updates: + * Simplified License: to GPL-2.0+ and Adobe. + * Cleanup in Buildrequires:. + * Removed /usr/bin/jpegtran from Requires:. + * Added ImageMagick, enblend-enfus and hugin and removed dcraw in Recommends: + entries. + * Recommend lang package. + * Added description for the patches based on openSUSE Patches Guidelines. + * Removed libkipiplugins.so and the kipi-plugins-devel package (not needed, + the package doesn't actually provide any shared libraries). + * Better fix to remove build time references so build-compare can do its + work. + * Install dngconverter.desktop and add a fix for the rpm post build error + about a missing icon. + * Fixed "wrong-icon-size" and "suse-kde4-missing-runtime-dependency" rpmlint + warnings. + * Minor other updates. +- Readded the patch for expoblending.desktop to fix an rpmlint warning about + "non-executable-script". + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- non-executable-script.patch remove-gplv2-only.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kipi-plugins.spec ++++++ --- /var/tmp/diff_new_pack.TEYFvL/_old 2011-08-15 14:14:37.000000000 +0200 +++ /var/tmp/diff_new_pack.TEYFvL/_new 2011-08-15 14:14:37.000000000 +0200 @@ -19,42 +19,50 @@ Name: kipi-plugins Version: 2.0.0 -Release: 5 -License: BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+ ; MIT License (or similar) +Release: 7 +License: GPL-2.0+ and Adobe Summary: KDE Plug-Ins for Image Manipulation Url: http://www.kipi-plugins.org/ Group: Productivity/Graphics/Other 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-UPSTREAM fix_memory_corruption.diff bko#279078 [email protected] -- Fix for kipi plugin Yandex.Fotki causes digikam crash (fixed upstream) Patch1: fix_memory_corruption.diff -BuildRequires: doxygen +# PATCH-FIX-OPENSUSE non-executable-script.patch [email protected] -- Fix rpmlint warning "non-executable-script" +Patch2: non-executable-script.patch +# PATCH-FIX-OPENSUSE remove-gplv2-only.patch [email protected] bnc #711963 -- Remove GPLv2 only files from the build system +Patch3: remove-gplv2-only.patch +# only needed to patch broken images in the upstream tarball +BuildRequires: ImageMagick BuildRequires: fdupes -BuildRequires: graphviz-devel -BuildRequires: lensfun-devel -BuildRequires: libexiv2-devel +%if 0%{?suse_version} == 1130 +BuildRequires: gtk2-devel +%else +BuildRequires: gdk-pixbuf-devel +%endif +BuildRequires: glib2-devel BuildRequires: libexpat-devel -BuildRequires: libgcrypt-devel -BuildRequires: libgphoto2-devel BuildRequires: libgpod-devel -BuildRequires: libjasper-devel BuildRequires: libkdcraw-devel >= 4.7.0 +BuildRequires: libkde4-devel BuildRequires: libkdepimlibs4-devel BuildRequires: libkexiv2-devel -BuildRequires: libkipi-devel BuildRequires: libkgeomap-devel +BuildRequires: libkipi-devel BuildRequires: libksane-devel -BuildRequires: liblqr-devel +BuildRequires: libmediawiki-devel BuildRequires: libqca2-devel -BuildRequires: libqimageblitz-devel BuildRequires: libqjson-devel -BuildRequires: marble-devel +BuildRequires: libxslt-devel BuildRequires: opencv-devel -BuildRequires: soprano-backend-redland -BuildRequires: sqlite-devel -BuildRequires: libmediawiki-devel -BuildRequires: pkgconfig(gtk+-2.0) -Requires: /usr/bin/jpegtran -Recommends: dcraw +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif +Recommends: ImageMagick +Recommends: enblend-enfuse +Recommends: hugin +Recommends: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %kde4_pimlibs_requires @@ -63,25 +71,16 @@ A set of plug-ins for the KDE KIPI interface, used by some KDE imaging applications. -%package devel -License: GPLv2+ -Summary: Development Headers for kipi-plugins -Group: Development/Libraries/KDE -Requires: %{name} = %{version} - -%description devel - A set of plug-ins for the KDE KIPI interface, used by some KDE imaging - applications. - # split out acquireimage plugin in order to allow the main # kipi-plugins package to be included on livecd (acquireimage # requires sane-backends, which is blocked for livecd) %package acquireimage Summary: KDE Plug-Ins for Image Manipulation -License: GPLv2+ and LGPLv2+ and X11 (BSD like) and BSD3c (or similar) and MIT License (or similar) and DNG SDK (Adobe) and GFDL +License: GPL-2.0+ and Adobe Group: Productivity/Graphics/Other Requires: %{name} = %{version} Supplements: packageand(kipi-plugins:sane-backends) +%kde4_runtime_requires %description acquireimage This is the Acquireimage plugin from the kipi plugins package. @@ -95,32 +94,57 @@ find extra/kipi-plugins/po -name digikam.po | xargs rm %patch1 -p1 +%patch2 +%patch3 cd extra/kipi-plugins %patch0 # Remove build time references so build-compare can do its work -FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%b %e %Y') +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 echo "add_subdirectory( doc )" >> CMakeLists.txt echo "add_subdirectory( po )" >> CMakeLists.txt +# Remove GPL-v2 only files +rm gpssync/borrowed/modeltest.cpp +rm gpssync/borrowed/modeltest.h + %build - cd extra/kipi-plugins - %cmake_kde4 -d build -- -DKFACE_EXTERNAL_FINDOPENCV:BOOL=TRUE - %make_jobs +cd extra/kipi-plugins +%cmake_kde4 -d build +%make_jobs +cd .. %install - cd extra/kipi-plugins/build -%makeinstall - cd .. -%suse_update_desktop_file scangui Scanning -%suse_update_desktop_file expoblending Graphics Photography - -rm -rf %{buildroot}%{_datadir}/locale/x-test -rm %{buildroot}%{_datadir}/applications/kde4/dngconverter.desktop +cd extra/kipi-plugins/build +%kde4_makeinstall +cd .. + +# Not needed, the package doesn't actually provide any shared libraries +rm -f %{buildroot}%{_kde4_libdir}/libkipiplugins.so + +# 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 + +# 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" +install -dp -m 0755 %{buildroot}%{_kde4_iconsdir}/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps +ln -s %{_kde4_iconsdir}/oxygen/16x16/apps/dngconverter.png %{buildroot}%{_kde4_iconsdir}/hicolor/16x16/apps/dngconverter.png +ln -s %{_kde4_iconsdir}/oxygen/22x22/apps/dngconverter.png %{buildroot}%{_kde4_iconsdir}/hicolor/22x22/apps/dngconverter.png +ln -s %{_kde4_iconsdir}/oxygen/32x32/apps/dngconverter.png %{buildroot}%{_kde4_iconsdir}/hicolor/32x32/apps/dngconverter.png +ln -s %{_kde4_iconsdir}/oxygen/48x48/apps/dngconverter.png %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/dngconverter.png +ln -s %{_kde4_iconsdir}/oxygen/64x64/apps/dngconverter.png %{buildroot}%{_kde4_iconsdir}/hicolor/64x64/apps/dngconverter.png +ln -s %{_kde4_iconsdir}/oxygen/128x128/apps/dngconverter.png %{buildroot}%{_kde4_iconsdir}/hicolor/128x128/apps/dngconverter.png + +%if 0%{?suse_version} +%suse_update_desktop_file -r dngconverter Qt KDE Graphics Photography +%suse_update_desktop_file -r expoblending Qt KDE Graphics Photography +%suse_update_desktop_file -r scangui Qt KDE Graphics Scanning +%endif %find_lang %{name} --all-name + %fdupes -s %{buildroot} %kde_post_install @@ -130,17 +154,20 @@ %postun -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc extra/kipi-plugins/NEWS extra/kipi-plugins/ChangeLog +%defattr(-,root,root,-) +%doc extra/kipi-plugins/AUTHORS extra/kipi-plugins/NEWS extra/kipi-plugins/ChangeLog %doc extra/kipi-plugins/COPYING extra/kipi-plugins/COPYING-ADOBE +%doc extra/kipi-plugins/README extra/kipi-plugins/TODO %_kde4_bindir/dngconverter %_kde4_bindir/dnginfo %_kde4_bindir/expoblending +%_kde4_applicationsdir/dngconverter.desktop %_kde4_applicationsdir/expoblending.desktop %_kde4_applicationsdir/kipiplugins.desktop %_kde4_modulesdir/kipiplugin_advancedslideshow.so %_kde4_modulesdir/kipiplugin_batchprocessimages.so %_kde4_modulesdir/kipiplugin_calendar.so +%_kde4_modulesdir/kipiplugin_debianscreenshots.so %_kde4_modulesdir/kipiplugin_dngconverter.so %_kde4_modulesdir/kipiplugin_expoblending.so %_kde4_modulesdir/kipiplugin_facebook.so @@ -161,6 +188,7 @@ %_kde4_modulesdir/kipiplugin_printimages.so %_kde4_modulesdir/kipiplugin_rajceexport.so %_kde4_modulesdir/kipiplugin_rawconverter.so +%_kde4_modulesdir/kipiplugin_removeredeyes.so %_kde4_modulesdir/kipiplugin_sendimages.so %_kde4_modulesdir/kipiplugin_shwup.so %_kde4_modulesdir/kipiplugin_smug.so @@ -192,6 +220,7 @@ %_kde4_servicesdir/kipiplugin_timeadjust.desktop %_kde4_servicesdir/kipiplugin_kopete.desktop %_kde4_servicesdir/kipiplugin_yandexfotki.desktop +%_kde4_appsdir/gpssync %_kde4_appsdir/kipiplugin_expoblending %_kde4_appsdir/kipiplugin_flashexport %_kde4_appsdir/kipiplugin_galleryexport @@ -199,9 +228,7 @@ %_kde4_appsdir/kipiplugin_imageviewer %_kde4_appsdir/kipiplugin_piwigoexport %_kde4_appsdir/kipiplugin_printimages -%_kde4_appsdir/gpssync/ -%_kde4_iconsdir/oxygen/*/apps/rawconverter.* -%_kde4_iconsdir/oxygen/*/apps/dngconverter.* +%_kde4_appsdir/kipiplugin_removeredeyes %_kde4_iconsdir/hicolor/*/actions/borderimages.* %_kde4_iconsdir/hicolor/*/actions/colorimages.* %_kde4_iconsdir/hicolor/*/actions/convertimages.* @@ -230,28 +257,25 @@ %_kde4_iconsdir/hicolor/*/actions/timeadjust.* %_kde4_iconsdir/hicolor/*/actions/zooomr.* %_kde4_iconsdir/hicolor/*/actions/debianscreenshots.* -%_kde4_modulesdir/kipiplugin_removeredeyes.so -%_kde4_modulesdir/kipiplugin_debianscreenshots.so -%_kde4_appsdir/kipiplugin_removeredeyes +%_kde4_iconsdir/hicolor/*/apps/dngconverter.* +%_kde4_iconsdir/oxygen/*/apps/dngconverter.* +%_kde4_iconsdir/oxygen/*/apps/rawconverter.* %_kde4_servicesdir/kipiplugin_debianscreenshots.desktop %_kde4_servicesdir/kipiplugin_kmlexport.desktop %_kde4_servicesdir/kipiplugin_rajceexport.desktop %_kde4_servicesdir/kipiplugin_removeredeyes.desktop %_kde4_libdir/libkipiplugins.so.* +%doc %_kde4_htmldir/en/kipi-plugins/ %files acquireimage -%defattr(-,root,root) +%defattr(-,root,root,-) %_kde4_bindir/scangui %_kde4_applicationsdir/scangui.desktop %_kde4_modulesdir/kipiplugin_acquireimages.so %_kde4_servicesdir/kipiplugin_acquireimages.desktop -%files devel -%defattr(-,root,root) -%_kde4_libdir/libkipiplugins.so - %files lang -f extra/kipi-plugins/%{name}.lang %defattr(-,root,root,-) -%exclude %{_kde4_htmldir}/en/kipi-plugins/ +%exclude %_kde4_htmldir/en/kipi-plugins/ %changelog ++++++ non-executable-script.patch ++++++ --- extra/kipi-plugins/expoblending/plugin/expoblending.desktop.orig 2011-07-28 02:27:35.000000000 +0300 +++ extra/kipi-plugins/expoblending/plugin/expoblending.desktop 2011-08-08 18:45:45.330000070 +0300 @@ -1,4 +1,3 @@ -#!/usr/bin/env xdg-open [Desktop Entry] Categories=Qt;KDE;Graphics; Comment=A tool to blend bracketed images ++++++ remove-gplv2-only.patch ++++++ --- 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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
