rpms/xorg-x11/devel xorg-x11.spec,1.240,1.241
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sun Nov 6 23:48:57 UTC 2005
Author: mharris
Update of /cvs/dist/rpms/xorg-x11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30072
Modified Files:
xorg-x11.spec
Log Message:
* Sun Nov 6 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-60
- Remove "Provides: XFree86-font-utils" from font-utils subpackage. Any
packages which used XFree86-font-utils or xorg-x11-font-utils as a
dependency should now start using "mkfontdir", "mkfontscale" virtual
dependencies et al. to remain compatibile across implementations and
with different packaging.
- Added "Provides: bdftopcf" virtual provide to font-utils subpackage.
- Removed conditional building of X supplied fontconfig, as external fontconfig
should always be used. Removd with_fontconfig macro also.
Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- xorg-x11.spec 5 Nov 2005 11:37:53 -0000 1.240
+++ xorg-x11.spec 6 Nov 2005 23:48:52 -0000 1.241
@@ -19,9 +19,9 @@
Name: xorg-x11
Version: 6.8.2
-Release: 59
-#Release: 1.FC3.59.0
-#Release: ?.FC4.59.0
+Release: 60
+#Release: 1.FC3.60.0
+#Release: ?.FC4.60.0
%define build_mharris_mode 0
@@ -178,8 +178,6 @@
%define with_rstart 0
%define with_xprint 0
-# Build fontconfig and package it instead of using external fontconfig
-%define with_fontconfig 0
# Eventually we want to build fonts in a separate subpackage, so this option
# toggles font building and subpackage inclusion
%define with_fonts %{build_fc2}
@@ -257,12 +255,6 @@
# -- Bill Nottingham <notting at redhat.com>
BuildRequires: redhat-rpm-config
-%if %{with_fontconfig}
-# FIXME: Apparently fontconfig requires ed or ex to build. We don't want to
-# build fontconfig however, so this can go away when we can get rid of
-# fontconfig weirdness
-BuildRequires: ed
-%endif
# Requires rpm 4.0.4 or higher to build or else modules will get stripped
BuildRequires: rpm >= 4.0.4
# xorg-x11-6.8.2 comes with freetype 2.1.9, which is the minimum version of
@@ -275,9 +267,7 @@
#Requires: glibc >= 2.3.2-66
#%endif
-%if ! %{with_fontconfig}
BuildRequires: fontconfig-devel >= 2.1
-%endif
Prereq: /bin/ln, %{_sbindir}/chkfontpath, %{_x11bindir}/mkfontdir
@@ -603,9 +593,7 @@
# bug #132121
Conflicts: %{name} < 6.8.0
%endif
-%if ! %{with_fontconfig}
Requires: fontconfig-devel >= 2.1
-%endif
Requires: pkgconfig
Obsoletes: XFree86-devel
# Virtual provides for libGL and libGLU
@@ -671,7 +659,6 @@
Requires: %{name}-devel = %{version}-%{release}
# libXp used to be in the 'libs' subpackage, but we moved it in 6.7.99.901
Conflicts: xorg-x11-libs <= 6.7.99.901
-Provides: libXp-devel = 6.2
%description deprecated-libs-devel
This package contains shared library runtimes which have been deprecated,
@@ -690,9 +677,8 @@
# in 6.7.99.903-3
Conflicts: xorg-x11-base-fonts <= 6.7.99.903-3
Obsoletes: XFree86-font-utils
-Provides: XFree86-font-utils = 4.4.0
Provides: font-utils
-Provides: mkfontdir mkfontscale ucs2any bdftruncate
+Provides: mkfontdir mkfontscale ucs2any bdftruncate bdftopcf
%description font-utils
Includes mkfontdir, and other font related utilities which are required when
@@ -1000,8 +986,8 @@
Group: User Interface/X
Conflicts: XFree86 < 4.2.0-50.11
Obsoletes: mkxauth
-Provides: mkxauth
Obsoletes: XFree86-xauth
+Provides: mkxauth
Provides: xauth
%description xauth
@@ -1432,13 +1418,7 @@
#define HasAgpGart YES
%endif
-/* FIXME: HasFontconfig is broken so we have to use UseFontconfig
- * Update: This appears to work now (4.3.0-11.2), so HasFontconfig is being used
- * experimentally in rawhide now. HasExpat can probably be removed if this works out.
- */
-%if ! %{with_fontconfig}
#define HasFontconfig YES
-%endif
/* Expat is only needed by fontconfig (4.3.0) */
#define HasExpat YES
@@ -1872,13 +1852,13 @@
%if ! %{with_handhelds}
rm -rf $RPM_BUILD_ROOT/%{_x11icondir}/handhelds
%endif
-%if ! %{with_fontconfig}
+#if ! {with_fontconfig}
rm -rf $RPM_BUILD_ROOT/etc/fonts $RPM_BUILD_ROOT/%{_x11includedir}/fontconfig
rm -f $RPM_BUILD_ROOT%{_x11bindir}/{fc-cache,fc-list,fontconfig-config}
rm -f $RPM_BUILD_ROOT%{_x11mandir}/man1/{fc-cache,fc-list}.1*
rm -f $RPM_BUILD_ROOT%{_x11mandir}/man3/fontconfig.3*
rm -f $RPM_BUILD_ROOT%{_x11libdir}/libfontconfig.*
-%endif
+#endif
%if ! %{with_rstart}
rm -rf $RPM_BUILD_ROOT/etc/X11/rstart
rm -rf $RPM_BUILD_ROOT%{_x11datadir}/X11/rstart
@@ -2925,10 +2905,6 @@
%{_x11includedir}/X11/extensions/*.h
%exclude %{_x11includedir}/X11/extensions/Print.h
%exclude %{_x11includedir}/X11/extensions/Printstr.h
-%if %{with_fontconfig}
-%dir %{_x11includedir}/fontconfig
-%{_x11includedir}/fontconfig/*
-%endif
%dir %{_x11includedir}/X11/fonts
%{_x11includedir}/X11/fonts/*.h
# FIXME: these are no longer present in 6.8.0, not sure why yet, so just
@@ -2940,9 +2916,6 @@
%{_x11bindir}/archexec
%endif
%{_x11bindir}/cxpm
-%if %{with_fontconfig}
-%{_x11bindir}/fontconfig-config
-%endif
%{_x11bindir}/gccmakedep
%{_x11bindir}/gccmakedep-%{_arch}
%{_x11bindir}/imake
@@ -3075,11 +3048,6 @@
%if %{with_libxrx}
%{_x11libdir}/libxrx.so
%endif
-%if %{with_fontconfig}
-%{_x11libdir}/libfontconfig.a
-%{_x11libdir}/libfontconfig.so
-%{_libdir}/pkgconfig/fontconfig.pc
-%endif
# %{_x11libdir}/pkgconfig dir is unnecessary, just use the /usr/lib/pkgconfig dir
#%dir %{_x11libdir}/pkgconfig
%{_libdir}/pkgconfig/xcomposite.pc
@@ -3101,10 +3069,6 @@
%{_x11mandir}/man1/sxpm.1*
%{_x11mandir}/man1/xmkmf.1*
%{_x11mandir}/man3/*
-%if %{with_fontconfig}
-%{_x11mandir}/man3/fontconfig.3*
-%endif
-
%files font-utils
%defattr(-,root,root)
@@ -3114,12 +3078,6 @@
%{_x11mandir}/man1/bdftruncate.1*
#%{_x11bindir}/fonttosfnt
#%{_x11mandir}/man1/fonttosfnt.1*
-%if %{with_fontconfig}
-%{_x11bindir}/fc-cache
-%{_x11bindir}/fc-list
-%{_x11mandir}/man1/fc-cache.1*
-%{_x11mandir}/man1/fc-list.1*
-%endif
%{_x11bindir}/mkfontdir
%{_x11mandir}/man1/mkfontdir.1*
%{_x11bindir}/mkfontscale
@@ -3442,9 +3400,6 @@
%{_x11libdir}/libxkbfile.so.1.0
%{_x11libdir}/libxkbui.so.1
%{_x11libdir}/libxkbui.so.1.0
-%if %{with_fontconfig}
-%{_x11libdir}/libfontconfig.so.*
-%endif
%if %{with_libxrx}
# FIXME: need to do test build to get .so version
%{_x11libdir}/libxrx.so.
@@ -3671,6 +3626,16 @@
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Nov 6 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-60
+- Remove "Provides: XFree86-font-utils" from font-utils subpackage. Any
+ packages which used XFree86-font-utils or xorg-x11-font-utils as a
+ dependency should now start using "mkfontdir", "mkfontscale" virtual
+ dependencies et al. to remain compatibile across implementations and
+ with different packaging.
+- Added "Provides: bdftopcf" virtual provide to font-utils subpackage.
+- Removed conditional building of X supplied fontconfig, as external fontconfig
+ should always be used. Removd with_fontconfig macro also.
+
* Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-59
- Added "Provides: Xserver" virtual provide on xorg-x11 subpackage which
other packages can use as a dependency if they require a generic X server.
More information about the fedora-cvs-commits
mailing list