Hello community,
here is the log from the commit of package digikam for openSUSE:Factory
checked in at Thu Feb 4 11:32:00 CET 2010.
--------
--- KDE/digikam/digikam.changes 2010-01-08 11:46:50.000000000 +0100
+++ /mounts/work_src_done/STABLE/digikam/digikam.changes 2010-01-29 13:29:25.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Jan 29 12:29:01 UTC 2010 - llunak@novell.com
+
+- split out -doc subpackage
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
buildfix.patch
digikam-docs.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ digikam.spec ++++++
--- /var/tmp/diff_new_pack.p1k5aw/_old 2010-02-04 11:31:44.000000000 +0100
+++ /var/tmp/diff_new_pack.p1k5aw/_new 2010-02-04 11:31:44.000000000 +0100
@@ -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 @@
--------
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 @@
%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 @@
%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)
++++++ buildfix.patch ++++++
--- 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 <QVBoxLayout>
#include <QStyle>
#include <QLabel>
+#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 <memory>
+// Qt includes
+
+#include
+
// Marble includes
#include
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org