pool/digikam
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 77440 from KDE:Distro:Factory

Browse Source 
Update to 2.0 release

OBS-URL: https://build.opensuse.org/request/show/77440
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=69
This commit is contained in:
Sascha Peilicke 2011-08-04 08:14:41 +00:00 committed by Git OBS Bridge
parent 7790add3ea
commit 3698ca92e5
11 changed files with 141 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
_service
View File

@ -1,13 +0,0 @@
<?xml version="1.0" ?>
<services>
<service name="download_url">
<param name="protocol">http</param>
<param name="host">downloads.sourceforge.net</param>
<param name="path">/project/digikam/digikam/1.9.0/digikam-1.9.0.tar.bz2</param>
</service>
<service name="verify_file">
<param name="file">_service:download_url:digikam-1.9.0.tar.bz2</param>
<param name="verifier">sha256</param>
<param name="checksum">e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5</param>
</service>
</services>

3
_service:download_url:digikam-1.9.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
size 22866660

7
add_mimetype_bnc629393.diff
View File

@ -1,7 +0,0 @@
--- digikam/digikam.desktop 2010-12-19 11:29:17.000000000 +0100
+++ digikam/digikam.desktop_patched 2010-12-30 12:59:47.000000000 +0100
@@ -140,3 +140,4 @@
Comment[zh_CN]=以开源的力量专业化地管理您的照片
Comment[zh_TW]=運用開放原始碼的力量像專業人士般管理您的照片
Terminal=false
+MimeType=x-content/image-dcf;x-content/image-picturecd;

11
correct_jpeg_lib_version.patch
View File

@ -1,11 +0,0 @@
--- CMakeLists.txt 2011-03-09 09:51:10.456001546 +0100
+++ CMakeLists.txt 2011-03-09 09:51:10.456001546 +0100
@@ -171,7 +171,7 @@
# Extract version of libjpeg so that we can use the appropriate dir
# See bug #227313, #228483
-FILE(READ "${JPEG_INCLUDE_DIR}/jpeglib.h" jpeglib_h_content)
+FILE(READ "${JPEG_INCLUDE_DIR}/jconfig.h" jpeglib_h_content)
STRING(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jpeglib_version "${jpeglib_h_content}")
MESSAGE(STATUS "Identified libjpeg version: ${jpeglib_version}")

3
digikam-2.0.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c7d19f0562a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234
size 53906557

6
digikam-buildtime.patch
View File

@ -1,7 +1,5 @@
Index: libs/3rdparty/cimg/CImg.h
===================================================================
--- libs/3rdparty/cimg/CImg.h.orig
+++ libs/3rdparty/cimg/CImg.h
--- core/libs/3rdparty/cimg/CImg.h.orig
+++ core/libs/3rdparty/cimg/CImg.h
@@ -5669,7 +5669,7 @@ namespace cimg_library {
if (usage) {
cimg_std::fprintf(cimg_stdout,"\n %s%s%s",cimg::t_red,cimg::basename(argv[0]),cimg::t_normal);

3
digikam-docs.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:184e7347d680658d81bbe7530565bb1b5ac3440abfd87380334b00eecc403fe1
size 22282594

14
digikam-external-libs.patch Normal file
View File

@ -0,0 +1,14 @@
--- CMakeLists.txt 2011-07-28 01:31:23.000000000 +0200
+++ CMakeLists.txt 2011-07-28 11:48:51.084119958 +0200
@@ -73,11 +73,6 @@
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)
-
-ADD_SUBDIRECTORY(extra)
ADD_SUBDIRECTORY(core)
ADD_SUBDIRECTORY(doc)

45
digikam-marblewidget.patch
View File

@ -1,45 +0,0 @@
--- /dev/null 2011-06-17 14:42:34.820939556 +0200
+++ cmake/modules/FindMarbleWidget.cmake 2011-06-20 13:50:03.012616343 +0200
@@ -0,0 +1,42 @@
+# - Try to find marblewidget library
+# Once done this will define
+#
+# MARBLEWIDGET_FOUND - system has MARBLEWIDGET library
+# LIBMARBLEWIDGET_INCLUDE_DIR - the LIBMARBLEWIDGET include directory
+# LIBMARBLEWIDGET_LIBRARY - the marblewidget library
+#
+# copyright 2008 by Patrick Spendrin <ps_ml@gmx.de>
+# use this file as you like
+#
+
+if(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY)
+
+# Already in cache
+set(MARBLEWIDGET_FOUND TRUE)
+
+else(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY)
+find_path(LIBMARBLEWIDGET_INCLUDE_DIR Quaternion.h PATH_SUFFIXES marble)
+
+if (WIN32 AND CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+set (LIBRARY_NAME marblewidgetd)
+else(WIN32 AND CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+set (LIBRARY_NAME marblewidget)
+endif (WIN32 AND CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+find_library(LIBMARBLEWIDGET_LIBRARY ${LIBRARY_NAME})
+
+if(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY)
+set(MARBLEWIDGET_FOUND TRUE)
+endif(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY)
+
+if(MARBLEWIDGET_FOUND)
+if (NOT MARBLEWIDGET_FIND_QUIETLY)
+message(STATUS "Found Marble: ${LIBMARBLEWIDGET_LIBRARY}")
+endif (NOT MARBLEWIDGET_FIND_QUIETLY)
+else(MARBLEWIDGET_FOUND)
+if(MARBLEWIDGET_FIND_REQUIRED)
+message(FATAL_ERROR "Could NOT find any Marble library")
+endif(MARBLEWIDGET_FIND_REQUIRED)
+endif(MARBLEWIDGET_FOUND)
+
+mark_as_advanced(LIBMARBLEWIDGET_INCLUDE_DIR LIBMARBLEWIDGET_LIBRARY)
+endif(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY)

20
digikam.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Thu Jul 28 10:21:17 UTC 2011 - idonmez@novell.com
- Update to final version 2.0.0
* XMP metadata sidecar support
* Reverse geo-coding support
* Face detection and recognition support
* Tag keyboard shortcuts support
* Color Labels support to improve photograph workfow
* Pick Labels support to improve photograph selection
* Color Theme engine is now ported to KDE color theme manager
* Re-designed Filters view on right sidebar to perform icon-view items filtering
* Add options to group/ungroup items from icon-view
* Add options to show file format over icon-view items
* Image versioning support
* Foveon sensor based camera support
* New advanced RAW decoding settings backported from RawTherapee project
* New datetime option "UnixTimeStamp" (requires Qt 4.7 or higher)
- See included NEWS file for complete changelog
-------------------------------------------------------------------
Mon Jun 20 11:58:14 UTC 2011 - idonmez@novell.com

231
digikam.spec
View File

@ -16,195 +16,160 @@
#
# if you want to use external libs as opposite to the ones provided inside check that they are compatible with the core
Name: digikam
Version: 1.9.0
Release: 2
Version: 2.0.0
Release: 1
License: GPLv2+
Summary: A KDE Photo Manager
License: GPLv2+ and LGPLv2.1+ and GFDL and X11 (BSD like) and BSD3c (or similar)
Url: http://www.digikam.org/
Group: Productivity/Graphics/Viewers
Source0: http://sourceforge.net/projects/digikam/files/digikam/1.9.0/%{name}-%{version}.tar.bz2
Source1: %{name}-docs.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-UPSTREAM add_mimetype_bnc629393.diff bnc#629393 kde#261627 ctrippe@gmx.net -- Add MimeTypes to desktop file for better integration in GNOME
Patch1: add_mimetype_bnc629393.diff
# PATCH-FIX-OPENSUSE digikam-marblewidget.patch idoenmez@suse.de -- Provide a FindMarbleWidget.cmake for compatibility
Patch2: digikam-marblewidget.patch
# With the latest version of libjpeg62 in Factory, the version is mentioned in a different file
%if %suse_version > 1140
Patch3: correct_jpeg_lib_version.patch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: http://sourceforge.net/projects/digikam/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
Patch1: digikam-buildtime.patch
Patch2: digikam-external-libs.patch
BuildRequires: doxygen
BuildRequires: glib2-devel
BuildRequires: graphviz
BuildRequires: graphviz-devel
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: liblqr-devel
BuildRequires: libsoprano-devel
BuildRequires: libqca2-devel
BuildRequires: libqimageblitz-devel
BuildRequires: libqjson-devel
BuildRequires: marble-devel
%if 0%{?suse_version} == 1120
BuildRequires: mysql
%endif
%if 0%{?suse_version} > 1120
BuildRequires: mysql-community-server
%endif
BuildRequires: shared-desktop-ontologies-devel
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
%kde4_runtime_requires
Recommends: kipi-plugins
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
Recommends: %{name}-lang = %{version}
Provides: kde4-digikam = %{version}
Obsoletes: kde4-digikam <= 0.10.0
Recommends: %{name}-doc = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
%kde4_pimlibs_requires
%description
digiKam is an easy to use and powerful digital photo management
application, which makes importing, organizing and manipulating
digital photos a "snap". An easy to use interface is provided
to connect to your digital camera, preview the images and download
and/or delete them.
The digiKam built-in image editor makes the common photo correction
a simple task. The image editor is extensible via plugins. All useful
image editor plugins are available in the base installation.
Authors:
--------
Gilles Caulier <caulier dot gilles at gmail dot com>
Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
Andi Clemens <andi dot clemens at gmx dot net>
Renchi Raju <renchi dot raju at gmail dot com> (Original author, retired)
digiKam is a simple digital photo management application for KDE, which
allows you to import and organize your digital photos easily. The
photos can be organized in albums, which can be sorted chronologically,
by directory layout, or by custom collections. An easy-to-use interface
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
License: GPLv2+ and LGPLv2.1+ and GFDL and X11 (BSD like) and BSD3c (or similar)
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
Authors:
--------
Gilles Caulier <caulier dot gilles at gmail dot com>
Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
Andi Clemens <andi dot clemens at gmx dot net>
Renchi Raju <renchi dot raju at gmail dot com> (Original author, retired)
%description doc
This package contains the documentation for Digikam
%lang_package
%prep
%setup -q -a 1
%patch0
%setup -q -n %{name}-%{version}
rm po/*/kipi*
%patch1
%patch2
%if %suse_version > 1140
%patch3 -p0
%endif
# Remove build time references so build-compare can do its work
FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%b %e %Y')
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" digikam/version.h.cmake
# Add digikam-docs.tar.bz2 directories
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
%cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE
%make_jobs
%install
cd build
%kde4_makeinstall
%makeinstall
cd ..
%suse_update_desktop_file digikam Graphics Photography
%suse_update_desktop_file showfoto Graphics Photography
%if 0%{?suse_version}
%suse_update_desktop_file %{name} Qt KDE Graphics Photography
%suse_update_desktop_file -G "Photo Editor" showfoto Qt KDE Graphics Photography
%endif
# Remove unneeded locales
%if 0%{?suse_version} < 1140
rm -rf %{buildroot}%{_datadir}/locale/hne/
%endif
rm -rf %{buildroot}%{_datadir}/locale/x-test
rm -rf %{buildroot}%{_kde4_htmldir}/en/kipi-plugins
%find_lang %{name} --all-name
%kde_post_install
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING COPYING.DOC COPYING.LIB ChangeLog NEWS README TODO TODO.MYSQLPORT
%{_kde4_bindir}/cleanup_digikamdb
%{_kde4_bindir}/digikam
%{_kde4_bindir}/digitaglinktree
%{_kde4_bindir}/showfoto
# new
%{_kde4_modules}/digikam*.so
# old
%{_kde4_modules}/kio_digikamalbums.so
%{_kde4_modules}/kio_digikamdates.so
%{_kde4_modules}/kio_digikamsearch.so
%{_kde4_modules}/kio_digikamtags.so
%{_kde4_libexecdir}/digikamdatabaseserver
%{_kde4_modules}/plugins/marble/ExternalDraw.so
%{_kde4_libdir}/libdigikamcore.so.*
%{_kde4_libdir}/libdigikamdatabase.so.*
%{_kde4_applicationsdir}/digikam.desktop
%{_kde4_applicationsdir}/showfoto.desktop
%doc %lang(en) %{_kde4_htmldir}/en/digikam/
%{_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}/digikamnepomukservice.desktop
%{_kde4_servicesdir}/digikamsearch.protocol
%{_kde4_servicesdir}/digikamtags.protocol
%{_kde4_servicetypesdir}/digikamimageplugin.desktop
%doc %{_mandir}/man1/digitaglinktree.1%{ext_man}
%doc %{_mandir}/man1/cleanup_digikamdb.1%{ext_man}
rm -rf filelists
%files devel
%defattr(-,root,root,-)
%{_includedir}/digikam/
%{_includedir}/digikam_export.h
%{_kde4_libdir}/libdigikamcore.so
%{_kde4_libdir}/libdigikamdatabase.so
%defattr(-,root,root)
%{_libdir}/libdigikamcore.so
%{_libdir}/libdigikamdatabase.so
%files lang -f %{name}.lang
%defattr(-,root,root,-)
%exclude %{_kde4_htmldir}/en/digikam/
%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
%changelog