Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at Mon Aug 29 11:21:13 CEST 2011.
-------- --- KDE/digikam/digikam.changes 2011-07-28 12:26:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/digikam/digikam.changes 2011-08-09 00:42:29.000000000 +0200 @@ -1,0 +2,18 @@ +Mon Aug 8 22:40:46 UTC 2011 - asterios.dra...@gmail.com + +- Spec file updates: + * Changed License: to GPL-2.0+. + * Added description for the patches based on openSUSE Patches Guidelines. + * Cleanup in BuildRequires:. + * Removed oxygen-icon-theme from Requires: (not needed). + * Removed *.so files and digikam-devel subpackage (not needed, the package + doesn't actually provide any shared libraries). + * Removed digikam-doc subpackage and merged it in digikam since it actually + contained the main help files. + * Added a fix for build time references so build-compare can do its work. + * Fixed some rpmlint warnings. + * Minor other updates. +- Readded add_mimetype_bnc629393.diff patch to fix mimetypes to desktop file + for better integration in GNOME (bnc#629393). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- add_mimetype_bnc629393.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.0EHsyn/_old 2011-08-29 11:18:20.000000000 +0200 +++ /var/tmp/diff_new_pack.0EHsyn/_new 2011-08-29 11:18:20.000000000 +0200 @@ -19,43 +19,41 @@ Name: digikam Version: 2.0.0 -Release: 1 -License: GPLv2+ +Release: 3 +License: GPL-2.0+ Summary: A KDE Photo Manager Url: http://www.digikam.org/ Group: Productivity/Graphics/Viewers Source0: http://sourceforge.net/projects/digikam/files/%{name}/%{version}/%{name}-%{version}.tar.bz2 -Patch1: digikam-buildtime.patch +# PATCH-FIX-OPENSUSE digikam-buildtime.patch -- Remove build time references so build-compare can do its work +Patch0: digikam-buildtime.patch +# PATCH-FIX-UPSTREAM add_mimetype_bnc629393.diff bnc#629393 kde#261627 ctri...@gmx.net -- Add MimeTypes to desktop file for better integration in GNOME +Patch1: add_mimetype_bnc629393.diff +# PATCH-FIX-OPENSUSE digikam-external-libs.patch -- Compile with external libs Patch2: digikam-external-libs.patch +BuildRequires: boost-devel BuildRequires: doxygen -BuildRequires: graphviz-devel +BuildRequires: fdupes BuildRequires: lensfun-devel -BuildRequires: libexiv2-devel -BuildRequires: libexpat-devel -BuildRequires: libgcrypt-devel BuildRequires: libgphoto2-devel -BuildRequires: libgpod-devel BuildRequires: libjasper-devel BuildRequires: libkdcraw-devel +BuildRequires: libkde4-devel BuildRequires: libkdepimlibs4-devel BuildRequires: libkexiv2-devel BuildRequires: libkface-devel BuildRequires: libkipi-devel BuildRequires: libkgeomap-devel -BuildRequires: libksane-devel +BuildRequires: liblcms-devel BuildRequires: liblqr-devel -BuildRequires: libqca2-devel -BuildRequires: libqimageblitz-devel -BuildRequires: libqjson-devel -BuildRequires: marble-devel -BuildRequires: opencv-devel -BuildRequires: soprano-backend-redland -BuildRequires: sqlite-devel -BuildRequires: pkgconfig(gtk+-2.0) -Requires: kipi-plugins >= 2.0.0 -Requires: oxygen-icon-theme +BuildRequires: libsoprano-devel +BuildRequires: libusb-1_0-devel +BuildRequires: shared-desktop-ontologies-devel +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif +Requires: kipi-plugins >= %{version} Recommends: %{name}-lang = %{version} -Recommends: %{name}-doc = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %kde4_pimlibs_requires @@ -68,50 +66,44 @@ that enables you to connect to your camera and preview, download, or delete your images, is provided. -%package devel -License: GPLv2+ -Summary: Development Headers for Digikam -Group: Development/Libraries/KDE -Requires: %{name} = %{version} -Requires: kipi-plugins >= 1.9.0 - -%description devel -digiKam is a simple digital photo management application for KDE. This -package contains its build environment. - -%package doc -License: LGPLv2.1+ -Group: System/GUI/KDE -Summary: Documentation for Digikam - -%description doc -This package contains the documentation for Digikam - %lang_package %prep -%setup -q -n %{name}-%{version} +%setup -q rm po/*/kipi* +%patch0 %patch1 %patch2 +# 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 + %build - %cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE - %make_jobs +%cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE +%make_jobs %install - cd build -%makeinstall - cd .. - %suse_update_desktop_file digikam Graphics Photography - %suse_update_desktop_file showfoto Graphics Photography +cd build +%kde4_makeinstall +cd .. -rm -rf %{buildroot}%{_datadir}/locale/x-test 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 + +%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 +%endif + %find_lang %{name} --all-name - %kde_post_install +%fdupes -s %{buildroot} + +%kde_post_install %post -p /sbin/ldconfig @@ -119,57 +111,49 @@ %clean rm -rf %{buildroot} -rm -rf filelists -%files devel -%defattr(-,root,root) -%{_libdir}/libdigikamcore.so -%{_libdir}/libdigikamdatabase.so +%files +%defattr(-,root,root,-) +%doc core/AUTHORS core/COPYING core/COPYING.DOC core/COPYING.LIB +%doc core/ChangeLog core/NEWS core/README core/TODO +%doc core/TODO.FACE core/TODO.MYSQLPORT +%{_kde4_bindir}/cleanup_digikamdb +%{_kde4_bindir}/digikam +%{_kde4_bindir}/digitaglinktree +%{_kde4_bindir}/showfoto +%{_kde4_modulesdir}/digikam*.so +%{_kde4_modulesdir}/kio_digikamalbums.so +%{_kde4_modulesdir}/kio_digikamdates.so +%{_kde4_modulesdir}/kio_digikammapimages.so +%{_kde4_modulesdir}/kio_digikamsearch.so +%{_kde4_modulesdir}/kio_digikamtags.so +%{_kde4_libdir}/libdigikamcore.so.* +%{_kde4_libdir}/libdigikamdatabase.so.* +%{_kde4_applicationsdir}/digikam.desktop +%{_kde4_applicationsdir}/showfoto.desktop +%{_kde4_iconsdir}/hicolor/*/apps/digikam.* +%{_kde4_iconsdir}/hicolor/*/apps/showfoto.* +%{_kde4_appsdir}/digikam/ +%{_kde4_appsdir}/showfoto/ +%dir %{_kde4_appsdir}/solid +%dir %{_kde4_appsdir}/solid/actions +%{_kde4_appsdir}/solid/actions/digikam-opencamera.desktop +%{_kde4_servicesdir}/digikamalbums.protocol +%{_kde4_servicesdir}/digikamdates.protocol +%{_kde4_servicesdir}/digikamimageplugin_*.desktop +%{_kde4_servicesdir}/digikammapimages.protocol +%{_kde4_servicesdir}/digikamnepomukservice.desktop +%{_kde4_servicesdir}/digikamsearch.protocol +%{_kde4_servicesdir}/digikamtags.protocol +%{_kde4_servicetypesdir}/digikamimageplugin.desktop +%doc %{_kde4_htmldir}/en/digikam/ +%doc %{_kde4_htmldir}/en/showfoto/ +%doc %{_mandir}/man1/digitaglinktree.1%{ext_man} +%doc %{_mandir}/man1/cleanup_digikamdb.1%{ext_man} %files lang -f %{name}.lang %defattr(-,root,root,-) %exclude %{_kde4_htmldir}/en/digikam - -%files doc -%defattr(-,root,root) -%dir %{_kde4_htmldir}/en/digikam -%dir %{_kde4_htmldir}/en/showfoto -%doc %{_kde4_htmldir}/en/digikam/* -%doc %{_kde4_htmldir}/en/showfoto/* - -%files -%defattr(-,root,root) -%doc core/ChangeLog core/NEWS -%{_bindir}/digikam -%{_bindir}/digitaglinktree -%{_bindir}/showfoto -%{_bindir}/cleanup_digikamdb -%_kde4_modules/digikam*.so -%_kde4_modules/kio_digikamalbums.so -%_kde4_modules/kio_digikamdates.so -%_kde4_modules/kio_digikamsearch.so -%_kde4_modules/kio_digikamtags.so -%{_datadir}/applications/kde4/digikam.desktop -%{_datadir}/applications/kde4/showfoto.desktop -%{_datadir}/icons/hicolor/*/apps/digikam.* -%{_datadir}/icons/hicolor/*/apps/showfoto.* -%_kde_share_dir/apps/digikam -%_kde_share_dir/apps/showfoto -%_kde_share_dir/services/digikamalbums.protocol -%_kde_share_dir/services/digikamdates.protocol -%_kde_share_dir/services/digikam*.desktop -%_kde_share_dir/services/digikamsearch.protocol -%_kde_share_dir/services/digikamtags.protocol -%_kde_share_dir/servicetypes/digikamimageplugin.desktop -%{_mandir}/man1/digitaglinktree.1.gz -%{_mandir}/man1/cleanup_digikamdb.1.gz - -%dir %{_datadir}/kde4/apps/solid -%dir %{_datadir}/kde4/apps/solid/actions -%_kde_share_dir/apps/solid/actions/digikam-opencamera.desktop -%{_libdir}/libdigikamcore.so.* -%{_libdir}/libdigikamdatabase.so.* -%_kde4_modulesdir/kio_digikammapimages.so -%_kde4_servicesdir/digikammapimages.protocol +%exclude %{_kde4_htmldir}/en/showfoto %changelog ++++++ add_mimetype_bnc629393.diff ++++++ --- core/digikam/main/digikam.desktop.orig 2011-07-28 02:28:24.000000000 +0300 +++ core/digikam/main/digikam.desktop 2011-08-08 21:01:49.542000054 +0300 @@ -148,3 +148,4 @@ Comment[zh_CN]=专业照片管理 彰显开源力量 Comment[zh_TW]=運用開放原始碼的力量像專業人士般管理您的照片 Terminal=false +MimeType=x-content/image-dcf;x-content/image-picturecd; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
