[prev in list] [next in list] [prev in thread] [next in thread]
List: freedesktop-xorg
Subject: Re: Personal xorg-x11 6.8.99.14 rpm packages now available for
From: Sergio Monteiro Basto <sergio () sergiomb ! no-ip ! org>
Date: 2005-07-24 3:30:08
Message-ID: 42E30B40.1090206 () sergiomb ! no-ip ! org
[Download RAW message or body]
Hi Harris,
I send to you my diff that cleaning up xorg-x11.spec
Shortly, I try to clean up the old stuff from xfree86, etc...
After some hours, I'm not sure on this one but I'm to lazy to do the
diff again.
-%if %{with_fortify_source}
-export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -D_FORTIFY_SOURCE=2"
-%endif
hope that can be useful .
["xfreecleanups.diff" (text/x-patch)]
--- xorg-x11.spec 2005-07-13 20:01:53.000000000 +0100
+++ xorg-x11.spec 2005-07-24 02:57:43.000000000 +0100
@@ -334,7 +330,7 @@
%define zipext tar.bz2
%if %{cvs_build}
-Source: http://xorg.freedesktop.org/X11R6.8.2/%{name}-%{version}-%{cvs_date}.%{zipext}
+Source: http://xorg.freedesktop.org/snapshots/%{name}-%{version}.%{zipext}
%else
# Main source tarball for official releases created using the following:
# cvs -d :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg export -r XORG-6_8_1 xc
@@ -362,8 +358,8 @@
# X.org stable branch patch, created using:
# FIXME: These instructions need to be updated to X.org relevance.
# cvs rdiff -u -r xo-6_8_0 -r xo-6_8-branch xc > \
xorg-x11-6.8.0-xo-6_8-branch-$(/bin/date +"%Y-%m-%d").patch
-#Patch0: XFree86-4.3.0-xf-4_3-branch-2003-11-03.patch
+Patch0: xorg-x11-6.9-xdpyinfo_with_no_xprint_support.diff
Patch9: XFree86-4.3.0-makefile-fastbuild.patch
# Patches: 800-829 - xkb keyboard symbol files
@@ -456,7 +441,6 @@
# rel-blocker, not committed as of Apr 5, 2004)
# http://bugs.xfree86.org/show_bug.cgi?id=991
Patch9306: xorg-x11-6.7.0-fix-BuildXFree86ConfigTools.patch
-Patch9307: xorg-x11-6.7.0-xterm-make-optional.patch
Patch9309: xorg-x11-6.7.0-libxf86config-monitor-freq-fix.patch
Patch9310: xorg-x11-6.8.0-Imake-add-BuildFontDevelUtils-macro.patch
@@ -972,7 +925,7 @@
libGLU is a utility library used by a lot of OpenGL applications
######################################################################
%if %{with_xf86cfg}
-%package xf86cfg
+%package xorgcfg
Summary: X server configuration program
Group: User Interface/X
Obsoletes: XFree86-XF86Setup
@@ -984,7 +937,7 @@
Conflicts: XFree86-devel < 4.3.0-3.8
Obsoletes: XFree86-xf86cfg
-%description xf86cfg
+%description xorgcfg
X server configuration tool
%endif
######################################################################
@@ -1020,10 +973,7 @@
%prep
%setup -q -c
-########## PATCH ##################################################
-chmod 444 xc/config/cf/xfree86.cf
-# xc/config/cf/xfree86.cf.OBSOLETE-USE-xorg.cf-INSTEAD
-#%patch0 -p0 -b .xf-4_3-branch
+%patch0 -p0 -b .xdpyinfo_with_no_xprint_support
%if %{with_fastbuild}
%patch9 -p0 -b .makefile-fastbuild
@@ -1032,16 +982,6 @@
%patch1213 -p0 -b .radeon-ia64-preint10
%patch1214 -p0 -b .radeon-disable-VideoRAM-option
-# These two are disabled for CVS head builds, as we want to test the driver
-# as-is so hopefully any problems get reported and fixed
-#%patch1215 -p0 -b .ati-radeon-disable-dri
-#%patch1216 -p0 -b .ati-radeon-7000-disable-dri
-
-# FIXME: Chips & technologies - Disable these two for now, to see if the
-# problems are resolved that these two worked around.
-# mharris - Jul 15, 2004
-#%patch1300 -p0 -b .chips-default-to-noaccel-on-69000
-#%patch1301 -p0 -b .chips-default-to-swcursor-on-65550
%patch1676 -p0 -b .redhat-nv-disable-s2scopy-on-geforce-6x00
@@ -1081,9 +1018,6 @@
#%patch9208 -p0 -b .ia64-drm-locking
%patch9306 -p0 -b .fix-BuildXFree86ConfigTools
-# FIXME: No longer applies to 6.8.0 cvs development. Not important patch,
-# so no major urge to port it forward.
-#%patch9307 -p0 -b .xterm-make-optional
%patch9309 -p0 -b .libxf86config-monitor-freq-fix
%patch9310 -p0 -b .Imake-add-BuildFontDevelUtils-macro
%patch9312 -p0 -b .libXdmcp-build-with-PIC
@@ -1167,20 +1084,11 @@
%define vendorstring Unsupported Custom Build by %(whoami)
%endif
-# FIXME: Hack to remove -g from RPM_OPT_FLAGS until XFree86 can be built
-# with new rpm/gdb -debuginfo goodness
-export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-g/}
-%if %{with_fortify_source}
-export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -D_FORTIFY_SOURCE=2"
-%endif
-
# Copy our static architecture independant host.def into place
cp %{SOURCE1} xc/config/cf/
echo -e "\n\nGenerating architecture specifc host-%{_arch}.def file.\n\n"
cat > xc/config/cf/host-%{_arch}.def << EOF
-/* FIXME: Remove one of these 2 */
-#define XFree86CustomVersion "%vendorstring: %{version}-%{release}"
#define XorgCustomVersion "%vendorstring: %{version}-%{release}"
/* Experimental custom messages */
@@ -1190,7 +1098,6 @@
#define LinuxDistribution LinuxRedHat
#define BuildDebug %{debug_build}
-/* #define XFree86Devel %{debug_build} */
%if %{with_debuglibs}
#define DebuggableLibraries YES
@@ -1208,23 +1120,6 @@
*/
#define AsCmd CcCmd -c -x assembler -Wa,--noexecstack
-/* FIXME: Remove -fno-strength-reduce and GccAliasingArgs after confirming
- * upstream that they are not needed for anything on Linux
- */
-%if %{with_savetemps}
-#define DefaultGcc2i386Opt $RPM_OPT_FLAGS GccAliasingArgs -save-temps
-#define DefaultGcc2x86_64Opt $RPM_OPT_FLAGS GccAliasingArgs -save-temps
-#define DefaultGcc2AxpOpt $RPM_OPT_FLAGS GccAliasingArgs -save-temps \
-Wa,-m21164a
-#define DefaultGcc2PpcOpt $RPM_OPT_FLAGS GccAliasingArgs -save-temps
-#define DefaultGcc2Ppc64Opt $RPM_OPT_FLAGS GccAliasingArgs -save-temps
-%else
-#define DefaultGcc2i386Opt $RPM_OPT_FLAGS GccAliasingArgs -pipe
-#define DefaultGcc2x86_64Opt $RPM_OPT_FLAGS GccAliasingArgs -pipe
-#define DefaultGcc2AxpOpt $RPM_OPT_FLAGS GccAliasingArgs -pipe -Wa,-m21164a
-#define DefaultGcc2PpcOpt $RPM_OPT_FLAGS GccAliasingArgs -pipe
-#define DefaultGcc2Ppc64Opt $RPM_OPT_FLAGS GccAliasingArgs -pipe
-%endif
-
%if %{parallel_build}
#define ParallelMakeFlags -j%(getconf _NPROCESSORS_ONLN)
/* This one seems to not work properly on GLU gosh darned it, possibly a
@@ -1257,6 +1152,10 @@
#define BuildServer YES
#define XVirtualFramebufferServer YES
#define XnestServer YES
+%if %{with_DPS}
+/* by default BuildDPSLibraries is NO but we need it by ImageMagick */
+#define BuildDPSLibraries YES
+%endif
/* Make xtrans fail gracefully by default, for bug #129622 and others */
#define XtransFailSoft YES
@@ -1280,7 +1179,6 @@
* whatever reason. We disable this option for now, and handle things
* ourselves with a bit of scripting in the spec file.
*/
-#define LinkGLToUsrInclude NO
#define BuildGLwLibrary YES
#define ForceNormalLib YES
@@ -1375,14 +1273,6 @@
#define BuildXF86MiscExt YES
#define BuildHtmlManPages NO
-/* FIXME: This is commented out, in order to test XFree86's Imake DRI defaults
- * for each architecture. Once confirmed all DRI capable archs build, we can
- * remove this, for a cleaner environmentally friendly host.def
- * YES=1 in Imake.tmpl and NO=0 so we can just use with_DRI here
- */
-#define BuildXF86DRI %{with_DRI}
-#define BuildXF86DRM NO
-
/* Do not build config tools if we are not shipping them anyway */
%if ! %{with_xf86cfg}%{with_xf86config}
#define BuildXFree86ConfigTools NO
@@ -1407,17 +1297,6 @@
#define BuildXterm %{with_xterm}
-/* FIXME: We don't need this anymore? */
-#define UseXserverWrapper YES
-
-#define UseUtempter YES
-#define UseInternalMalloc NO
-#define UseMatroxHal NO
-
-/* FIXME: Other distros set these to yes. Should we do this soon too? */
-#define UseConfDirForXkb NO
-#define UseConfDirForAppDefaults NO
-
#undef DefaultUserPath
#define DefaultUserPath /usr/local/bin:/bin:/usr/bin
#undef DefaultSystemPath
@@ -1497,9 +1376,6 @@
# install the host-$arch.def config file
install -m 644 xc/config/cf/host-%{_arch}.def \
$RPM_BUILD_ROOT%{_x11datadir}/X11/config/
-# FIXME: These mkdirs might be removable now
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_includedir}
# Install pam related files
{
mkdir -p $RPM_BUILD_ROOT/etc/{pam.d,security/console.apps}
@@ -1538,15 +1414,9 @@
install -c -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/X11/fs/config
install -c -m 755 %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/xfs
-# FIXME: Can Imake do this? Fix up symlinks
-{
- ln -sf ../X11R6/include/X11 $RPM_BUILD_ROOT%{_includedir}/X11
-%if %{with_DPS}
- ln -sf ../X11R6/include/DPS $RPM_BUILD_ROOT%{_includedir}/DPS
-%endif
-}
-# Backward compatibility symlink
-ln -sf ../..%{_x11datadir}/X11/xkb $RPM_BUILD_ROOT/etc/X11
+# Finally I kill this bug, xorg-x11 put xkb on /etc/X11 so we shouln't make the \
symbolic link +# Just pack on %{_x11datadir}/X11/xkb with /etc/X11/xkb/*
+# ln -sf ../..%{_x11datadir}/X11/xkb $RPM_BUILD_ROOT/etc/X11
# Create ld.so.conf include file
mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
@@ -1565,9 +1435,7 @@
# Create various ghost files, needed by RPM when packaging
{
# Make ghost X server config files
- # FIXME: The XF86Config and XF86Config-4 files are for legacy compat with
- # XFree86, and may cease to function or be removed at any time.
- for configfile in xorg.conf XF86Config XF86Config-4 ; do
+ for configfile in xorg.conf ; do
touch $RPM_BUILD_ROOT/etc/X11/$configfile
done
%if %{with_fonts}
@@ -1580,16 +1448,6 @@
chmod 0644 $FONTDIR/$subdir/{encodings,fonts}.dir
done
%endif
-
- # Remove fonts which contain bad codepoints, as documented in bug #97591
- rm -f $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMCtesiphon.otf
- rm -f $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMKharput.otf
- rm -f $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMMalankara.otf
- rm -f $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMMidyat.otf
- rm -f $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMQenNeshrin.otf
- rm -f $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMTurAbdin.otf
- rm -f $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMUrhoyBold.otf
- rm -f $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMUrhoy.otf
}
# Make sure all manpage dirs exist
@@ -1769,12 +1627,16 @@
rm -f $RPM_BUILD_ROOT%{_x11mandir}/man1/xman.1*
%endif
%if ! %{with_xf86cfg}
- rm -f $RPM_BUILD_ROOT%{_x11bindir}/xf86cfg
- rm -f $RPM_BUILD_ROOT%{_x11mandir}/man1/xf86cfg.1*
+ rm -f $RPM_BUILD_ROOT%{_x11bindir}/xorgcfg
+ rm -f $RPM_BUILD_ROOT%{_x11mandir}/man1/xorgcfg.1*
+ rm -rf $RPM_BUILD_ROOT%{_x11includedir}/X11/pixmaps
+ rm -f $RPM_BUILD_ROOT%{_x11datadir}/X11/Cards
%endif
%if ! %{with_xf86config}
- rm -f $RPM_BUILD_ROOT%{_x11bindir}/xf86config
- rm -f $RPM_BUILD_ROOT%{_x11mandir}/man1/xf86config.1*
+ rm -f $RPM_BUILD_ROOT%{_x11bindir}/xorgconfig
+ rm -f $RPM_BUILD_ROOT%{_x11mandir}/man1/xorgconfig.1*
+ rm -rf $RPM_BUILD_ROOT%{_x11includedir}/X11/pixmaps
+ rm -f $RPM_BUILD_ROOT%{_x11datadir}/X11/Cards
%endif
%if ! %{with_xmh}
rm -f $RPM_BUILD_ROOT%{_x11bindir}/xmh
@@ -1790,15 +1652,13 @@
%endif
%if ! %{with_Xserver}
rm -f $RPM_BUILD_ROOT/etc/X11/xorg.conf*
- rm -f $RPM_BUILD_ROOT/etc/X11/XF86Config*
rm -r $RPM_BUILD_ROOT/etc/X11/xserver
- rm $RPM_BUILD_ROOT%{_x11datadir}/X11/xserver
+ rm $RPM_BUILD_ROOT/%{_x11datadir}/X11/xserver
# Added to remove X11/etc stuff on RHL 9 ppc/s390/s390x builds because we
# don't ship products on those platforms anyway.
rm -rf $RPM_BUILD_ROOT/%{_x11datadir}/X11/etc
rm $RPM_BUILD_ROOT%{_x11bindir}/startx
rm $RPM_BUILD_ROOT%{_x11bindir}/xinit
- rm $RPM_BUILD_ROOT%{_x11datadir}/X11/xinit
rm $RPM_BUILD_ROOT%{_x11mandir}/man1/startx.1*
rm $RPM_BUILD_ROOT%{_x11mandir}/man1/Xserver.1*
rm $RPM_BUILD_ROOT%{_x11mandir}/man1/xinit.1*
@@ -1889,22 +1749,6 @@
rm -f $RPM_BUILD_ROOT%{_x11mandir}/man1/xeyes.*
# rm -f $RPM_BUILD_ROOT%{_x11mandir}/man1/xmessage.*
}
- {
- # We ship bitstream vera in separate packaging. This should probably be
- # turned off with an Imake define in the future, perhaps something like
- # "#define BuildFontsBitsreamVera NO" in host.def, will have to investigate.
- # FIXME
- rm -f $RPM_BUILD_ROOT%{_x11fontdir}/TTF/Vera*.ttf
- # Remove various Syriac fonts which contain bad codepoints (bug #97951)
- rm -f $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMCtesiphon.otf
- rm -f $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMKharput.otf
- rm -f $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMMalankara.otf
- rm -f $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMMidyat.otf
- rm -f $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMQenNeshrin.otf
- rm -f $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMTurAbdin.otf
- rm -f $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMUrhoyBold.otf
- rm -f $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMUrhoy.otf
- }
# This shouldn't be installed on ppc, as via does not make hardware for ppc
# platforms.
@@ -1978,49 +1822,6 @@
%endif
%pre
-{
- pushd /etc/X11
-
- # Massage pre-existing config files to work properly with X.org X11
- # - Remove xie and pex5 modules from the config files, as they are long
- # since obsolete, and not provided since XFree86 4.2.0
- # - Remove Option "XkbRules" "xfree86" to help work around upgrade problems
- # such as https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=120858
- {
- for configfile in xorg.conf XF86Config XF86Config-4 ; do
- # FIXME: rewrite this all to use perl, if the XkbRules stuff below works out \
ok.
- if [ -r $configfile -a -w $configfile ]; then
- # Remove module load lines from the config file for obsolete modules
- perl -p -i -e 's/^.*Load.*"(pex5|xie|xtt).*\n$"//gi' $configfile
- # Change the keyboard configuration from the deprecated "keyboard"
- # driver, to the newer "kbd" driver.
- perl -p -i -e 's/Driver(.*)"keyboard"/Driver\1"kbd"/gi' $configfile
- # Remove any Options "XkbRules" lines that may be present
- perl -p -i -e 's/^.*Option.*"XkbRules".*"(xfree86|xorg)".*\n$//gi' \
$configfile
- fi
- done
- }
-
- # Migrate any pre-existing XFree86 4.x config file to xorg.conf if it
- # doesn't already exist, and rename any remaining XFree86 4.x congig files
- # to have .obsoleted file extensions, to help avoid end user confusion for
- # people unaware of the config file name change between server
- # implementations, and avoid bug reports. If this turns out to confuse
- # users, I can modify it to add comments to the top of the obsoleted files
- # to point users to xorg.conf <mharris@redhat.com>
- {
- for configfile in XF86Config-4 XF86Config ; do
- if [ -r $configfile ]; then
- if [ -r xorg.conf ]; then
- mv -f $configfile $configfile.obsoleted
- else
- mv -f $configfile xorg.conf
- fi
- fi
- done
- }
- popd
-
# Do this for upgrades or installs
XKB_DIR=%{_x11datadir}/X11/xkb/compiled
if [ ! -L $XKB_DIR -a -d $XKB_DIR ]; then
@@ -2028,7 +1829,6 @@
mv -f $XKB_DIR /var/lib/xkb/
ln -sf ../../../../../var/lib/xkb $XKB_DIR
fi
-} &> /dev/null || :
%post
{
@@ -2108,7 +1908,7 @@
# way of doing this. If not, it needs to be figured out and documented to
# avoid confusion.
use_unix=
- for config in /etc/X11/xorg.conf /etc/X11/XF86Config /etc/X11/XF86Config-4 ; do
+ for config in /etc/X11/xorg.conf ; do
if [ -f $config ] && grep -q "unix/:" $config &> /dev/null; then
use_unix=1
fi
@@ -2171,9 +1971,6 @@
/usr/sbin/chkfontpath -qa %{_x11fontdir}/100dpi:unscaled || :
/usr/sbin/chkfontpath -qa %{_x11fontdir}/misc:unscaled || :
/usr/sbin/chkfontpath -qa %{_x11fontdir}/Type1 || :
- # Remove the Speedo directory from xfs config as X.Org no longer provides
- # Speedo font support.
- /usr/sbin/chkfontpath -qr %{_x11fontdir}/Speedo || :
# Only run fc-cache in the Type1 dir, gzipped pcf's take forever
%__fccache %{_x11fontdir}/Type1 || :
} &> /dev/null || :
@@ -2440,10 +2237,6 @@
%dir /etc/X11/xserver
%config /etc/X11/xserver/*
%ghost %config(missingok,noreplace) %verify(not md5 size mtime) /etc/X11/xorg.conf
-# FIXME: The XF86Config* files are deprecated and not supported. Included here
-# only to ease the transition to xorg.conf for an OS release or so.
-%ghost %config(missingok,noreplace) %verify(not md5 size mtime) /etc/X11/XF86Config
-%ghost %config(missingok,noreplace) %verify(not md5 size mtime) \
/etc/X11/XF86Config-4 %endif
%dir /etc/X11/xsm
@@ -2456,8 +2249,8 @@
%if %{with_Xserver}
%ghost %{_x11datadir}/X11/xserver
%endif
-%dir %{_x11datadir}/X11/xkb
-%config %{_x11datadir}/X11/app-defaults/*
+%dir %{_x11datadir}/X11/app-defaults
+%config /etc/X11/app-defaults/*
%dir /var/lib/xkb
%config %attr(0644,root,root) /etc/pam.d/xserver
%config(missingok) /etc/security/console.apps/xserver
@@ -2538,7 +2331,7 @@
# supported X configuration tool in Red Hat Linux is system-config-display
# now, and we expect people to use it, and report bugs if there are any,
# and make requests for any missing features. <mharris@redhat.com>
-%{_x11bindir}/xf86config
+%{_x11bindir}/xorgconfig
%endif
%{_x11bindir}/xfindproxy
%{_x11bindir}/xfwp
@@ -2608,30 +2401,19 @@
%dir %{_x11moduledir}/drivers
%{_x11moduledir}/drivers/*
%dir %{_x11moduledir}/multimedia
-%{_x11moduledir}/multimedia/bt829_drv.so
-%{_x11moduledir}/multimedia/fi1236_drv.so
-%{_x11moduledir}/multimedia/msp3430_drv.so
-%{_x11moduledir}/multimedia/tda8425_drv.so
-%{_x11moduledir}/multimedia/tda9850_drv.so
-%{_x11moduledir}/multimedia/tda9885_drv.so
-%{_x11moduledir}/multimedia/theatre200_drv.so
-%{_x11moduledir}/multimedia/theatre_detect_drv.so
-%{_x11moduledir}/multimedia/theatre_drv.so
-%{_x11moduledir}/multimedia/uda1380_drv.so
+%{_x11moduledir}/multimedia/*
%endif
%if %{with_DRI}
%dir %{_x11moduledir}/dri
%{_x11moduledir}/dri/*_dri.so
%endif
-%dir %{_x11datadir}/X11/app-defaults
-# FIXME: this doesn't build right on RHL9 - s390/s390x/ppc64 but... who CARES
%if %{with_Xserver}
%dir %{_x11datadir}/X11/etc
%{_x11datadir}/X11/etc/*
%{_x11datadir}/X11/xinit
%endif
-%{_x11datadir}/X11/xkb/*
-/etc/X11/xkb
+%{_x11datadir}/X11/xkb
+/etc/X11/xkb/*
%dir %{_x11datadir}/X11/x11perfcomp
%{_x11datadir}/X11/x11perfcomp/*
%{_x11datadir}/X11/xsm
@@ -2705,7 +2487,7 @@
%{_x11mandir}/man1/xdpyinfo.1*
%{_x11mandir}/man1/xdriinfo.1*
%if %{with_xf86config}
-%{_x11mandir}/man1/xf86config.1*
+%{_x11mandir}/man1/xorgconfig.1*
%endif
%{_x11mandir}/man1/xfindproxy.1*
%{_x11mandir}/man1/xfwp.1*
@@ -2783,10 +2565,6 @@
# Changed GL include dir, on Mar 17, 2002 for 4.2.0-6.48 release
%dir %{_includedir}/GL
%{_includedir}/GL/*
-%{_includedir}/X11
-%if %{with_DPS}
-%{_includedir}/DPS
-%endif
%{_libdir}/libGL.so
%{_libdir}/libGLU.so
%dir %{_x11includedir}
@@ -2896,13 +2674,8 @@
%{_x11libdir}/libXt.a
%{_x11libdir}/libXtst.a
%{_x11libdir}/libXv.a
-# FIXME: Should this be on all arch, or only arches with Xserver?
%{_x11libdir}/libXvMC.a
-# FIXME: Should this really be installed on PPC? Shouldn't it be included
-# everywhere libXvMC.a is?
-%ifarch %{ix86} ia64 x86_64 ppc
%{_x11libdir}/libXvMCW.a
-%endif
%{_x11libdir}/libXxf86dga.a
%{_x11libdir}/libXxf86misc.a
%{_x11libdir}/libXxf86rush.a
@@ -2924,14 +2697,10 @@
%{_x11libdir}/libxkbfile.a
%{_x11libdir}/libxkbui.a
# Shared library symlinks
-%{_x11libdir}/libFS.so
%{_x11libdir}/libGL.so
%{_x11libdir}/libGLU.so
-%{_x11libdir}/libGLw.so
%ifarch %{ix86} ia64 x86_64
%{_x11libdir}/libI810XvMC.so
-%{_x11libdir}/libviaXvMC.so
-%{_x11libdir}/libviaXvMCPro.so
%endif
%{_x11libdir}/libICE.so
%{_x11libdir}/libOSMesa.so
@@ -2962,13 +2731,7 @@
%{_x11libdir}/libXt.so
%{_x11libdir}/libXtst.so
%{_x11libdir}/libXv.so
-# FIXME: Shouldn't this be included everywhwere the XvMCW.so lib is?
%{_x11libdir}/libXvMC.so
-# FIXME: Shouldn't this be included on every arch that Xserver is built for?
-# Or all arches?
-%ifarch %{ix86} ia64 x86_64 ppc
-%{_x11libdir}/libXvMCW.so
-%endif
%{_x11libdir}/libXxf86dga.so
%{_x11libdir}/libXxf86misc.so
%{_x11libdir}/libXxf86rush.so
@@ -3275,7 +3038,6 @@
%{_x11libdir}/libI810XvMC.so.1.0
%{_x11libdir}/libviaXvMC.so.1
%{_x11libdir}/libviaXvMC.so.1.0
-%{_x11libdir}/libviaXvMCPro.so.1
%{_x11libdir}/libviaXvMCPro.so.1.0
%endif
%{_x11libdir}/libICE.so.6
@@ -3340,10 +3102,8 @@
%{_x11libdir}/libXv.so.1.0
%{_x11libdir}/libXvMC.so.1
%{_x11libdir}/libXvMC.so.1.0
-%ifarch %{ix86} ia64 x86_64 ppc
%{_x11libdir}/libXvMCW.so.1
%{_x11libdir}/libXvMCW.so.1.0
-%endif
%{_x11libdir}/libXxf86dga.so.1
%{_x11libdir}/libXxf86dga.so.1.0
%{_x11libdir}/libXxf86misc.so.1
@@ -3584,8 +3344,8 @@
%if %{with_xf86cfg}
%files xf86cfg
%defattr(-,root,root)
-%{_x11bindir}/xf86cfg
-%{_x11mandir}/man1/xf86cfg.1*
+%{_x11bindir}/xorgcfg
+%{_x11mandir}/man1/xorgcfg.1*
# FIXME: This stuff should not be in any include directory, that is stupid
%dir %{_x11includedir}/X11/pixmaps
%{_x11includedir}/X11/pixmaps/*
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic