From 6f8638888bcd489427d96973809d3cdb6a241348a99b3706e792e462a9d75f73 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 4 Jan 2007 11:04:23 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=2 --- accept-old-libexiv2.diff | 11 +++++++++++ digikam.changes | 5 +++++ digikam.spec | 10 ++++++++-- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 accept-old-libexiv2.diff diff --git a/accept-old-libexiv2.diff b/accept-old-libexiv2.diff new file mode 100644 index 0000000..64535c8 --- /dev/null +++ b/accept-old-libexiv2.diff @@ -0,0 +1,11 @@ +--- 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 diff --git a/digikam.changes b/digikam.changes index f0e4c37..d1bf271 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 4 10:30:56 CET 2007 - stbinner@suse.de + +- fix build on 10.2 in KDE:Backports + ------------------------------------------------------------------- Mon Dec 18 22:16:20 CET 2006 - stbinner@suse.de diff --git a/digikam.spec b/digikam.spec index 304ede5..bd295e4 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,7 +1,7 @@ # # spec file for package digikam (Version 0.9.0) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -24,7 +24,7 @@ License: GNU General Public License (GPL) Group: Hardware/Other Summary: A KDE Photo Manager Version: 0.9.0 -Release: 7 +Release: 13 %define rversion %version URL: http://www.digikam.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,6 +36,7 @@ Patch4: digikam-gphoto-disk.patch Patch5: digikam-load.diff Patch7: digikam-print.diff Patch9: renamepreview.patch +Patch10: accept-old-libexiv2.diff Requires: imlib2-loaders %description @@ -63,6 +64,9 @@ rm -rf digikam/sqlite #%patch5 -p0 %patch7 %patch9 +%if %suse_version == 1020 +%patch10 +%endif . /etc/opt/kde3/common_options update_admin --no-unsermake @@ -112,6 +116,8 @@ rm -rf $RPM_BUILD_ROOT %dir /opt/kde3/share/doc/HTML/en/digikam-%rversion-apidocs %changelog -n digikam +* Thu Jan 04 2007 - stbinner@suse.de +- fix build on 10.2 in KDE:Backports * Mon Dec 18 2006 - stbinner@suse.de - update to final 0.9 release * Sat Dec 09 2006 - dmueller@suse.de