SPECS: gnustep-back.spec - updated to 0.11.0, flattened directory ...

qboosh qboosh at pld-linux.org
Fri Dec 29 02:04:52 CET 2006 

Author: qboosh                       Date: Fri Dec 29 01:04:52 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 0.11.0, flattened directory structure
- modular xorg deps, no dps by default
- no glitz in cairo by default

---- Files affected:
SPECS:
   gnustep-back.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/gnustep-back.spec
diff -u SPECS/gnustep-back.spec:1.29 SPECS/gnustep-back.spec:1.30
--- SPECS/gnustep-back.spec:1.29	Sun Jan 15 22:59:49 2006
+++ SPECS/gnustep-back.spec	Fri Dec 29 02:04:46 2006
@@ -3,32 +3,36 @@
 # - symlink Helvetica from ghostscript-fonts-std?
 #
 # Conditional build:
-%bcond_without	art	# don't build art backend
-%bcond_without	cairo	# don't build cairo backend
+%bcond_without	art	# art backend
+%bcond_with	dps	# xdps backend
+%bcond_without	cairo	# cairo backend
+%bcond_with	glitz	# glitz support in cairo backend (requires cairo built with glitz)
 #
 Summary:	The GNUstep backend bundle
 Summary(pl):	Pakiet backendowy GNUstep
 Name:		gnustep-back
-Version:	0.10.2
+Version:	0.11.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:	1597e5799a35023a8e5bca050861aa7c
+# Source0-md5:	fece87a22336e233b70e9ce999e1ea10
 URL:		http://www.gnustep.org/
-BuildRequires:	OpenGL-devel
-BuildRequires:	XFree86-devel
-BuildRequires:	XFree86-DPS-devel
+BuildRequires:	OpenGL-GLX-devel
+%{?with_dps:BuildRequires:	X11-DPS-devel}
 %{?with_cairo:BuildRequires:	cairo-devel >= 1.0}
 %{?with_art:BuildRequires:	freetype-devel >= 2.1.8}
+%{?with_glitz:BuildRequires:	glitz-devel}
 BuildRequires:	gnustep-gui-devel >= %{version}
 %{?with_art:BuildRequires:	libart_lgpl-devel}
 BuildRequires:	pkgconfig
-BuildRequires:	xft-devel
-Requires:	OpenGL
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXmu-devel
+BuildRequires:	xorg-lib-libXft-devel
 Requires:	gnustep-gui >= %{version}
 Obsoletes:	gnustep-back-devel
+%{!?with_dps:Obsoletes:	gnustep-back-xdps}
 Obsoletes:	gnustep-xgps
 Conflicts:	gnustep-core
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,15 +41,6 @@
 
 %define		_noautoreqdep	libGL.so.1 libGLU.so.1
 
-%define		libcombo	gnu-gnu-gnu
-%define		gsos		linux-gnu
-%ifarch %{ix86}
-%define		gscpu		ix86
-%else
-# also s/alpha.*/alpha/, but we use only "alpha" arch for now
-%define		gscpu		%(echo %{_target_cpu} | sed -e 's/amd64/x86_64/;s/ppc/powerpc/')
-%endif
-
 %description
 This is a backend for the GNUstep gui Library which allows you to use
 the GNUstep gui Library on an X Window System (other backends will
@@ -122,15 +117,17 @@
 install -d back-cairo
 cp -a `cat files.list` back-cairo
 %endif
+%if %{with dps}
 install -d back-xdps
 cp -a `cat files.list` back-xdps
+%endif
 ln -sf . back-xlib
 
 %build
 export GNUSTEP_MAKEFILES=%{_prefix}/System/Library/Makefiles
-export GNUSTEP_TARGET_DIR=%{gscpu}/linux-gnu
+export GNUSTEP_FLATTENED=yes
 
-for g in %{?with_art:art} %{?with_cairo:cairo} xdps xlib ; do
+for g in %{?with_art:art} %{?with_cairo:cairo} %{?with_dps:xdps} xlib ; do
 cd back-$g
 if [ "$g" = "xlib" ]; then
 	NAME="back"
@@ -141,6 +138,7 @@
 	CPPFLAGS="-I/usr/include/freetype2"
 fi
 %configure \
+	%{!?with_glitz:--disable-glitz} \
 	--enable-graphics=$g \
 	--with-name=$NAME
 
@@ -154,9 +152,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 export GNUSTEP_MAKEFILES=%{_prefix}/System/Library/Makefiles
-export GNUSTEP_TARGET_DIR=%{gscpu}/linux-gnu
+export GNUSTEP_FLATTENED=yes
 
-for g in %{?with_art:art} %{?with_cairo:cairo} xdps xlib ; do
+for g in %{?with_art:art} %{?with_cairo:cairo} %{?with_dps:xdps} xlib ; do
 if [ "$g" = "xlib" ]; then
 	NAME="back"
 else
@@ -188,36 +186,38 @@
 %{_prefix}/System/Library/Documentation/Developer/Back
 %{_prefix}/System/Library/Documentation/man/man1/gpbs.1*
 
-%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}
+%dir %{_prefix}/System/Library/Bundles/libgnustep-back-011.bundle
+%{_prefix}/System/Library/Bundles/libgnustep-back-011.bundle/Resources
+%attr(755,root,root) %{_prefix}/System/Library/Bundles/libgnustep-back-011.bundle/libgnustep-back-011
 
 # 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}/*
+%attr(755,root,root) %{_prefix}/System/Tools/*
 
 %if %{with art}
 %files art
 %defattr(644,root,root,755)
-%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}
+%dir %{_prefix}/System/Library/Bundles/libgnustep-back-art-011.bundle
+%{_prefix}/System/Library/Bundles/libgnustep-back-art-011.bundle/Resources
+%attr(755,root,root) %{_prefix}/System/Library/Bundles/libgnustep-back-art-011.bundle/libgnustep-back-art-011
 %endif
 
 %if %{with cairo}
 %files cairo
 %defattr(644,root,root,755)
-%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}
+%dir %{_prefix}/System/Library/Bundles/libgnustep-back-cairo-011.bundle
+%{_prefix}/System/Library/Bundles/libgnustep-back-cairo-011.bundle/Resources
+%attr(755,root,root) %{_prefix}/System/Library/Bundles/libgnustep-back-cairo-011.bundle/libgnustep-back-cairo-011
 %endif
 
+%if %{with dps}
 %files xdps
 %defattr(644,root,root,755)
-%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}
+%dir %{_prefix}/System/Library/Bundles/libgnustep-back-xdps-011.bundle
+%{_prefix}/System/Library/Bundles/libgnustep-back-xdps-011.bundle/Resources
+%attr(755,root,root) %{_prefix}/System/Library/Bundles/libgnustep-back-xdps-011.bundle/libgnustep-back-xdps-011
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -225,6 +225,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2006/12/29 01:04:46  qboosh
+- updated to 0.11.0, flattened directory structure
+- modular xorg deps, no dps by default
+- no glitz in cairo by default
+
 Revision 1.29  2006/01/15 21:59:49  qboosh
 - updated to 0.10.2
 
================================================================

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

More information about the pld-cvs-commit mailing list