Author: freetz Date: Thu Mar 30 21:18:27 2006 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- 1.0.4, merged changes from HEAD
---- Files affected:
SPECS:
cairo.spec (1.51 -> 1.51.2.1)
---- Diffs:
================================================================
Index: SPECS/cairo.spec
diff -u SPECS/cairo.spec:1.51 SPECS/cairo.spec:1.51.2.1
--- SPECS/cairo.spec:1.51 Wed Mar 15 23:04:28 2006
+++ SPECS/cairo.spec Thu Mar 30 23:18:22 2006
@@ -2,7 +2,6 @@
#
# Conditional build:
%bcond_without apidocs # disable gtk-doc
-%bcond_with glitz # build with glitz backend
%bcond_with xcb # enable XCB backend (XCB not released yet)
%bcond_with tests # perform tests (can fail due to out of memory)
#
@@ -21,16 +20,16 @@
BuildRequires: automake >= 1.7
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel >= 1:2.1.10
-%{?with_glitz:BuildRequires: glitz-devel >= 0.4.4}
+BuildRequires: glitz-devel >= 0.4.4
%{?with_apidocs:BuildRequires: gtk-doc >= 1.3}
BuildRequires: libpng-devel
BuildRequires: libtool
BuildRequires: pkgconfig
%{?with_xcb:BuildRequires: xcb-devel}
-BuildRequires: xorg-lib-libXrender-devel >= 0.6
+BuildRequires: xrender-devel >= 0.6
BuildRequires: zlib-devel
Requires: freetype >= 1:2.1.10
-%{?with_glitz:Requires: glitz >= 0.4.4}
+Requires: glitz >= 0.4.4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -80,10 +79,10 @@
Requires: %{name} = %{version}-%{release}
Requires: fontconfig-devel
Requires: freetype-devel >= 1:2.1.10
-%{?with_glitz:Requires: glitz-devel >= 0.4.4}
+Requires: glitz-devel >= 0.4.4
Requires: libpng-devel
%{?with_xcb:Requires: xcb-devel}
-Requires: xorg-lib-libXrender-devel >= 0.6
+Requires: xrender-devel >= 0.6
%description devel
Development files for Cairo library.
@@ -116,7 +115,7 @@
%configure \
%{?with_apidocs:--enable-gtk-doc} \
%{?with_xcb:--enable-xcb} \
- %{?with_glitz:--enable-glitz} \
+ --enable-glitz \
--enable-ps \
--enable-pdf \
--with-html-dir=%{_gtkdocdir}
@@ -159,6 +158,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.51.2.1 2006/03/30 21:18:22 freetz
+- 1.0.4, merged changes from HEAD
+
Revision 1.51 2006/03/15 22:04:28 freetz
- 1.0.4, gcc4 fix already included
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/cairo.spec?r1=1.51&r2=1.51.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
