1
0
OBS User unknown 2007-05-23 10:28:42 +00:00 committed by Git OBS Bridge
parent a893765b43
commit a282078b8b
2 changed files with 36 additions and 11 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 22 18:22:44 CEST 2007 - sndirsch@suse.de
- disabled build of Xprt
- moved Xdmx, Xephyr, Xnest and Xvfb to new subpackage
xorg-x11-server-extra
-------------------------------------------------------------------
Wed May 2 22:39:31 CEST 2007 - sndirsch@suse.de

View File

@ -21,7 +21,7 @@ BuildRequires: libjpeg-devel
URL: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.2
Release: 79
Release: 88
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@ -31,8 +31,8 @@ Requires: pkgconfig xorg-x11-fonts-core
Requires: xorg-x11-driver-input xorg-x11-driver-video
%endif
%endif
Provides: xorg-x11-Xnest xorg-x11-Xprt xorg-x11-Xvfb xorg-x11-server-glx
Obsoletes: xorg-x11-Xnest xorg-x11-Xprt xorg-x11-Xvfb xorg-x11-server-glx
Provides: xorg-x11-server-glx
Obsoletes: xorg-x11-server-glx
Summary: X.Org Server
Source: xorg-server-%{dirsuffix}.tar.bz2
Source1: MesaLib-6.5.3.tar.bz2
@ -95,6 +95,19 @@ This package contains the X.Org Server.
%package extra
Summary: Additional Xservers (Xdmx, Xephyr, Xnest, Xvfb)
Group: System/X11/Servers/XF86_4
Provides: xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-server:/usr/bin/Xdmx
Obsoletes: xorg-x11-Xnest xorg-x11-Xvfb
Requires: xorg-x11-fonts-core
Autoreqprov: on
%description extra
This package contains additional Xservers (Xdmx, Xephyr, Xnest, Xvfb).
%ifnarch s390 s390x
%package sdk
Summary: X.Org Server SDK.
@ -239,6 +252,7 @@ autoreconf -fi
--disable-xsdl \
--enable-xprint \
--disable-kbd_mode \
--disable-xprint \
--with-log-dir="/var/log" \
--with-os-name="openSUSE" \
--with-os-vendor="SUSE LINUX" \
@ -289,8 +303,6 @@ rm -f $RPM_BUILD_ROOT/usr/share/aclocal/*.m4
mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
install -m 644 $RPM_SOURCE_DIR/modprobe.nvidia $RPM_BUILD_ROOT/etc/modprobe.d/nvidia
%endif
rm $RPM_BUILD_ROOT/etc/X11/Xsession.d/92xprint-xpserverlist
rmdir $RPM_BUILD_ROOT/etc/X11/Xsession.d
%if %vnc
%ifarch s390 s390x
rm $RPM_BUILD_ROOT/mfb.h
@ -441,14 +453,9 @@ exit 0
%endif
/usr/bin/X
%endif
/usr/bin/Xdmx
/usr/bin/Xephyr
/usr/bin/Xnest
%ifnarch s390 s390x
%verify(not mode) /usr/bin/Xorg
%endif
/usr/bin/Xprt
/usr/bin/Xvfb
%ifnarch s390 s390x
/usr/bin/cvt
%endif
@ -480,8 +487,8 @@ exit 0
/usr/bin/xorgconfig
/usr/include/X11/bitmaps/
/usr/include/X11/pixmaps/
%endif
/usr/%{_lib}/X11/*
%endif
/usr/%{_lib}/pkgconfig/*.pc
%ifnarch s390 s390x
/usr/%{_lib}/xorg/modules/
@ -497,6 +504,13 @@ exit 0
/var/X11R6/bin/X
%endif
/var/lib/xkb/compiled/README.compiled
%files extra
%defattr(-,root,root)
/usr/bin/Xdmx
/usr/bin/Xephyr
/usr/bin/Xnest
/usr/bin/Xvfb
%ifnarch s390 s390x
%files sdk
@ -513,6 +527,10 @@ exit 0
%endif
%changelog
* Tue May 22 2007 - sndirsch@suse.de
- disabled build of Xprt
- moved Xdmx, Xephyr, Xnest and Xvfb to new subpackage
xorg-x11-server-extra
* Wed May 02 2007 - sndirsch@suse.de
- commit-c09e68c:
* Paper over a crash at exit during GLX teardown