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

Accepting request 155188 from KDE:Distro:Factory

Browse Source 
update to 3.0.0 final (this time with the correct source URL)

OBS-URL: https://build.opensuse.org/request/show/155188
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=106
This commit is contained in:
Stephan Kulow 2013-02-12 15:36:35 +00:00 committed by Git OBS Bridge
parent 66590f7566
commit 3a5c0116ae
6 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
digikam-3.0.0-rc.tar.bz2
View File

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

14
digikam-3.0.0-rc.no-kdcraw.version-check.patch → digikam-3.0.0.no-kdcraw.version-check.patch
View File

@ -1,6 +1,6 @@
diff -U3 -dHrN digikam-3.0.0-rc/core/CMakeLists.txt digikam-3.0.0-rc.no-kdcraw.version-check//core/CMakeLists.txt diff -U3 -dHrN digikam-3.0.0/core/CMakeLists.txt digikam-3.0.0.no-kdcraw.version-check/core/CMakeLists.txt
--- digikam-3.0.0-rc/core/CMakeLists.txt 2012-12-24 00:33:16.000000000 +0100 --- digikam-3.0.0/core/CMakeLists.txt 2013-02-07 00:51:27.000000000 +0100
+++ digikam-3.0.0-rc.no-kdcraw.version-check//core/CMakeLists.txt 2013-01-02 00:56:04.959176355 +0100 +++ digikam-3.0.0.no-kdcraw.version-check/core/CMakeLists.txt 2013-02-11 22:33:47.088164540 +0100
@@ -199,21 +199,23 @@ @@ -199,21 +199,23 @@
# check the libkdcraw version # check the libkdcraw version
@ -38,9 +38,9 @@ diff -U3 -dHrN digikam-3.0.0-rc/core/CMakeLists.txt digikam-3.0.0-rc.no-kdcraw.v
# LCMS version 1 and 2 library handling # LCMS version 1 and 2 library handling
# See B.K.O #294105 # See B.K.O #294105
diff -U3 -dHrN digikam-3.0.0-rc/extra/kipi-plugins/CMakeLists.txt digikam-3.0.0-rc.no-kdcraw.version-check//extra/kipi-plugins/CMakeLists.txt diff -U3 -dHrN digikam-3.0.0/extra/kipi-plugins/CMakeLists.txt digikam-3.0.0.no-kdcraw.version-check/extra/kipi-plugins/CMakeLists.txt
--- digikam-3.0.0-rc/extra/kipi-plugins/CMakeLists.txt 2012-12-24 00:32:43.000000000 +0100 --- digikam-3.0.0/extra/kipi-plugins/CMakeLists.txt 2013-02-07 00:52:03.000000000 +0100
+++ digikam-3.0.0-rc.no-kdcraw.version-check//extra/kipi-plugins/CMakeLists.txt 2013-01-02 00:46:24.088220092 +0100 +++ digikam-3.0.0.no-kdcraw.version-check/extra/kipi-plugins/CMakeLists.txt 2013-02-11 22:33:47.104155757 +0100
@@ -131,21 +131,23 @@ @@ -131,21 +131,23 @@
# Check the libkdcraw version # Check the libkdcraw version
@ -77,4 +77,4 @@ diff -U3 -dHrN digikam-3.0.0-rc/extra/kipi-plugins/CMakeLists.txt digikam-3.0.0-
+# ENDIF (KDCRAW_VERSION) +# ENDIF (KDCRAW_VERSION)
# Optional depencies detection required by some plugins # Optional depencies detection required by some plugins
MACRO_OPTIONAL_FIND_PACKAGE(EXPAT) # For DNGConverter: XMP SDK need Expat library to compile.

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

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

19
digikam.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Mon Feb 11 21:15:35 UTC 2013 - nico.kruber@gmail.com
- Update to 3.0.0 (final):
digikam:
- General: Remove internal LensFun library code and xml lens
database. Set only an optional and external
dependency to last 0.2.6 release.
- BatchQueueManager: Add new tool to crop image.
- 51 fixed bugs.
kipi-plugins:
- Panorama: New parser using GNU Flex and GNU Bison instead of
Boost::spirit
- Panorama: Manual cropping of the final result
- 10 fixed bugs.
- drop fix-broken-icon-reference.diff (fixed upstream)
- update digikam-3.0.0-rc.no-kdcraw.version-check.patch
(rename to digikam-3.0.0.no-kdcraw.version-check.patch)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 5 18:46:30 UTC 2013 - toddrme2178@gmail.com Sat Jan 5 18:46:30 UTC 2013 - toddrme2178@gmail.com

17
digikam.spec
View File

@ -17,13 +17,13 @@
Name: digikam Name: digikam
Version: 2.9.95 Version: 3.0.0
Release: 0 Release: 0
Summary: A KDE Photo Manager Summary: A KDE Photo Manager
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Graphics/Viewers Group: Productivity/Graphics/Viewers
Url: http://www.digikam.org/ Url: http://www.digikam.org/
Source0: ftp://ftp.kde.org/pub/kde/unstable/digikam/digikam-3.0.0-rc.tar.bz2 Source0: ftp://ftp.kde.org/pub/kde/stable/digikam/digikam-%{version}.tar.bz2
# PATCH-FIX-OPENSUSE digikam-buildtime.patch -- Remove build time references so build-compare can do its work # PATCH-FIX-OPENSUSE digikam-buildtime.patch -- Remove build time references so build-compare can do its work
Patch0: digikam-buildtime.patch Patch0: digikam-buildtime.patch
# PATCH-FIX-OPENSUSE desktop-files.diff -- Remove Icon= entry (the icon is missing) # PATCH-FIX-OPENSUSE desktop-files.diff -- Remove Icon= entry (the icon is missing)
@ -32,16 +32,16 @@ Patch1: desktop-files.diff
Patch2: non-executable-script.patch Patch2: non-executable-script.patch
# PATCH-FIX-OPENSUSE remove-gplv2-only.patch idoenmez@suse.de bnc#711963 -- Remove GPLv2 only files from the build system # PATCH-FIX-OPENSUSE remove-gplv2-only.patch idoenmez@suse.de bnc#711963 -- Remove GPLv2 only files from the build system
Patch3: remove-gplv2-only.patch Patch3: remove-gplv2-only.patch
# PATCH-FIX-OPENSUSE fix-broken-icon-reference.diff adrian@suse.de -- CHECK ON NEXT VERSION UPDATE: reference to missing icon
Patch4: fix-broken-icon-reference.diff
# PATCH-FIX-OPENSUSE digikam_no_build_vkontakte.diff tittiatcoke@gmail.com -- Don't build libvkontakte (use external one) # PATCH-FIX-OPENSUSE digikam_no_build_vkontakte.diff tittiatcoke@gmail.com -- Don't build libvkontakte (use external one)
Patch5: digikam_no_build_vkontakte.diff Patch5: digikam_no_build_vkontakte.diff
# PATCH-FIX-UPSTREAM digikam-3.0.0-rc.no-kdcraw.version-check.patch -- version check for libkdcraw currently broken # PATCH-FIX-UPSTREAM digikam-3.0.0.no-kdcraw.version-check.patch -- version check for libkdcraw currently broken
Patch6: digikam-3.0.0-rc.no-kdcraw.version-check.patch Patch6: digikam-3.0.0.no-kdcraw.version-check.patch
BuildRequires: ImageMagick BuildRequires: ImageMagick
BuildRequires: bison
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: flex
BuildRequires: gstreamer-0_10-plugins-qt-devel BuildRequires: gstreamer-0_10-plugins-qt-devel
BuildRequires: lensfun-devel BuildRequires: lensfun-devel
BuildRequires: libexpat-devel BuildRequires: libexpat-devel
@ -151,6 +151,8 @@ Summary: KDE Plug-Ins for Image Manipulation
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Graphics/Other Group: Productivity/Graphics/Other
Recommends: ImageMagick Recommends: ImageMagick
Recommends: bison
Recommends: flex
Recommends: enblend-enfuse Recommends: enblend-enfuse
Recommends: hugin Recommends: hugin
Recommends: kipi-plugins-lang = %{version} Recommends: kipi-plugins-lang = %{version}
@ -238,14 +240,13 @@ This package contains the development files for libmediawiki.
%lang_package -n libkgeomap %lang_package -n libkgeomap
%prep %prep
%setup -q -n digikam-3.0.0-rc %setup -q
%patch0 %patch0
pushd extra/kipi-plugins pushd extra/kipi-plugins
%patch1 %patch1
popd popd
%patch2 %patch2
%patch3 %patch3
%patch4
%patch5 %patch5
%patch6 -p1 %patch6 -p1

10
fix-broken-icon-reference.diff
View File

@ -1,10 +0,0 @@
--- extra/kipi-plugins/panorama/plugin/panoramagui.desktop.orig 2012-06-04 23:38:54.000000000 +0300
+++ extra/kipi-plugins/panorama/plugin/panoramagui.desktop 2012-06-07 22:02:57.473132455 +0300
@@ -77,7 +77,6 @@
Name[zh_CN]=Panorama
Name[zh_TW]=Panorama
StartupNotify=true
-Icon=layer-visible-on
Terminal=false
Type=Application
X-DBUS-ServiceName=