1
0
OBS User unknown 2009-01-19 01:20:48 +00:00 committed by Git OBS Bridge
parent 8d73b6e969
commit 8c5ffec76b
3 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,5 @@
## Type: string(Xorg)
## Path: Desktop/Display manager
## Default: "Xorg"
#
DISPLAYMANAGER_XSERVER="Xorg"

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jan 16 16:32:02 CET 2009 - sndirsch@suse.de
- sysconfig.displaymanager.template
* reintroducing DISPLAYMANAGER_XSERVER sysconfig variable, since
it's still used by proprietary driver packages (bnc #466583)
-------------------------------------------------------------------
Sat Dec 20 02:53:00 CET 2008 - sndirsch@suse.de

View File

@ -29,10 +29,13 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.4
Release: 18
Release: 20
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
%ifnarch s390 s390x
PreReq: %fillup_prereq
%endif
Requires: pkgconfig xorg-x11-fonts-core xorg-x11 xkeyboard-config
%if %suse_version > 1010
%ifnarch s390 s390x
@ -43,6 +46,9 @@ Provides: xorg-x11-server-glx
Obsoletes: xorg-x11-server-glx
Summary: X.Org Server
Source: xorg-server-%{dirsuffix}.tar.bz2
%ifnarch s390 s390x
Source1: sysconfig.displaymanager.template
%endif
Source3: README.updates
Source4: xorgcfg.tar.bz2
%if %suse_version > 1010
@ -354,6 +360,11 @@ install -m 644 hw/xfree86/parser/{xf86Parser.h,xf86Optrec.h} \
install -m 644 hw/xfree86/parser/libxf86config.a \
$RPM_BUILD_ROOT//usr/%{_lib}
%endif
%ifnarch s390 s390x
mkdir -p %buildroot/var/adm/fillup-templates
install -m 644 %_sourcedir/sysconfig.displaymanager.template \
%buildroot/var/adm/fillup-templates/sysconfig.displaymanager-%name
%endif
%clean
rm -rf "$RPM_BUILD_ROOT"
@ -369,6 +380,7 @@ exit 0
%post
%ifnarch s390 s390x
%{fillup_only -an displaymanager}
%run_permissions
rm -f var/log/XFree86.*.log*
# SaX2 writes xorg.conf since SuSE 9.3
@ -520,6 +532,9 @@ exit 0
/var/X11R6/bin/X
%endif
/var/lib/xkb/compiled/README.compiled
%ifnarch s390 s390x
/var/adm/fillup-templates/sysconfig.displaymanager-%name
%endif
%files extra
%defattr(-,root,root)
@ -548,6 +563,10 @@ exit 0
%endif
%changelog
* Fri Jan 16 2009 sndirsch@suse.de
- sysconfig.displaymanager.template
* reintroducing DISPLAYMANAGER_XSERVER sysconfig variable, since
it's still used by proprietary driver packages (bnc #466583)
* Sat Dec 20 2008 sndirsch@suse.de
- xorg-server-xf4vnc-clientTimeout.diff
* fixes vnc client timeout handling (bnc #441935)