Hello community, here is the log from the commit of package kipi-plugins for openSUSE:Factory checked in at Fri Sep 23 10:26:40 CEST 2011. -------- --- kipi-plugins/kipi-plugins.changes 2011-09-09 15:15:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/kipi-plugins/kipi-plugins.changes 2011-09-19 14:26:14.000000000 +0200 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Sat Sep 17 21:04:19 UTC 2011 - toddrme2178@gmail.com + +- Added %kde4_runtime_requires macro (fix for RPMLINT warning) +- Cleaned up spec file formatting + calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kipi-plugins.spec ++++++ --- /var/tmp/diff_new_pack.nvRGgN/_old 2011-09-23 10:26:34.000000000 +0200 +++ /var/tmp/diff_new_pack.nvRGgN/_new 2011-09-23 10:26:34.000000000 +0200 @@ -20,7 +20,7 @@ Name: kipi-plugins Version: 2.1.0 Release: 1 -License: GPL-2.0+ and Adobe +License: GPLv2+ and Adobe Summary: KDE Plug-Ins for Image Manipulation Url: http://www.kipi-plugins.org/ Group: Productivity/Graphics/Other @@ -35,15 +35,13 @@ BuildRequires: ImageMagick BuildRequires: fdupes %if 0%{?suse_version} == 1130 -BuildRequires: gtk2-devel +BuildRequires: pkgconfig(gtk+-2.0) %else BuildRequires: gdk-pixbuf-devel %endif -BuildRequires: glib2-devel BuildRequires: libexpat-devel BuildRequires: libgpod-devel BuildRequires: libkdcraw-devel >= 4.7.0 -BuildRequires: libkde4-devel BuildRequires: libkdepimlibs4-devel BuildRequires: libkexiv2-devel BuildRequires: libkgeomap-devel @@ -52,15 +50,12 @@ BuildRequires: libmediawiki-devel BuildRequires: libqca2-devel BuildRequires: libqjson-devel -BuildRequires: libxslt-devel BuildRequires: opencv-devel -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif +BuildRequires: pkgconfig(glib-2.0) +Recommends: %{name}-lang = %{version} Recommends: ImageMagick Recommends: enblend-enfuse Recommends: hugin -Recommends: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %kde4_pimlibs_requires @@ -73,8 +68,8 @@ # 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: GPL-2.0+ and Adobe +Summary: KDE Plug-Ins for Image Manipulation Group: Productivity/Graphics/Other Requires: %{name} = %{version} Supplements: packageand(kipi-plugins:sane-backends) @@ -87,11 +82,12 @@ # kipi-plugins package to be included on livecd (geolocation # requires marble, which is blocked for livecd) %package geolocation -Group: Productivity/Graphics/Other 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 -Requires: %name = %{version} +Group: Productivity/Graphics/Other +Requires: %{name} = %{version} Supplements: packageand(kipi-plugins:marble) +%kde4_runtime_requires %description geolocation This is the Geolocation plugin from the kipi plugins package. @@ -139,13 +135,11 @@ 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 +for res in 16 22 32 48 64 128 +do + install -dp -m 0755 %{buildroot}%{_kde4_iconsdir}/hicolor/"$res"x"$res"/apps + ln -s %{_kde4_iconsdir}/oxygen/"$res"x"$res"/apps/dngconverter.png %{buildroot}%{_kde4_iconsdir}/hicolor/"$res"x"$res"/apps/dngconverter.png +done %if 0%{?suse_version} %suse_update_desktop_file -r dngconverter Qt KDE Graphics Photography @@ -155,147 +149,58 @@ %endif %find_lang %{name} --all-name - %fdupes -s %{buildroot} - %kde_post_install %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files %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_bindir/panoramagui -%_kde4_applicationsdir/dngconverter.desktop -%_kde4_applicationsdir/expoblending.desktop -%_kde4_applicationsdir/kipiplugins.desktop -%_kde4_applicationsdir/panoramagui.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 -%_kde4_modulesdir/kipiplugin_flashexport.so -%_kde4_modulesdir/kipiplugin_flickrexport.so -%_kde4_modulesdir/kipiplugin_galleryexport.so -%_kde4_modulesdir/kipiplugin_htmlexport.so -%_kde4_modulesdir/kipiplugin_imageviewer.so -%_kde4_modulesdir/kipiplugin_ipodexport.so -%_kde4_modulesdir/kipiplugin_jpeglossless.so -%_kde4_modulesdir/kipiplugin_kioexportimport.so -%_kde4_modulesdir/kipiplugin_kmlexport.so -%_kde4_modulesdir/kipiplugin_kopete.so -%_kde4_modulesdir/kipiplugin_metadataedit.so -%_kde4_modulesdir/kipiplugin_panorama.so -%_kde4_modulesdir/kipiplugin_piwigoexport.so -%_kde4_modulesdir/kipiplugin_picasawebexport.so -%_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 -%_kde4_modulesdir/kipiplugin_timeadjust.so -%_kde4_modulesdir/kipiplugin_yandexfotki.so -%_kde4_servicesdir/kipiplugin_advancedslideshow.desktop -%_kde4_servicesdir/kipiplugin_batchprocessimages.desktop -%_kde4_servicesdir/kipiplugin_calendar.desktop -%_kde4_servicesdir/kipiplugin_dngconverter.desktop -%_kde4_servicesdir/kipiplugin_expoblending.desktop -%_kde4_servicesdir/kipiplugin_facebook.desktop -%_kde4_servicesdir/kipiplugin_flashexport.desktop -%_kde4_servicesdir/kipiplugin_flickrexport.desktop -%_kde4_servicesdir/kipiplugin_galleryexport.desktop -%_kde4_servicesdir/kipiplugin_htmlexport.desktop -%_kde4_servicesdir/kipiplugin_imageviewer.desktop -%_kde4_servicesdir/kipiplugin_ipodexport.desktop -%_kde4_servicesdir/kipiplugin_jpeglossless.desktop -%_kde4_servicesdir/kipiplugin_kioexportimport.desktop -%_kde4_servicesdir/kipiplugin_metadataedit.desktop -%_kde4_servicesdir/kipiplugin_panorama.desktop -%_kde4_servicesdir/kipiplugin_picasawebexport.desktop -%_kde4_servicesdir/kipiplugin_piwigoexport.desktop -%_kde4_servicesdir/kipiplugin_printimages.desktop -%_kde4_servicesdir/kipiplugin_rawconverter.desktop -%_kde4_servicesdir/kipiplugin_sendimages.desktop -%_kde4_servicesdir/kipiplugin_shwup.desktop -%_kde4_servicesdir/kipiplugin_smug.desktop -%_kde4_servicesdir/kipiplugin_timeadjust.desktop -%_kde4_servicesdir/kipiplugin_kopete.desktop -%_kde4_servicesdir/kipiplugin_yandexfotki.desktop -%_kde4_appsdir/kipiplugin_expoblending -%_kde4_appsdir/kipiplugin_flashexport -%_kde4_appsdir/kipiplugin_galleryexport -%_kde4_appsdir/kipiplugin_htmlexport -%_kde4_appsdir/kipiplugin_imageviewer -%_kde4_appsdir/kipiplugin_panorama -%_kde4_appsdir/kipiplugin_piwigoexport -%_kde4_appsdir/kipiplugin_printimages -%_kde4_appsdir/kipiplugin_removeredeyes -%_kde4_iconsdir/hicolor/*/actions/borderimages.* -%_kde4_iconsdir/hicolor/*/actions/colorimages.* -%_kde4_iconsdir/hicolor/*/actions/convertimages.* -%_kde4_iconsdir/hicolor/*/actions/effectimages.* -%_kde4_iconsdir/hicolor/*/actions/expoblending.* -%_kde4_iconsdir/hicolor/*/actions/facebook.* -%_kde4_iconsdir/hicolor/*/actions/filterimages.* -%_kde4_iconsdir/hicolor/*/actions/flash.* -%_kde4_iconsdir/hicolor/*/actions/flickr.* -%_kde4_iconsdir/hicolor/*/actions/flip-horizontal.* -%_kde4_iconsdir/hicolor/*/actions/gallery.* -%_kde4_iconsdir/hicolor/*/actions/grayscaleconvert.* -%_kde4_iconsdir/hicolor/*/actions/hq.* -%_kde4_iconsdir/hicolor/*/actions/metadataedit.* -%_kde4_iconsdir/hicolor/*/actions/ogl.png -%_kde4_iconsdir/hicolor/*/actions/panorama.png -%_kde4_iconsdir/hicolor/*/actions/picasa.* -%_kde4_iconsdir/hicolor/*/actions/piwigo.* -%_kde4_iconsdir/hicolor/*/actions/rajce.* -%_kde4_iconsdir/hicolor/*/actions/recompressimages.* -%_kde4_iconsdir/hicolor/*/actions/renameimages.* -%_kde4_iconsdir/hicolor/*/actions/resizeimages.* -%_kde4_iconsdir/hicolor/*/actions/shwup.* -%_kde4_iconsdir/hicolor/*/actions/slideshow.* -%_kde4_iconsdir/hicolor/*/actions/smugmug.* -%_kde4_iconsdir/hicolor/*/actions/timeadjust.* -%_kde4_iconsdir/hicolor/*/actions/zooomr.* -%_kde4_iconsdir/hicolor/*/actions/debianscreenshots.* -%_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/ +%doc extra/kipi-plugins/AUTHORS +%doc extra/kipi-plugins/ChangeLog +%doc extra/kipi-plugins/COPYING +%doc extra/kipi-plugins/COPYING-ADOBE +%doc extra/kipi-plugins/NEWS +%doc extra/kipi-plugins/README +%doc extra/kipi-plugins/TODO +%{_kde4_applicationsdir}/*.desktop +%exclude %{_kde4_applicationsdir}/scangui.desktop +%{_kde4_appsdir}/kipiplugin_* +%{_kde4_bindir}/dngconverter +%{_kde4_bindir}/dnginfo +%{_kde4_bindir}/expoblending +%{_kde4_bindir}/panoramagui +%{_kde4_iconsdir}/hicolor/*/actions/*.* +%exclude %{_kde4_iconsdir}/hicolor/*/actions/gpsimagetag.png +%{_kde4_iconsdir}/hicolor/*/apps/dngconverter.* +%{_kde4_iconsdir}/oxygen/*/apps/dngconverter.* +%{_kde4_iconsdir}/oxygen/*/apps/rawconverter.* +%{_kde4_modulesdir}/kipiplugin_*.so +%exclude %{_kde4_modulesdir}/kipiplugin_acquireimages.so +%exclude %{_kde4_modulesdir}/kipiplugin_gpssync.so +%{_kde4_servicesdir}/kipiplugin_*.desktop +%exclude %{_kde4_servicesdir}/kipiplugin_acquireimages.desktop +%exclude %{_kde4_servicesdir}/kipiplugin_acquireimages.desktop +%{_kde4_libdir}/libkipiplugins.so.* +%doc %{_kde4_htmldir}/en/kipi-plugins/ %files acquireimage %defattr(-,root,root,-) -%_kde4_bindir/scangui -%_kde4_applicationsdir/scangui.desktop -%_kde4_modulesdir/kipiplugin_acquireimages.so -%_kde4_servicesdir/kipiplugin_acquireimages.desktop +%{_kde4_applicationsdir}/scangui.desktop +%{_kde4_bindir}/scangui +%{_kde4_modulesdir}/kipiplugin_acquireimages.so +%{_kde4_servicesdir}/kipiplugin_acquireimages.desktop %files geolocation %defattr(-,root,root) -%_kde4_modulesdir/kipiplugin_gpssync.so -%_kde4_servicesdir/kipiplugin_gpssync.desktop -%_kde4_iconsdir/hicolor/*/actions/gpsimagetag.png -%_kde4_appsdir/gpssync +%{_kde4_appsdir}/gpssync +%{_kde4_iconsdir}/hicolor/*/actions/gpsimagetag.png +%{_kde4_modulesdir}/kipiplugin_gpssync.so +%{_kde4_servicesdir}/kipiplugin_gpssync.desktop %files lang -f extra/kipi-plugins/%{name}.lang %defattr(-,root,root,-) -%exclude %_kde4_htmldir/en/kipi-plugins/ +%exclude %{_kde4_htmldir}/en/kipi-plugins/ %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org