SPECS: gnustep-back.spec - updated to 0.10.0, removed obsolete des...

[qboosh]

Author: qboosh                       Date: Wed Jul 27 19:21:56 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 0.10.0, removed obsolete destdir patch
- cairo backend not ready for cairo 0.5.x, added bcond to disable

---- Files affected:
SPECS:
   gnustep-back.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/gnustep-back.spec
diff -u SPECS/gnustep-back.spec:1.24 SPECS/gnustep-back.spec:1.25
--- SPECS/gnustep-back.spec:1.24	Sun Apr 24 23:12:28 2005
+++ SPECS/gnustep-back.spec	Wed Jul 27 21:21:51 2005
@@ -1,26 +1,26 @@
 # $Revision$, $Date$
-# NOTE: when built on ft < 2.1.8, needs ft < 2.1.8 (and vice versa)
+# TODO: symlink Helvetica from ghostscript-fonts-std?
 #
 # Conditional build:
 %bcond_without art	# don't build art backend
+%bcond_without cairo	# don't build cairo backend
 #
 Summary:	The GNUstep backend bundle
 Summary(pl):	Pakiet backendowy GNUstep
 Name:		gnustep-back
-Version:	0.9.5
+Version:	0.10.0
 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:	65793b1026b2a06198b8438718309deb
-Patch0:		%{name}-destdir.patch
+# Source0-md5:	8031e2d93b4d3359e167be620d1925fb
 URL:		http://www.gnustep.org/
 BuildRequires:	OpenGL-devel
 BuildRequires:	XFree86-devel
 BuildRequires:	XFree86-DPS-devel
-BuildRequires:	cairo-devel
-%{?with_art:BuildRequires:	freetype-devel >= 2.1.4}
+%{?with_cairo:BuildRequires:	cairo-devel < 0.5.0}
+%{?with_art:BuildRequires:	freetype-devel >= 2.1.8}
 BuildRequires:	gnustep-gui-devel >= %{version}
 %{?with_art:BuildRequires:	libart_lgpl-devel}
 BuildRequires:	pkgconfig
@@ -66,7 +66,7 @@
 Summary(pl):	Graficzny backend GNUstep - art
 Group:		X11/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	freetype >= 2.1.4
+Requires:	freetype >= 2.1.8
 Conflicts:	gnustep-core
 
 %description art
@@ -80,6 +80,7 @@
 Summary(pl):	Graficzny backend GNUstep - cairo
 Group:		X11/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	cairo < 0.5.0
 
 %description cairo
 GNUstep graphics backend - cairo.
@@ -103,7 +104,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 # prepare the trees (for art, cairo, xdps, xlib backends)
 echo * > files.list
@@ -111,8 +111,10 @@
 install -d back-art 
 cp -a `cat files.list` back-art
 %endif
+%if %{with cairo}
 install -d back-cairo
 cp -a `cat files.list` back-cairo
+%endif
 install -d back-xdps
 cp -a `cat files.list` back-xdps
 ln -sf . back-xlib
@@ -120,7 +122,7 @@
 %build
 . %{_prefix}/System/Library/Makefiles/GNUstep.sh
 
-for g in %{?with_art:art} cairo xdps xlib ; do
+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'
@@ -145,7 +147,7 @@
 rm -rf $RPM_BUILD_ROOT
 . %{_prefix}/System/Library/Makefiles/GNUstep.sh
 
-for g in %{?with_art:art} cairo xdps xlib ; do
+for g in %{?with_art:art} %{?with_cairo:cairo} xdps xlib ; do
 if [ "$g" = "xlib" ]; then
 	NAME="back"
 else
@@ -177,31 +179,36 @@
 %{_prefix}/System/Library/Documentation/Developer/Back
 %{_prefix}/System/Library/Documentation/man/man1/gpbs.1*
 
-%dir %{_prefix}/System/Library/Bundles/libgnustep-back.bundle
-%{_prefix}/System/Library/Bundles/libgnustep-back.bundle/Resources
-%attr(755,root,root) %{_prefix}/System/Library/Bundles/libgnustep-back.bundle/%{gscpu}
+%dir %{_prefix}/System/Library/Bundles/libgnustep-back-010.bundle
+%{_prefix}/System/Library/Bundles/libgnustep-back-010.bundle/Resources
+%attr(755,root,root) %{_prefix}/System/Library/Bundles/libgnustep-back-010.bundle/%{gscpu}
+
+# XXX: n0190{0,2,4,6}{3,4}.{pfb,afm,pfm} - symlink from ghostscript-fonts-std?
+%{_prefix}/System/Library/Fonts/Helvetica.nfont
 
 %attr(755,root,root) %{_prefix}/System/Tools/%{gscpu}/%{gsos}/%{libcombo}/*
 
 %if %{with art}
 %files art
 %defattr(644,root,root,755)
-%dir %{_prefix}/System/Library/Bundles/libgnustep-back-art.bundle
-%{_prefix}/System/Library/Bundles/libgnustep-back-art.bundle/Resources
-%attr(755,root,root) %{_prefix}/System/Library/Bundles/libgnustep-back-art.bundle/%{gscpu}
+%dir %{_prefix}/System/Library/Bundles/libgnustep-back-art-010.bundle
+%{_prefix}/System/Library/Bundles/libgnustep-back-art-010.bundle/Resources
+%attr(755,root,root) %{_prefix}/System/Library/Bundles/libgnustep-back-art-010.bundle/%{gscpu}
 %endif
 
+%if %{with cairo}
 %files cairo
 %defattr(644,root,root,755)
-%dir %{_prefix}/System/Library/Bundles/libgnustep-back-cairo.bundle
-%{_prefix}/System/Library/Bundles/libgnustep-back-cairo.bundle/Resources
-%attr(755,root,root) %{_prefix}/System/Library/Bundles/libgnustep-back-cairo.bundle/%{gscpu}
+%dir %{_prefix}/System/Library/Bundles/libgnustep-back-cairo-010.bundle
+%{_prefix}/System/Library/Bundles/libgnustep-back-cairo-010.bundle/Resources
+%attr(755,root,root) %{_prefix}/System/Library/Bundles/libgnustep-back-cairo-010.bundle/%{gscpu}
+%endif
 
 %files xdps
 %defattr(644,root,root,755)
-%dir %{_prefix}/System/Library/Bundles/libgnustep-back-xdps.bundle
-%{_prefix}/System/Library/Bundles/libgnustep-back-xdps.bundle/Resources
-%attr(755,root,root) %{_prefix}/System/Library/Bundles/libgnustep-back-xdps.bundle/%{gscpu}
+%dir %{_prefix}/System/Library/Bundles/libgnustep-back-xdps-010.bundle
+%{_prefix}/System/Library/Bundles/libgnustep-back-xdps-010.bundle/Resources
+%attr(755,root,root) %{_prefix}/System/Library/Bundles/libgnustep-back-xdps-010.bundle/%{gscpu}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -209,6 +216,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2005/07/27 19:21:51  qboosh
+- updated to 0.10.0, removed obsolete destdir patch
+- cairo backend not ready for cairo 0.5.x, added bcond to disable
+
 Revision 1.24  2005/04/24 21:12:28  qboosh
 - updated to 0.9.5, removed obsolete freetype patch, added destdir patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnustep-back.spec?r1=1.24&r2=1.25&f=u