diff --git a/desktop-files.diff b/desktop-files.diff new file mode 100644 index 0000000..f0ea435 --- /dev/null +++ b/desktop-files.diff @@ -0,0 +1,10 @@ +--- acquireimages/scangui.desktop.sav ++++ acquireimages/scangui.desktop +@@ -54,7 +54,6 @@ GenericName[uk]=Отримання зо + GenericName[x-test]=xxAcquire Imagesxx + GenericName[zh_CN]=图像捕获 + GenericName[zh_TW]=擷取影像 +-Icon=scanner + Name=AcquireImages + Name[ast]=AcquireImages + Name[bg]=Сканиране на снимки diff --git a/digikam-2.4.1.tar.bz2 b/digikam-2.4.1.tar.bz2 deleted file mode 100644 index dcf1662..0000000 --- a/digikam-2.4.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aca967a4cc5312923cb2340502eb10a571684c14cf63896a68a1796d0483de3b -size 54531119 diff --git a/digikam-2.5.0.tar.bz2 b/digikam-2.5.0.tar.bz2 new file mode 100644 index 0000000..0a20ed0 --- /dev/null +++ b/digikam-2.5.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55292c79b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a +size 54976375 diff --git a/digikam-external-libs.patch b/digikam-external-libs.patch deleted file mode 100644 index 99abf37..0000000 --- a/digikam-external-libs.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt.orig 2011-12-04 22:41:31.000000000 +0100 -+++ CMakeLists.txt 2011-12-12 10:45:50.716070335 +0100 -@@ -82,12 +82,6 @@ IF(${DIGIKAMSC_USE_PRIVATE_KDEGRAPHICS}) - SET(KSANE_LOCAL_DIR extra/libksane) - ENDIF() - --SET(KFACE_LOCAL_DIR extra/libkface) --SET(KGEOMAP_LOCAL_DIR extra/libkgeomap) --SET(MEDIAWIKI_LOCAL_DIR extra/libmediawiki) --SET(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte) -- --ADD_SUBDIRECTORY(extra) - ADD_SUBDIRECTORY(core) - MACRO_OPTIONAL_ADD_SUBDIRECTORY(doc) - diff --git a/digikam.changes b/digikam.changes index 78770c5..ede06ad 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Feb 3 09:56:22 UTC 2012 - tittiatcoke@gmail.com + +- Correct the license of the Documentation subpackage to the + GFDL-1.X license. +- Correct spec-file to autodetect the translations for the + additional libraries + +------------------------------------------------------------------- +Fri Jan 13 09:50:17 UTC 2012 - tittiatcoke@gmail.com + +- The digikam spec-file now builds all additional components + (kipi-plugins, libmediawiki, libkface and libkgeomap) + +------------------------------------------------------------------- +Wed Jan 4 08:56:34 UTC 2012 - tittiatcoke@gmail.com + +- Update to 2.5.0 + * a bug-fix release, including a total of 101 fixed bugs. + ------------------------------------------------------------------- Mon Dec 12 09:32:52 UTC 2011 - coolo@suse.com diff --git a/digikam.spec b/digikam.spec index 5647220..3c92386 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,7 +1,7 @@ # # spec file for package digikam # -# 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 @@ -15,9 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: digikam -Version: 2.4.1 +Version: 2.5.0 Release: 0 Summary: A KDE Photo Manager License: GPL-2.0+ @@ -26,30 +25,66 @@ Url: http://www.digikam.org/ Source0: http://sourceforge.net/projects/digikam/files/digikam/%{version}/digikam-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE digikam-buildtime.patch -- Remove build time references so build-compare can do its work Patch0: digikam-buildtime.patch -# PATCH-FIX-OPENSUSE digikam-external-libs.patch -- Compile with external libs -Patch1: digikam-external-libs.patch +# PATCH-FIX-UPSTREAM use_correct_libkipi.patch -- Only compile these classes when the latest libkipi (KDE 4.9) is used +Patch1: use_correct_libkipi.patch +# PATCH-FIX-OPENSUSE desktop-files.diff -- Remove Icon= entry (the icon is missing) +Patch2: desktop-files.diff +# PATCH-FIX-OPENSUSE non-executable-script.patch asterios.dramis@gmail.com -- Fix rpmlint warning "non-executable-script" +Patch3: non-executable-script.patch +# PATCH-FIX-OPENSUSE remove-gplv2-only.patch idoenmez@suse.de bnc#711963 -- Remove GPLv2 only files from the build system +Patch4: remove-gplv2-only.patch +# PATCH-FIX-OPENSUSE fix-broken-icon-reference.diff adrian@suse.de -- CHECK ON NEXT VERSION UPDATE: reference to missing icon +Patch5: fix-broken-icon-reference.diff +# PATCH-FIX-OPENSUSE digikam_no_build_vkontakte.diff tittiatcoke@gmail.com -- Don't build libvkontakte (use external one) +Patch6: digikam_no_build_vkontakte.diff +BuildRequires: ImageMagick BuildRequires: boost-devel BuildRequires: doxygen BuildRequires: fdupes BuildRequires: lensfun-devel +BuildRequires: libexpat-devel BuildRequires: libgphoto2-devel +BuildRequires: libgpod-devel BuildRequires: libjasper-devel BuildRequires: libkdcraw-devel BuildRequires: libkde4-devel BuildRequires: libkdepimlibs4-devel +%if 0%{?kde_updatedapps} +%if 0%{?suse_version} == 1140 +BuildRequires: sane-backends-devel +BuildRequires: libexiv2-devel >= 0.21 +%endif +%if 0%{?suse_version} > 1140 +BuildRequires: libkvkontakte-devel BuildRequires: libkexiv2-devel -BuildRequires: libkface-devel -BuildRequires: libkgeomap-devel BuildRequires: libkipi-devel +BuildRequires: libksane-devel +%endif +%else +BuildRequires: libkvkontakte-devel +BuildRequires: libkexiv2-devel +BuildRequires: libkipi-devel +BuildRequires: libksane-devel +%endif BuildRequires: liblcms-devel BuildRequires: liblqr-devel +BuildRequires: libqca2-devel +BuildRequires: libqjson-devel BuildRequires: libsoprano-devel BuildRequires: libusb-1_0-devel +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 %if 0%{?suse_version} BuildRequires: update-desktop-files %endif -Requires: kipi-plugins >= 2.1.0 +Requires: kipi-plugins >= 2.5.0 %requires_ge libkipi8 Requires: libqt4-sql-sqlite Requires: libqt4-sql-mysql @@ -68,28 +103,182 @@ delete your images, is provided. %package doc Summary: Documentation of Digikam +License: GFDL-1.2 Group: Documentation/HTML BuildArch: noarch %description doc This package contains the documentation for digikam +# 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 -n kipi-plugins-acquireimage +Summary: KDE Plug-Ins for Image Manipulation - Acquireimage plugin +License: GPL-2.0+ +Group: Productivity/Graphics/Other +Requires: kipi-plugins = %{version} +Supplements: packageand(kipi-plugins:sane-backends) +%kde4_runtime_requires + +%description -n kipi-plugins-acquireimage +This is the Acquireimage plugin from the kipi plugins package. + +# split out geolocation plugin in order to allow the main +# kipi-plugins package to be included on livecd (geolocation +# requires marble, which is blocked for livecd) +%package -n kipi-plugins-geolocation +Summary: KDE Plug-Ins for Image Manipulation - Geolocation plugin +License: GPL-2.0+ +Group: Productivity/Graphics/Other +Requires: kipi-plugins = %{version} +Supplements: packageand(kipi-plugins:marble) +%kde4_runtime_requires + +%description -n kipi-plugins-geolocation +This is the Geolocation plugin from the kipi plugins package. + +%package -n kipi-plugins +Summary: KDE Plug-Ins for Image Manipulation +License: GPL-2.0+ +Group: Productivity/Graphics/Other +Recommends: ImageMagick +Recommends: enblend-enfuse +Recommends: hugin +Supplements: packageand(kipi-plugins:marble) +Recommends: kipi-plugins-lang = %{version} +%kde4_runtime_requires + +%description -n kipi-plugins +A set of plug-ins for the KDE KIPI interface, used by some KDE imaging +applications. + +%package -n libkgeomap-devel +Summary: Development files for libkgeomap +License: GPL-2.0+ +Group: Development/Libraries/KDE +Requires: libkgeomap1 = %{version} + +%description -n libkgeomap-devel +This package contains development files for libkgeomap. + +%package -n libkgeomap1 +Summary: World-Map Library interface for KDE +License: GPL-2.0+ +Group: System/Libraries +Recommends: marble +Recommends: libkgeomap-lang = %{version} +# libkgeomap was last used at openSUSE 12.1 (version 2.2.0) +Provides: libkgeomap = %{version} +Obsoletes: libkgeomap < %{version} + +%description -n libkgeomap1 +Libkgeomap is a wrapper around different world-map components, to browse and arrange photos over a map. +Currently supported map engine are: +- Marble +- OpenstreetMap (via Marble) +- GoogleMap +This library is used by kipi-plugins, digiKam and other kipi host programs. + +%package -n libkface-devel +Summary: Development files for libkface +License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT +Group: Development/Libraries/KDE +Requires: libkface1 = %{version} + +%description -n libkface-devel +This package contains development files for libkface. + +%package -n libkface1 +Summary: Wrapper around LibFace to perform face recognition and detection over pictures +License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT +Group: System/Libraries + +%description -n libkface1 +Libkface is a Qt/C++ wrapper around LibFace to perform face recognition and +detection over pictures. + +%package -n libmediawiki1 +Summary: Interface for MediaWiki based web services +License: GPL-2.0+ +Group: System/Libraries +Provides: libmediawiki = %{version} + +%description -n libmediawiki1 +libmediawiki is a KDE C++ interface for MediaWiki based web service as +wikipedia.org. + +This package contains the shared library. + +%package -n libmediawiki-devel +Summary: Development files for libmediawiki +License: GPL-2.0+ +Group: Development/Libraries/C and C++ +Requires: libmediawiki1 = %{version} + +%description -n libmediawiki-devel +libmediawiki is a KDE C++ interface for MediaWiki based web service as +wikipedia.org. + +This package contains the development files for libmediawiki. + %lang_package + +%package -n kipi-plugins-lang +Summary: Translations for kipi-plugins +License: GPL-2.0+ +Group: System/Localization +Requires: kipi-plugins = %{version} +BuildArch: noarch +Supplements: packageand(kipi-plugins:bundle-lang-other) + +%description -n kipi-plugins-lang +Provides translations to the package kipi-plugins + +%package -n libkgeomap-lang +Summary: Translations for libkgeomap +License: GPL-2.0+ +Group: System/Localization +Requires: libkgeomap1 = %{version} +BuildArch: noarch +Supplements: packageand(libkgeomap1:bundle-lang-other) + +%description -n libkgeomap-lang +Provides translations to the package libkgeomap + %prep %setup -q %patch0 -%patch1 - -# Include only digikam translations -find po -name kipiplugin_*.po | xargs rm -find po -name libkgeomap.po | xargs rm +%patch1 -p1 +pushd extra/kipi-plugins +%patch2 +popd +%patch3 +%patch4 +%patch5 +%patch6 -p0 # 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/pluginsversion.h.cmake + +pushd extra/kipi-plugins +# Remove GPL-v2 only files +rm gpssync/borrowed/modeltest.cpp +rm gpssync/borrowed/modeltest.h +popd %build +%if !0%{?kde_updatedapps} %cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE +%else +%if %suse_version < 1210 +%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS:BOOL=1 -DENABLE_INTERNALMYSQL=FALSE +%else +%cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE +%endif +%endif %make_jobs %install @@ -97,20 +286,47 @@ cd build %kde4_makeinstall cd .. -# Remove kipi-plugins docs (included in kipi-plugins package) -rm -rf %{buildroot}%{_kde4_htmldir}/en/kipi-plugins - # Not needed, the package doesn't actually provide any shared libraries rm -f %{buildroot}%{_kde4_libdir}/libdigikamcore.so rm -f %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so +# Not needed, the package doesn't actually provide any shared libraries +rm -f %{buildroot}%{_kde4_libdir}/libkipiplugins.so +# Not needed +rm -f %{buildroot}%{_kde4_libdir}/libPropertyBrowser.a + +# 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 +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 %{name} Qt KDE Graphics Photography %suse_update_desktop_file -G "Photo Editor" -r showfoto Qt KDE Graphics Photography +%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 panoramagui Qt KDE Graphics Photography +%suse_update_desktop_file -r scangui Qt KDE Graphics Scanning %endif %find_lang %{name} +%find_lang libkgeomap libkgeomap.lang + +%find_lang kipiplugins kipiplugin.lang + +for l in acquireimages advancedslideshow batchprocessimages calendar dngconverter expoblending facebook flashexport flickrexport galleryexport gpssync htmlexport imageviewer ipodexport jpeglossless kioexportimport metadataedit picasawebexport piwigoexport printimages rawconverter removeredeyes sendimages shwup smug timeadjust; +do +%find_lang kipiplugin_$l kipiplugin.lang +done + %fdupes -s %{buildroot} %kde_post_install @@ -121,7 +337,7 @@ rm -f %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so %files %defattr(-,root,root,-) -%doc core/AUTHORS core/COPYING core/COPYING.DOC core/COPYING.LIB +%doc core/AUTHORS core/COPYING core/COPYING.LIB %doc core/ChangeLog core/NEWS core/README core/TODO %doc core/TODO.FACE core/TODO.MYSQLPORT %{_kde4_applicationsdir}/digikam.desktop @@ -154,8 +370,10 @@ rm -f %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so %files doc %defattr(-,root,root,-) +%doc core/COPYING.DOC %doc %{_kde4_htmldir}/en/digikam/ %doc %{_kde4_htmldir}/en/showfoto/ +%doc %{_kde4_htmldir}/en/kipi-plugins/ %doc %{_mandir}/man1/cleanup_digikamdb.1%{ext_man} %doc %{_mandir}/man1/digitaglinktree.1%{ext_man} @@ -164,4 +382,298 @@ rm -f %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so %exclude %{_kde4_htmldir}/en/digikam %exclude %{_kde4_htmldir}/en/showfoto +%post -n kipi-plugins -p /sbin/ldconfig + +%postun -n kipi-plugins -p /sbin/ldconfig + +%files -n kipi-plugins +%defattr(-,root,root,-) +%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}/digikam.desktop +%exclude %{_kde4_applicationsdir}/showfoto.desktop +%exclude %{_kde4_applicationsdir}/scangui.desktop +%{_kde4_appsdir}/kipiplugin_* +%{_kde4_bindir}/dngconverter +%{_kde4_bindir}/dnginfo +%{_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.* +%{_kde4_iconsdir}/hicolor/*/apps/photolayoutseditor.* +%{_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_gpssync.desktop +%{_kde4_libdir}/libkipiplugins.so.* +%{_kde4_appsdir}/photolayoutseditor +%{_kde4_configkcfgdir}/PLEConfigSkeleton.kcfgc +%{_kde4_servicetypesdir}/photolayoutseditorborderplugin.desktop +%{_kde4_servicetypesdir}/photolayoutseditoreffectplugin.desktop + +%files -n kipi-plugins-lang -f kipiplugin.lang +%defattr(-,root,root,-) +%exclude %{_kde4_htmldir}/en/kipi-plugins + +%files -n kipi-plugins-acquireimage +%defattr(-,root,root,-) +%{_kde4_applicationsdir}/scangui.desktop +%{_kde4_bindir}/scangui +%{_kde4_modulesdir}/kipiplugin_acquireimages.so +%{_kde4_servicesdir}/kipiplugin_acquireimages.desktop + +%files -n kipi-plugins-geolocation +%defattr(-,root,root) +%{_kde4_appsdir}/gpssync +%{_kde4_iconsdir}/hicolor/*/actions/gpsimagetag.png +%{_kde4_modulesdir}/kipiplugin_gpssync.so +%{_kde4_servicesdir}/kipiplugin_gpssync.desktop + +%files -n libkgeomap-devel +%defattr(-,root,root,-) +%doc extra/libkgeomap/AUTHORS +%doc extra/libkgeomap/README +%{_kde4_bindir}/libkgeomap_demo +%{_kde4_appsdir}/cmake/modules/FindKGeoMap.cmake +%{_includedir}/libkgeomap/ +%{_kde4_libdir}/pkgconfig/libkgeomap.pc +%{_kde4_libdir}/libkgeomap.so + +%files -n libkgeomap-lang -f libkgeomap.lang +%defattr(-,root,root,-) + +%post -n libkgeomap1 -p /sbin/ldconfig + +%postun -n libkgeomap1 -p /sbin/ldconfig + +%files -n libkgeomap1 +%defattr(-,root,root,-) +%{_kde4_appsdir}/libkgeomap/ +%{_kde4_libdir}/libkgeomap.so.1* + +%post -n libkface1 -p /sbin/ldconfig + +%postun -n libkface1 -p /sbin/ldconfig + +%files -n libkface1 +%defattr(-,root,root,-) +%{_kde4_appsdir}/libkface +%{_kde4_libdir}/libkface.so.1* + +%files -n libkface-devel +%defattr(-,root,root,-) +%doc extra/libkface/{AUTHORS,COPYING,README} +%{_kde4_libdir}/libkface.so +%{_includedir}/libkface/ +%{_kde4_libdir}/pkgconfig/libkface.pc +%{_kde4_appsdir}/cmake/modules/FindKface.cmake + +%post -n libmediawiki1 -p /sbin/ldconfig + +%postun -n libmediawiki1 -p /sbin/ldconfig + +%files -n libmediawiki1 +%defattr(-,root,root,-) +%{_libdir}/libmediawiki.so.1* + +%files -n libmediawiki-devel +%defattr(-,root,root,-) +%doc extra/libmediawiki/{AUTHORS,COPYING,README} +%{_includedir}/libmediawiki/ +%{_libdir}/libmediawiki.so +%{_libdir}/pkgconfig/libmediawiki.pc +%{_kde4_appsdir}/cmake/modules/FindMediawiki.cmake + +%if 0%{?kde_updatedapps} +%if %suse_version < 1210 +%package -n libkdcraw20 +Summary: Shared library interface around dcraw +License: LGPL-2.1+ +Group: Development/Libraries/KDE +Version: 4.7.50 +Release: 0 +%requires_ge libqt4-x11 + +%description -n libkdcraw20 +Libkdcraw is a C++ interface around dcraw binary program used to decode +RAW picture files. The library documentation is available on header +files. + +This library is used by kipi-plugins, digiKam and others kipi host +programs. + +%files -n libkdcraw20 +%defattr(-,root,root) +%{_libdir}/libkdcraw.so.* +%{_kde4_appsdir}/libkdcraw/ +%{_kde4_iconsdir}/hicolor/*/apps/kdcraw.png + +%post -n libkdcraw20 -p /sbin/ldconfig + +%postun -n libkdcraw20 -p /sbin/ldconfig + +%package -n libkdcraw-devel +Summary: Shared library interface around dcraw +License: LGPL-2.1+ +Group: Development/Libraries/KDE +Version: 4.7.50 +Release: 0 +Requires: libkdcraw20 = %version + +%description -n libkdcraw-devel +Libkdcraw is a C++ interface around dcraw binary program used to decode +RAW picture files. The library documentation is available on header +files. + +This library is used by kipi-plugins, digiKam and others kipi host +programs. + +%files -n libkdcraw-devel +%defattr(-,root,root) +%{_libdir}/libkdcraw.so +%{_includedir}/libkdcraw/ +%{_kde4_libdir}/pkgconfig/libkdcraw.pc + +%package -n libkipi8 +Summary: KDE Image Plug-In Interface +License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT +Group: Development/Libraries/KDE +Version: 4.7.50 +Release: 0 +%requires_ge libqt4-x11 + +%description -n libkipi8 +This package provides a generic KDE image plug-in interface used by +some KDE image applications. Plug-ins for this interface are in the +kipi-plugins package. + +%files -n libkipi8 +%defattr(-,root,root) +%{_libdir}/libkipi.so.* +%{_kde4_appsdir}/kipi/ +%{_kde4_iconsdir}/hicolor/*/apps/kipi.png +%{_kde4_servicetypesdir}/kipiplugin.desktop + +%post -n libkipi8 -p /sbin/ldconfig + +%postun -n libkipi8 -p /sbin/ldconfig + +%package -n libkipi-devel +Summary: KDE Image Plugin Interface +License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT +Group: Development/Libraries/KDE +Version: 4.7.50 +Release: 0 +Requires: libkipi8 = %version + +%description -n libkipi-devel +This package provides a generic KDE Image Plug-in Interface used by +some KDE image applications. Plug-ins for this interface are in the +kipi-plugins package. + +%files -n libkipi-devel +%defattr(-,root,root) +%{_libdir}/libkipi.so +%{_includedir}/libkipi/ +%{_kde4_libdir}/pkgconfig/libkipi.pc + +%package -n libkexiv2-10 +Summary: Library to manipulate picture meta data +License: GPL-2.0+ +Group: Development/Libraries/KDE +Version: 4.7.50 +Release: 0 + +%description -n libkexiv2-10 +Libkexiv2 is a wrapper around Exiv2 library to manipulate pictures +metadata. + +%files -n libkexiv2-10 +%defattr(-,root,root) +%{_kde4_appsdir}/libkexiv2/ +%{_libdir}/libkexiv2.so.* + +%package -n libkexiv2-devel +Summary: Library to manipulate picture meta data +License: GPL-2.0+ +Group: Development/Libraries/KDE +Version: 4.7.50 +Release: 0 +Requires: libkexiv2-10 = %version +%requires_ge libqt4-x11 + +%description -n libkexiv2-devel +Libkexiv2 is a wrapper around Exiv2 library to manipulate pictures +metadata. + +%files -n libkexiv2-devel +%defattr(-,root,root) +%{_libdir}/libkexiv2.so +%{_includedir}/libkexiv2/ +%_kde4_libdir/pkgconfig/libkexiv2.pc + +%post -n libkexiv2-10 -p /sbin/ldconfig + +%postun -n libkexiv2-10 -p /sbin/ldconfig + +%package -n libksane0 +Summary: KDE scan library +License: GPL-2.0+ +Group: Productivity/Graphics/Other +Version: 4.7.50 +Release: 0 + +%description -n libksane0 +This package contains a library to add scan support to KDE +applications. + +%post -n libksane0 -p /sbin/ldconfig + +%postun -n libksane0 -p /sbin/ldconfig + +%files -n libksane0 +%defattr(-,root,root) +%_kde4_libdir/libksane.so.* + +%package -n libksane-devel +Summary: KDE scan library - Development Files +License: GPL-2.0+ +Group: Development/Libraries/KDE +Version: 4.7.50 +Release: 0 +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 +applications. + + +%files -n libksane-devel +%defattr(-,root,root) +%{_includedir}/libksane/ +%_kde4_libdir/pkgconfig/libksane.pc +%_kde4_libdir/libksane.so +%_kde4_libdir/cmake/KSane/ + +%endif +%endif + %changelog diff --git a/digikam_no_build_vkontakte.diff b/digikam_no_build_vkontakte.diff new file mode 100644 index 0000000..a92a3d7 --- /dev/null +++ b/digikam_no_build_vkontakte.diff @@ -0,0 +1,28 @@ +--- CMakeLists.txt 2012-01-03 01:42:09.000000000 +0100 ++++ CMakeLists.txt 2012-01-05 13:49:28.920827859 +0100 +@@ -70,7 +70,6 @@ + ${CMAKE_SOURCE_DIR}/extra/libkgeomap/cmake/modules + ${CMAKE_SOURCE_DIR}/extra/libmediawiki/cmake/modules + ${CMAKE_SOURCE_DIR}/extra/libkface/cmake/modules +- ${CMAKE_SOURCE_DIR}/extra/libkvkontakte/cmake/modules + ${CMAKE_SOURCE_DIR}/cmake/modules + ${CMAKE_MODULE_PATH} + ) +@@ -85,7 +84,6 @@ + SET(KFACE_LOCAL_DIR extra/libkface) + SET(KGEOMAP_LOCAL_DIR extra/libkgeomap) + SET(MEDIAWIKI_LOCAL_DIR extra/libmediawiki) +-SET(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte) + + ADD_SUBDIRECTORY(extra) + ADD_SUBDIRECTORY(core) +--- extra/CMakeLists.txt 2012-01-03 01:31:52.000000000 +0100 ++++ extra/CMakeLists.txt 2012-01-05 13:49:38.665828606 +0100 +@@ -33,7 +33,6 @@ + ENDIF() + + MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki) +-MACRO_OPTIONAL_ADD_SUBDIRECTORY(libkvkontakte) + + ADD_SUBDIRECTORY(libkgeomap) + ADD_SUBDIRECTORY(libkface) diff --git a/fix-broken-icon-reference.diff b/fix-broken-icon-reference.diff new file mode 100644 index 0000000..99b4cde --- /dev/null +++ b/fix-broken-icon-reference.diff @@ -0,0 +1,10 @@ +--- ./extra/kipi-plugins/panorama/plugin/panoramagui.desktop.orig 2011-10-04 09:34:29.576552045 +0200 ++++ ./extra/kipi-plugins/panorama/plugin/panoramagui.desktop 2011-10-04 09:35:16.838301132 +0200 +@@ -57,7 +57,6 @@ + Name[x-test]=xxPanoramaxx + Name[zh_TW]=Panorama + StartupNotify=true +-Icon=layer-visible-on + Terminal=false + Type=Application + X-DBUS-ServiceName= diff --git a/non-executable-script.patch b/non-executable-script.patch new file mode 100644 index 0000000..46b6dea --- /dev/null +++ b/non-executable-script.patch @@ -0,0 +1,14 @@ +--- 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 +--- 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 diff --git a/remove-gplv2-only.patch b/remove-gplv2-only.patch new file mode 100644 index 0000000..f47ca83 --- /dev/null +++ b/remove-gplv2-only.patch @@ -0,0 +1,15 @@ +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) + diff --git a/use_correct_libkipi.patch b/use_correct_libkipi.patch new file mode 100644 index 0000000..369eb3d --- /dev/null +++ b/use_correct_libkipi.patch @@ -0,0 +1,45 @@ +diff -urB digikam-2.5.0/core/utilities/setup/setupplugins.cpp new/core/utilities/setup/setupplugins.cpp +--- digikam-2.5.0/core/utilities/setup/setupplugins.cpp 2012-01-03 01:32:01.000000000 +0100 ++++ new/core/utilities/setup/setupplugins.cpp 2012-01-04 18:37:42.654350574 +0100 +@@ -6,8 +6,8 @@ + * Date : 2004-01-02 + * Description : setup Kipi plugins tab. + * +- * Copyright (C) 2004-2011 by Gilles Caulier +- * Copyright (C) 2011 by Andi Clemens ++ * Copyright (C) 2004-2012 by Gilles Caulier ++ * Copyright (C) 2011-2012 by Andi Clemens + * + * This program is free software; you can redistribute it + * and/or modify it under the terms of the GNU General +@@ -100,6 +100,11 @@ + + panel->setLayout(mainLayout); + ++#if KIPI_VERSION < 0x010400 ++ d->checkAllBtn->setVisible(false); ++ d->clearBtn->setVisible(false); ++#endif ++ + initPlugins(); + + // -------------------------------------------------------- +@@ -158,14 +163,18 @@ + void SetupPlugins::slotCheckAll() + { + QApplication::setOverrideCursor(Qt::WaitCursor); ++#if KIPI_VERSION >= 0x010400 + d->kipiConfig->slotCheckAll(); ++#endif + QApplication::restoreOverrideCursor(); + } + + void SetupPlugins::slotClear() + { + QApplication::setOverrideCursor(Qt::WaitCursor); ++#if KIPI_VERSION >= 0x010400 + d->kipiConfig->slotClear(); ++#endif + QApplication::restoreOverrideCursor(); + } + } // namespace Digikam