rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=128

Browse Source
This commit is contained in:
OBS User unknown 2009-06-09 15:53:07 +00:00 committed by Git OBS Bridge
parent c772718a78
commit 22f5c3faf2
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xorg-x11-server.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jun 9 15:55:52 CEST 2009 - sndirsch@suse.de
- diabled build of Xdmx since it conflict's with NOMAD's Xdmx
(bnc #511269)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 5 23:42:25 CEST 2009 - sndirsch@suse.de Fri Jun 5 23:42:25 CEST 2009 - sndirsch@suse.de

23
xorg-x11-server.spec
View File

@ -32,7 +32,7 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/ Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0 %define EXPERIMENTAL 0
Version: 7.4 Version: 7.4
Release: 40 Release: 41
License: GPL v2 or later; X11/MIT License: GPL v2 or later; X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
@ -133,7 +133,7 @@ This package contains the X.Org Server.
License: GPL v2 or later; X11/MIT License: GPL v2 or later; X11/MIT
Summary: Additional Xservers (Xdmx, Xephyr, Xnest, Xvfb) Summary: Additional Xservers (Xdmx, Xephyr, Xnest, Xvfb)
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
Provides: xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-server:/usr/bin/Xdmx Provides: xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-server:/usr/bin/Xvfb
Obsoletes: xorg-x11-Xnest xorg-x11-Xvfb Obsoletes: xorg-x11-Xnest xorg-x11-Xvfb
Requires: xorg-x11-fonts-core xorg-x11 Mesa Requires: xorg-x11-fonts-core xorg-x11 Mesa
AutoReqProv: on AutoReqProv: on
@ -302,7 +302,7 @@ autoreconf -fi
%else %else
--enable-xorg \ --enable-xorg \
%endif %endif
--enable-dmx \ --disable-dmx \
--enable-xnest \ --enable-xnest \
--enable-kdrive \ --enable-kdrive \
--enable-xephyr \ --enable-xephyr \
@ -513,20 +513,9 @@ exit 0
%ifnarch s390 s390x %ifnarch s390 s390x
/usr/bin/cvt /usr/bin/cvt
%endif %endif
/usr/bin/dmxaddinput
/usr/bin/dmxaddscreen
/usr/bin/dmxreconfig
/usr/bin/dmxresize
/usr/bin/dmxrminput
/usr/bin/dmxrmscreen
/usr/bin/dmxtodmx
/usr/bin/dmxwininfo
%ifnarch s390 s390x %ifnarch s390 s390x
/usr/bin/gtf /usr/bin/gtf
%endif %endif
/usr/bin/vdltodmx
/usr/bin/xdmx
/usr/bin/xdmxconfig
%ifnarch s390 s390x %ifnarch s390 s390x
/usr/%{_lib}/X11/* /usr/%{_lib}/X11/*
/usr/%{_lib}/xorg/modules/ /usr/%{_lib}/xorg/modules/
@ -534,7 +523,6 @@ exit 0
%endif %endif
/usr/%{_lib}/xorg/protocol.txt /usr/%{_lib}/xorg/protocol.txt
%{_mandir}/man1/* %{_mandir}/man1/*
%exclude %{_mandir}/man1/Xdmx.1*
%exclude %{_mandir}/man1/Xnest.1* %exclude %{_mandir}/man1/Xnest.1*
%exclude %{_mandir}/man1/Xvfb.1* %exclude %{_mandir}/man1/Xvfb.1*
%ifnarch s390 s390x %ifnarch s390 s390x
@ -551,11 +539,9 @@ exit 0
%files extra %files extra
%defattr(-,root,root) %defattr(-,root,root)
/usr/bin/Xdmx
/usr/bin/Xephyr /usr/bin/Xephyr
/usr/bin/Xnest /usr/bin/Xnest
/usr/bin/Xvfb /usr/bin/Xvfb
%{_mandir}/man1/Xdmx.1*
%{_mandir}/man1/Xnest.1* %{_mandir}/man1/Xnest.1*
%{_mandir}/man1/Xvfb.1* %{_mandir}/man1/Xvfb.1*
@ -576,6 +562,9 @@ exit 0
%endif %endif
%changelog %changelog
* Tue Jun 09 2009 sndirsch@suse.de
- diabled build of Xdmx since it conflict's with NOMAD's Xdmx
(bnc #511269)
* Fri Jun 05 2009 sndirsch@suse.de * Fri Jun 05 2009 sndirsch@suse.de
- driver-autoconfig.diff - driver-autoconfig.diff
* ati ==> fglrx --> radeonhd --> ati * ati ==> fglrx --> radeonhd --> ati