Author: arekm Date: Tue Feb 28 21:27:11 2012 GMT Module: packages Tag: DEVEL ---- Log message: - rel 2; depend on libjpeg-turbo >= 1.2.0 instead of disabling some features (that are not supported by non-turbo libjpeg)
---- Files affected: packages/chromium-browser: chromium-browser.spec (1.177.2.2 -> 1.177.2.3) ---- Diffs: ================================================================ Index: packages/chromium-browser/chromium-browser.spec diff -u packages/chromium-browser/chromium-browser.spec:1.177.2.2 packages/chromium-browser/chromium-browser.spec:1.177.2.3 --- packages/chromium-browser/chromium-browser.spec:1.177.2.2 Thu Feb 23 21:23:55 2012 +++ packages/chromium-browser/chromium-browser.spec Tue Feb 28 22:27:06 2012 @@ -21,6 +21,7 @@ %bcond_without system_vpx # with system vpx %bcond_without system_yasm # with system yasm %bcond_without system_zlib # with system zlib +%bcond_without libjpegturbo # use libjpeg-turbo features %bcond_with verbose # verbose build (V=1) # TODO @@ -51,7 +52,7 @@ Summary: A WebKit powered web browser Name: chromium-browser Version: 18.0.1025.39 -Release: 1 +Release: 2 License: BSD, LGPL v2+ (ffmpeg) Group: X11/Applications/Networking Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{version}.tar.xz @@ -75,7 +76,6 @@ Patch10: %{name}-pulse.patch # https://bugs.gentoo.org/show_bug.cgi?id=393471 # libjpeg-turbo >= 1.1.90 supports that feature -# but there is no autodetection currently, so revert for now Patch11: chromium-revert-jpeg-swizzle-r2.patch URL: http://www.chromium.org/Home %{?with_gconf:BuildRequires: GConf2-devel} @@ -99,6 +99,7 @@ %{?with_keyring:BuildRequires: libgnome-keyring-devel} BuildRequires: libicu-devel >= 4.6 BuildRequires: libjpeg-devel +%{?with_libjpegturbo:BuildRequires: libjpeg-turbo-devel >= 1.2.0} BuildRequires: libpng-devel %{?with_selinux:BuildRequires: libselinux-devel} BuildRequires: libstdc++-devel @@ -138,6 +139,7 @@ Requires: hicolor-icon-theme %{?with_system_vpx:Requires: libvpx >= 0.9.5-2} Requires: xdg-utils >= 1.0.2-4 +%{?with_libjpegturbo:Requires: libjpeg-turbo >= 1.2.0} Provides: wwwbrowser Obsoletes: chromium-browser-bookmark_manager < 5.0.388.0 Obsoletes: chromium-browser-inspector < 15.0.863.0 @@ -215,7 +217,7 @@ cd src %patch9 -p1 %patch10 -p1 -%patch11 -p0 +%{!?with_libjpegturbo:%patch11 -p0} cd .. cd src @@ -391,6 +393,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.177.2.3 2012/02/28 21:27:06 arekm +- rel 2; depend on libjpeg-turbo >= 1.2.0 instead of disabling some features (that are not supported by non-turbo libjpeg) + Revision 1.177.2.2 2012/02/23 20:23:55 arekm - up to 18.0.1025.39 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.177.2.2&r2=1.177.2.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
