From e24d2756e7ebce8f88d5e59e0a24579e19307431459d9d0198a68ddb41c9c563 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 4 Feb 2010 10:32:02 +0000 Subject: [PATCH] Accepting request 30777 from KDE:KDE4:Factory:Desktop Copy from KDE:KDE4:Factory:Desktop/digikam based on submit request 30777 from user llunak OBS-URL: https://build.opensuse.org/request/show/30777 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=41 --- buildfix.patch | 23 +++++++++++++++++++ digikam-docs.tar.bz2 | 3 +++ digikam.changes | 5 +++++ digikam.spec | 53 +++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 buildfix.patch create mode 100644 digikam-docs.tar.bz2 diff --git a/buildfix.patch b/buildfix.patch new file mode 100644 index 0000000..58b9a88 --- /dev/null +++ b/buildfix.patch @@ -0,0 +1,23 @@ +--- libs/imageproperties/worldmapwidget.cpp 2009/12/23 12:51:42 1065505 ++++ libs/imageproperties/worldmapwidget.cpp 2010/01/07 01:47:54 1070931 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + // KDE includes + +--- libs/imageproperties/markerclusterholder.h 2009/12/27 22:51:46 1066798 ++++ libs/imageproperties/markerclusterholder.h 2010/01/07 01:47:54 1070931 +@@ -27,6 +27,10 @@ + + #include + ++// Qt includes ++ ++#include ++ + // Marble includes + + #include diff --git a/digikam-docs.tar.bz2 b/digikam-docs.tar.bz2 new file mode 100644 index 0000000..cd15670 --- /dev/null +++ b/digikam-docs.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:184e7347d680658d81bbe7530565bb1b5ac3440abfd87380334b00eecc403fe1 +size 22282594 diff --git a/digikam.changes b/digikam.changes index 7b4e0e8..d6046b7 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 29 12:29:01 UTC 2010 - llunak@novell.com + +- split out -doc subpackage + ------------------------------------------------------------------- Fri Jan 8 11:46:23 CET 2010 - ro@suse.de diff --git a/digikam.spec b/digikam.spec index 23d4d36..5db3647 100644 --- a/digikam.spec +++ b/digikam.spec @@ -21,15 +21,17 @@ Name: digikam BuildRequires: graphviz-devel libgphoto2-devel libkdepimlibs4-devel libqimageblitz-devel sqlite-devel BuildRequires: libkdcraw-devel libkexiv2-devel libkipi-devel marble-devel -BuildRequires: libjasper-devel soprano-backend-redland +BuildRequires: lensfun-devel libjasper-devel liblqr-devel soprano-backend-redland Url: http://www.digikam.org/ License: GPLv2+ Group: Productivity/Graphics/Viewers Summary: A KDE Photo Manager Version: 1.0.0 -Release: 2 +Release: 3 %define tar_version 1.0.0 Source0: %name-%{tar_version}.tar.bz2 +Source1: %{name}-docs.tar.bz2 +Patch0: buildfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Recommends: libqt4-sql-sqlite kipi-plugins @@ -68,9 +70,31 @@ Authors: -------- Renchi Raju +%package doc +License: GPLv2+ +Group: Productivity/Graphics/Viewers +Summary: A KDE Photo Manager Build Environment +Requires: %name = %{version} + +%description doc +digiKam is a simple digital photo management application for KDE. This +package contains its build environment. + + +Authors: +-------- + Renchi Raju + + %lang_package %prep -%setup -q -n %name-%{tar_version} +%setup -q -n %name-%{tar_version} -a 1 +%patch0 -p0 +echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt +echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt +echo "add_subdirectory( doc-translations )" >> CMakeLists.txt +echo "add_subdirectory( doc/digikam )" >> CMakeLists.txt +echo "add_subdirectory( doc/showfoto )" >> CMakeLists.txt %build %cmake_kde4 -d build @@ -84,6 +108,13 @@ Authors: %suse_update_desktop_file -G "Photo Editor" showfoto Graphics Photography %find_lang %name %kde_post_install + %if %suse_version < 1120 + mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/et/common + mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/it/common + mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/uk/common + mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/sv/common + mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/pt_BR/common + %endif %post -p /sbin/ldconfig @@ -102,6 +133,22 @@ rm -rf filelists %files lang -f %name.lang %defattr(-,root,root) +%exclude /usr/share/doc/kde/HTML/*/digikam +%exclude /usr/share/doc/kde/HTML/*/showfoto + +%files doc +%defattr(-,root,root) +%dir /usr/share/doc/kde/HTML/*/digikam +%dir /usr/share/doc/kde/HTML/*/showfoto +%if %suse_version < 1120 +%dir /usr/share/doc/kde/HTML/*/common +%endif +%doc %lang(en) /usr/share/doc/kde/HTML/en/* +%doc %lang(et) /usr/share/doc/kde/HTML/et/* +%doc %lang(it) /usr/share/doc/kde/HTML/it/* +%doc %lang(pt_BR) /usr/share/doc/kde/HTML/pt_BR/* +%doc %lang(uk) /usr/share/doc/kde/HTML/uk/* +%doc %lang(sv) /usr/share/doc/kde/HTML/sv/* %files %defattr(-,root,root)