Author: glen Date: Fri Jun 8 06:23:21 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- libjpeg-turbo-devel conflicts with libjpeg-devel, so don't require both at
the same time
---- Files affected:
packages/chromium-browser:
chromium-browser.spec (1.205 -> 1.206)
---- Diffs:
================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.205
packages/chromium-browser/chromium-browser.spec:1.206
--- packages/chromium-browser/chromium-browser.spec:1.205 Thu Jun 7
22:54:31 2012
+++ packages/chromium-browser/chromium-browser.spec Fri Jun 8 08:23:16 2012
@@ -100,7 +100,7 @@
BuildRequires: libevent-devel
%{?with_keyring:BuildRequires: libgnome-keyring-devel}
BuildRequires: libicu-devel >= 4.6
-BuildRequires: libjpeg-devel
+%{!?with_libjpegturbo:BuildRequires: libjpeg-devel}
%{?with_libjpegturbo:BuildRequires: libjpeg-turbo-devel >= 1.2.0}
BuildRequires: libpng-devel
%{?with_selinux:BuildRequires: libselinux-devel}
@@ -405,6 +405,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.206 2012/06/08 06:23:16 glen
+- libjpeg-turbo-devel conflicts with libjpeg-devel, so don't require both at
the same time
+
Revision 1.205 2012/06/07 20:54:31 arekm
- up to 20.0.1132.27
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/chromium-browser/chromium-browser.spec?r1=1.205&r2=1.206
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
