Author: qboosh Date: Sat Oct 22 13:21:56 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 0.10.1 - cairo is back (ready for 1.0, but using headers hack)
---- Files affected: SPECS: gnustep-back.spec (1.27 -> 1.28) ---- Diffs: ================================================================ Index: SPECS/gnustep-back.spec diff -u SPECS/gnustep-back.spec:1.27 SPECS/gnustep-back.spec:1.28 --- SPECS/gnustep-back.spec:1.27 Sun Aug 28 20:01:34 2005 +++ SPECS/gnustep-back.spec Sat Oct 22 15:21:49 2005 @@ -1,27 +1,26 @@ # $Revision$, $Date$ # TODO: # - symlink Helvetica from ghostscript-fonts-std? -# - reenable cairo as soon as versions >= 0.5 will be supported # # Conditional build: %bcond_without art # don't build art backend -%bcond_with cairo # don't build cairo backend +%bcond_without cairo # don't build cairo backend # Summary: The GNUstep backend bundle Summary(pl): Pakiet backendowy GNUstep Name: gnustep-back -Version: 0.10.0 -Release: 2 +Version: 0.10.1 +Release: 1 License: LGPL/GPL Vendor: The GNUstep Project Group: X11/Libraries Source0: ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz -# Source0-md5: 8031e2d93b4d3359e167be620d1925fb +# Source0-md5: 139052b97ca5111dbcc9dd6b83c8d66f URL: http://www.gnustep.org/ BuildRequires: OpenGL-devel BuildRequires: XFree86-devel BuildRequires: XFree86-DPS-devel -%{?with_cairo:BuildRequires: cairo-devel < 0.5.0} +%{?with_cairo:BuildRequires: cairo-devel >= 1.0} %{?with_art:BuildRequires: freetype-devel >= 2.1.8} BuildRequires: gnustep-gui-devel >= %{version} %{?with_art:BuildRequires: libart_lgpl-devel} @@ -82,7 +81,7 @@ Summary(pl): Graficzny backend GNUstep - cairo Group: X11/Libraries Requires: %{name} = %{version}-%{release} -Requires: cairo < 0.5.0 +Requires: cairo >= 1.0 %description cairo GNUstep graphics backend - cairo. @@ -107,6 +106,12 @@ %prep %setup -q +%if %{with cairo} +# hack cairo header - objc doesn't allow #defines in #include +sed -e 's,FT_FREETYPE_H,<freetype/freetype.h>,' /usr/include/cairo/cairo-ft.h > \ + Headers/cairo-ft.h +%endif + # prepare the trees (for art, cairo, xdps, xlib backends) echo * > files.list %if %{with art} @@ -127,16 +132,16 @@ for g in %{?with_art:art} %{?with_cairo:cairo} xdps xlib ; do cd back-$g if [ "$g" = "xlib" ]; then - INC='--with-include-flags=-I/usr/include/freetype2' NAME="back" else - INC= NAME="back-$g" fi +if [ "$g" = "cairo" ]; then + CPPFLAGS="-I/usr/include/freetype2" +fi %configure \ --enable-graphics=$g \ - --with-name=$NAME \ - $INC + --with-name=$NAME %{__make} \ messages=yes @@ -218,6 +223,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.28 2005/10/22 13:21:49 qboosh +- updated to 0.10.1 +- cairo is back (ready for 1.0, but using headers hack) + Revision 1.27 2005/08/28 18:01:34 arekm - disable cairo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnustep-back.spec?r1=1.27&r2=1.28&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
