diff --git a/digikam.changes b/digikam.changes index 018e894..771a58f 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jun 10 19:37:07 UTC 2013 - asterios.dramis@gmail.com + +- Added libeigen3-devel and libkqoauth-devel as build requirements. +- Replaced ImageMagick with ImageMagick-devel as build requirement (since + "mogrify" is no longer needed to fix the icon sizes). +- Removed support for openSUSE <= 11.4 for KDE:UpdatedApps (not needed). +- Removed support for openSUSE 11.3. +- Fix rawconverter icon links (links were pointing to rawconverter.* instead of + rawconverter.png or rawconverter.svgz). + ------------------------------------------------------------------- Sat Jun 1 19:31:46 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/digikam.spec b/digikam.spec index e9de15d..beba189 100644 --- a/digikam.spec +++ b/digikam.spec @@ -36,14 +36,18 @@ Patch3: remove-gplv2-only.patch Patch5: digikam_no_build_vkontakte.diff # PATCH-FIX-UPSTREAM digikam-3.0.0.no-kdcraw.version-check.patch -- version check for libkdcraw currently broken Patch6: digikam-3.0.0.no-kdcraw.version-check.patch -BuildRequires: ImageMagick +BuildRequires: ImageMagick-devel BuildRequires: bison BuildRequires: boost-devel BuildRequires: doxygen BuildRequires: fdupes BuildRequires: flex +BuildRequires: gdk-pixbuf-devel BuildRequires: gstreamer-0_10-plugins-qt-devel BuildRequires: lensfun-devel +%if 0%{?suse_version} > 1230 +BuildRequires: libeigen3-devel +%endif BuildRequires: libexpat-devel BuildRequires: libgphoto2-devel BuildRequires: libgpod-devel @@ -51,24 +55,14 @@ BuildRequires: libjasper-devel BuildRequires: libkdcraw-devel BuildRequires: libkde4-devel BuildRequires: libkdepimlibs4-devel -%if 0%{?kde_updatedapps} -%if 0%{?suse_version} == 1140 -BuildRequires: libexiv2-devel >= 0.21 -BuildRequires: sane-backends-devel -%endif -%if 0%{?suse_version} > 1140 BuildRequires: libkexiv2-devel BuildRequires: libkipi-devel -BuildRequires: libksane-devel -BuildRequires: libkvkontakte-devel -%endif -%else -BuildRequires: libkexiv2-devel -BuildRequires: libkipi-devel -BuildRequires: libksane-devel -BuildRequires: libkvkontakte-devel +%if 0%{?suse_version} > 1230 +BuildRequires: libkqoauth-devel %endif BuildRequires: libMagick++-devel +BuildRequires: libksane-devel +BuildRequires: libkvkontakte-devel BuildRequires: liblcms-devel BuildRequires: liblqr-devel %if 0%{?suse_version} > 1220 @@ -83,11 +77,6 @@ BuildRequires: marble-devel BuildRequires: opencv-devel BuildRequires: shared-desktop-ontologies-devel BuildRequires: pkgconfig(glib-2.0) -%if 0%{?suse_version} == 1130 -BuildRequires: pkgconfig(gtk+-2.0) -%else -BuildRequires: gdk-pixbuf-devel -%endif BuildRequires: pkgconfig(glu) %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -286,10 +275,6 @@ rm -f %{buildroot}%{_kde4_libdir}/libHUpnp.a rm -f %{buildroot}%{_kde4_libdir}/libHUpnpAv.a rm -f %{buildroot}%{_kde4_libdir}/libQtSoap.a -# Fix "wrong-icon-size" rpmlint warning -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 - %if 0%{?suse_version} %suse_update_desktop_file -r %{name} Qt KDE Graphics Photography %suse_update_desktop_file -r showfoto Qt KDE Graphics Photography @@ -317,12 +302,15 @@ do done # this allows the icon to be used as an application icon safely -for res in 16x16 22x22 32x32 48x48 64x64 128x128 scalable +for res in 16x16 22x22 32x32 48x48 64x64 128x128 do pushd %{buildroot}%{_kde4_iconsdir}/hicolor/$res/apps/ -ln -s %{_kde4_iconsdir}/oxygen/$res/apps/rawconverter.* +ln -s %{_kde4_iconsdir}/oxygen/$res/apps/rawconverter.png popd done +pushd %{buildroot}%{_kde4_iconsdir}/hicolor/scalable/apps/ +ln -s %{_kde4_iconsdir}/oxygen/scalable/apps/rawconverter.svgz +popd %fdupes -s %{buildroot} @@ -350,7 +338,7 @@ done %files %defattr(-,root,root,-) -%doc core/{AUTHORS,COPYING,COPYING.LIB,ChangeLog,NEWS,README,TODO,TODO.FACE,TODO.MYSQLPORT} +%doc core/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,ChangeLog,NEWS,README,README.FACE,TODO,TODO.FACE,TODO.MYSQLPORT,TODO.TABLEVIEW} %{_kde4_applicationsdir}/digikam.desktop %{_kde4_applicationsdir}/showfoto.desktop %{_kde4_appsdir}/digikam/ @@ -397,7 +385,7 @@ done %files -n kipi-plugins %defattr(-,root,root,-) -%doc extra/kipi-plugins/{AUTHORS,COPYING,COPYING-ADOBE,ChangeLog,NEWS,README,TODO} +%doc extra/kipi-plugins/{AUTHORS,COPYING,COPYING-ADOBE,COPYING-CMAKE-SCRIPTS,ChangeLog,NEWS,README,TODO} %{_kde4_applicationsdir}/*.desktop %exclude %{_kde4_applicationsdir}/digikam.desktop %exclude %{_kde4_applicationsdir}/showfoto.desktop @@ -451,7 +439,7 @@ done %files -n libkgeomap-devel %defattr(-,root,root,-) -%doc extra/libkgeomap/{AUTHORS,README} +%doc extra/libkgeomap/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,README,TODO,kmap2kgeomap-TODO.txt} %{_kde4_appsdir}/cmake/modules/FindKGeoMap.cmake %{_kde4_includedir}/libkgeomap/ %{_kde4_libdir}/pkgconfig/libkgeomap.pc @@ -472,7 +460,7 @@ done %files -n libkface-devel %defattr(-,root,root,-) -%doc extra/libkface/{AUTHORS,COPYING,README} +%doc extra/libkface/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,README,TODO} %{_kde4_libdir}/libkface.so %{_kde4_includedir}/libkface/ %{_kde4_libdir}/pkgconfig/libkface.pc @@ -484,7 +472,7 @@ done %files -n libmediawiki-devel %defattr(-,root,root,-) -%doc extra/libmediawiki/{AUTHORS,COPYING,README} +%doc extra/libmediawiki/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,README,TODO} %{_kde4_includedir}/libmediawiki/ %{_kde4_libdir}/libmediawiki.so %{_kde4_libdir}/pkgconfig/libmediawiki.pc @@ -654,11 +642,7 @@ Summary: KDE scan library - Development Files License: GPL-2.0+ Group: Development/Libraries/KDE Requires: libksane0 = %{version} -%if 0%{?suse_version} > 1130 Requires: sane-backends-devel -%else -Requires: sane-backends -%endif %description -n libksane-devel This package contains a library to add scan support to KDE