[digikam] use safer check for libjpeg version, using cmake_try_compile (kde#265431)
Rex Dieter
rdieter at fedoraproject.org
Thu Mar 3 19:09:21 UTC 2011
commit dd30ee228e934f338509aeaae8dc23f9b9867541
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Mar 3 13:11:00 2011 -0600
use safer check for libjpeg version, using cmake_try_compile (kde#265431)
digikam.spec | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/digikam.spec b/digikam.spec
index edbc969..faebf67 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,7 +1,7 @@
Name: digikam
Version: 1.8.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A digital camera accessing & photo management application
Group: Applications/Multimedia
@@ -17,9 +17,10 @@ Source1: digikam-import.desktop
## upstreamable patches
Patch50: digikam-1.4.0_marble_plugin_rpath.patch
# fix for libjpeg-turbo, see https://bugs.kde.org/show_bug.cgi?id=265431
+# hardcode libjpeg-62
Patch51: digikam-1.8.0-libjpeg_version.patch
-# a more minimal, upstreamable version
-Patch52: digikam-1.8.0-libjpeg_version-3.patch
+# use try-compile test
+Patch52: digikam-1.8.0-libjpeg_version-2.patch
# gcc-4.6-ism , error: control reaches end of non-void function [-Werror=return-type]
Patch53: digikam-1.8.0-gcc46.patch
@@ -174,6 +175,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Mar 03 2011 Rex Dieter <rdieter at fedoraproject.org> 1.8.0-3
+- use safer check for libjpeg version, using cmake_try_compile (kde#265431)
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list