OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=14

accept-old-libexiv2.diff

@@ -1,11 +0,0 @@
---- digikam/configure.in.in	2007/01/03 19:01:44	1.1
-+++ digikam/configure.in.in	2007/01/03 19:02:04
-@@ -216,7 +216,7 @@
- 
- have_exiv2='no'
- if test "$PKGCONFIGFOUND" = "yes" ; then
-- KDE_PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.12, have_exiv2=yes,have_exiv2=no)
-+ KDE_PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.11, have_exiv2=yes,have_exiv2=no)
- fi
- 
- if test "x$have_exiv2" != "xyes"; then

digikam.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 19 08:23:55 CEST 2007 - stbinner@suse.de
+
+- fix build in KDE:Backports for older distributions
+- add "Recommends: digikamimageplugins-superimpose"
+
 -------------------------------------------------------------------
 Mon Jun 18 14:54:32 CEST 2007 - stbinner@suse.de
 

digikam.spec

@@ -12,9 +12,9 @@
 
 Name:           digikam
 BuildRequires:  doxygen giflib-devel imlib2-devel kdelibs3-devel kdesdk3-translate
-BuildRequires:  libkexiv2-devel libkipi-devel sqlite-devel sqlite2-devel
+BuildRequires:  libkdcraw-devel libkexiv2-devel libkipi-devel sqlite-devel sqlite2-devel
 %if %suse_version > 1020
-BuildRequires:  fdupes libjasper-devel libkdcraw-devel
+BuildRequires:  fdupes libjasper-devel
 %else
 BuildRequires:  libjasper
 %endif
@@ -30,7 +30,7 @@ License:        GNU General Public License (GPL)
 Group:          Hardware/Other
 Summary:        A KDE Photo Manager
 Version:        0.9.2
-Release:        1
+Release:        2
 %define rversion %version-final
 URL:            http://www.digikam.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -43,7 +43,6 @@ Patch4:         digikam-gphoto-disk.patch
 Patch5:         digikam-load.diff
 Patch7:         digikam-print.diff
 Patch9:         renamepreview.patch
-Patch10:        accept-old-libexiv2.diff
 Requires:       imlib2-loaders
 %if %suse_version > 1020
 Requires:       %{name}-lang = %{version}
@@ -94,6 +93,9 @@ Authors:
 %package -n digikamimageplugins
 Group:          Productivity/Graphics/Bitmap Editors
 Summary:        Image Manipulation Plug-Ins
+%if %suse_version > 1000
+Recommends:     digikamimageplugins-superimpose
+%endif
 
 %description -n digikamimageplugins
 Various plug-ins for the image editor in Digikam:
@@ -149,9 +151,6 @@ rm -rf digikam/sqlite
 #%patch5 -p0
 %patch7
 %patch9
-%if %suse_version == 1020
-%patch10
-%endif
 . /etc/opt/kde3/common_options
 update_admin --no-unsermake
 
@@ -246,6 +245,9 @@ rm -rf $RPM_BUILD_ROOT
 /opt/kde3/share/apps/digikamimageplugins/superimpose
 
 %changelog
+* Tue Jun 19 2007 - stbinner@suse.de
+- fix build in KDE:Backports for older distributions
+- add "Recommends: digikamimageplugins-superimpose"
 * Mon Jun 18 2007 - stbinner@suse.de
 - update to version 0.9.2:
   * DigikamImagePlugins have been merged into digiKam tarballs.