2006-12-18 15:48:26 +01:00
|
|
|
#
|
2010-03-20 03:42:15 +01:00
|
|
|
# spec file for package xorg-x11-server (Version 7.5_1.7.99)
|
2006-12-18 15:48:26 +01:00
|
|
|
#
|
2010-01-18 14:04:02 +01:00
|
|
|
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
2006-12-18 15:48:26 +01:00
|
|
|
#
|
2008-08-06 01:59:36 +02:00
|
|
|
# All modifications and additions to the file contributed by third parties
|
|
|
|
# remain the property of their copyright owners, unless otherwise agreed
|
|
|
|
# upon. The license for this file, and modifications and additions to the
|
|
|
|
# file, is the same license as for the pristine package itself (unless the
|
|
|
|
# license for the pristine package is not an Open Source License, in which
|
|
|
|
# case the license is the MIT License). An "Open Source License" is a
|
|
|
|
# license that conforms to the Open Source Definition (Version 1.9)
|
|
|
|
# published by the Open Source Initiative.
|
|
|
|
|
2006-12-18 15:48:26 +01:00
|
|
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
|
|
|
#
|
|
|
|
|
|
|
|
# norootforbuild
|
|
|
|
|
2009-06-12 18:04:54 +02:00
|
|
|
%define moblin 0
|
2008-02-25 17:49:57 +01:00
|
|
|
|
2006-12-18 15:48:26 +01:00
|
|
|
Name: xorg-x11-server
|
2010-03-20 03:42:15 +01:00
|
|
|
%define dirsuffix 1.7.99
|
2007-10-03 01:21:25 +02:00
|
|
|
%define fglrx_driver_hack 0
|
2009-03-02 01:19:45 +01:00
|
|
|
### FIXME
|
2009-07-03 16:28:16 +02:00
|
|
|
%define vnc 1
|
2010-03-20 03:42:15 +01:00
|
|
|
BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel xorg-x11-fonts-devel
|
|
|
|
### udev support
|
|
|
|
BuildRequires: libudev-devel
|
2007-01-15 01:00:17 +01:00
|
|
|
%if %vnc
|
|
|
|
BuildRequires: libjpeg-devel
|
|
|
|
%endif
|
2007-09-22 23:43:29 +02:00
|
|
|
Url: http://xorg.freedesktop.org/
|
2006-12-18 15:48:26 +01:00
|
|
|
%define EXPERIMENTAL 0
|
2010-03-20 03:42:15 +01:00
|
|
|
Version: 7.5_%{dirsuffix}
|
|
|
|
Release: 1
|
2009-12-02 12:28:35 +01:00
|
|
|
License: GPLv2+ ; MIT License (or similar)
|
2006-12-18 15:48:26 +01:00
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
|
|
Group: System/X11/Servers/XF86_4
|
2009-01-19 02:20:48 +01:00
|
|
|
%ifnarch s390 s390x
|
|
|
|
PreReq: %fillup_prereq
|
|
|
|
%endif
|
2009-05-01 00:51:47 +02:00
|
|
|
Requires: pkgconfig xorg-x11-fonts-core xorg-x11
|
2007-04-20 16:01:44 +02:00
|
|
|
%if %suse_version > 1010
|
2006-12-18 15:48:26 +01:00
|
|
|
%ifnarch s390 s390x
|
2010-03-20 03:42:15 +01:00
|
|
|
Provides: VIDEO_ABI_VERSION = 7
|
|
|
|
Provides: INPUT_ABI_VERSION = 9
|
2009-05-01 00:51:47 +02:00
|
|
|
Requires: libpixman-1-0 >= 0.15.2
|
2006-12-18 15:48:26 +01:00
|
|
|
%endif
|
2007-04-20 16:01:44 +02:00
|
|
|
%endif
|
2007-05-23 12:28:42 +02:00
|
|
|
Provides: xorg-x11-server-glx
|
|
|
|
Obsoletes: xorg-x11-server-glx
|
2006-12-18 15:48:26 +01:00
|
|
|
Summary: X.Org Server
|
|
|
|
Source: xorg-server-%{dirsuffix}.tar.bz2
|
2009-01-19 02:20:48 +01:00
|
|
|
%ifnarch s390 s390x
|
|
|
|
Source1: sysconfig.displaymanager.template
|
|
|
|
%endif
|
2006-12-18 15:48:26 +01:00
|
|
|
Source3: README.updates
|
|
|
|
Source4: xorgcfg.tar.bz2
|
|
|
|
%if %suse_version > 1010
|
|
|
|
Source5: modprobe.nvidia
|
|
|
|
%endif
|
2007-07-05 00:23:51 +02:00
|
|
|
Source7: xorg-docs-1.4.tar.bz2
|
2009-12-16 10:07:21 +01:00
|
|
|
Source8: xlog2xconf.sh
|
2006-12-18 15:48:26 +01:00
|
|
|
Patch1: fpic.diff
|
|
|
|
Patch2: p_default-module-path.diff
|
|
|
|
Patch6: pu_fixes.diff
|
|
|
|
Patch8: p_bug96328.diff
|
|
|
|
Patch13: p_xorg_acpi.diff
|
|
|
|
Patch14: p_xkills_wrong_client.diff
|
|
|
|
Patch16: p_xnest-ignore-getimage-errors.diff
|
|
|
|
Patch23: disable-fbblt-opt.diff
|
|
|
|
Patch27: mouse.diff
|
|
|
|
Patch29: xephyr.diff
|
|
|
|
Patch36: libdrm.diff
|
2007-01-15 01:00:17 +01:00
|
|
|
%if %vnc
|
2007-11-28 23:55:17 +01:00
|
|
|
### Dan Nicholson <dbn.lists@gmail.com>
|
2008-07-11 02:26:04 +02:00
|
|
|
#http://people.freedesktop.org/~dbn/xorg-server-xf4vnc.patch
|
|
|
|
Patch39: xorg-server-xf4vnc.patch
|
|
|
|
Patch40: xorg-server-xf4vnc-disable-dmxvnc.diff
|
|
|
|
Patch42: xorg-server-xf4vnc-TranslateNone.diff
|
2008-08-02 05:26:20 +02:00
|
|
|
Patch43: xorg-server-xf4vnc-abi-version.diff
|
2008-08-07 01:37:06 +02:00
|
|
|
Patch44: xorg-server-xf4vnc-cutpaste.diff
|
2008-10-26 01:47:09 +02:00
|
|
|
Patch46: xorg-server-xf4vnc-busyloop.diff
|
2009-01-09 02:10:45 +01:00
|
|
|
Patch47: xorg-server-xf4vnc-clientTimeout.diff
|
2009-07-03 16:28:16 +02:00
|
|
|
Patch48: xorg-server-xf4vnc-fix.diff
|
2010-03-20 03:42:15 +01:00
|
|
|
Patch49: xorg-server-xf4vnc-fixes_1_8.diff
|
2007-01-15 01:00:17 +01:00
|
|
|
%endif
|
2007-01-29 17:36:20 +01:00
|
|
|
Patch45: bug-197858_dpms.diff
|
2007-07-05 00:23:51 +02:00
|
|
|
Patch67: xorg-docs.diff
|
2007-09-06 21:06:55 +02:00
|
|
|
Patch77: fbdevhw.diff
|
2007-09-22 23:43:29 +02:00
|
|
|
Patch79: edit_data_sanity_check.diff
|
2007-12-06 01:45:28 +01:00
|
|
|
Patch93: pixman.diff
|
2008-03-21 02:47:42 +01:00
|
|
|
Patch101: zap_warning_xserver.diff
|
2008-04-03 02:42:46 +02:00
|
|
|
Patch103: confine_to_shape.diff
|
2008-04-06 09:29:25 +02:00
|
|
|
Patch104: bitmap_always_unscaled.diff
|
2008-04-09 22:04:32 +02:00
|
|
|
Patch106: randr1_1-sig11.diff
|
2008-05-26 23:18:34 +02:00
|
|
|
Patch112: fix-dpi-values.diff
|
2008-11-07 15:54:35 +01:00
|
|
|
Patch123: vidmode-sig11.diff
|
2008-11-18 13:58:47 +01:00
|
|
|
Patch125: 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch
|
2008-11-28 16:10:51 +01:00
|
|
|
Patch127: dpms_screensaver.diff
|
2009-02-06 16:48:49 +01:00
|
|
|
Patch128: pci-legacy-mem-fallback.diff
|
2009-02-26 03:43:28 +01:00
|
|
|
Patch129: bug474071-fix1.diff
|
2009-03-24 20:34:33 +01:00
|
|
|
Patch132: fixed-SYNC-extension-trigger-BlockHandler-test.diff
|
2009-06-05 23:08:21 +02:00
|
|
|
Patch143: autoconfig_fallback_fbdev_first.diff
|
2009-06-06 01:12:56 +02:00
|
|
|
Patch145: driver-autoconfig.diff
|
2009-08-04 21:52:16 +02:00
|
|
|
# Moblin
|
|
|
|
Patch162: cache-xkbcomp-output-for-fast-start-up.patch
|
|
|
|
%if %moblin
|
2009-06-03 00:58:26 +02:00
|
|
|
Patch163: xserver-1.5.0-bg-none-root.patch
|
2009-08-04 21:52:16 +02:00
|
|
|
%endif
|
2009-06-03 00:58:26 +02:00
|
|
|
Patch164: xorg-detect-psb.patch
|
2009-08-04 21:52:16 +02:00
|
|
|
%if %moblin
|
|
|
|
Patch168: moblin-xserver-no-root-2.patch
|
|
|
|
%endif
|
|
|
|
Patch169: moblin-xorg-x11-nonroot-vesa.patch
|
|
|
|
%if %moblin
|
|
|
|
Patch170: xserver-boottime.patch
|
2009-09-10 12:54:30 +02:00
|
|
|
Patch171: moblin-use_preferred_mode_for_all_outputs.diff
|
2009-08-04 21:52:16 +02:00
|
|
|
%endif
|
2009-09-10 12:54:30 +02:00
|
|
|
Patch200: bug534768-prefer_local_symbols.patch
|
2009-10-12 12:15:18 +02:00
|
|
|
Patch202: 0001-Check-harder-for-primary-PCI-device.patch
|
|
|
|
Patch203: 0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch
|
2009-12-02 12:28:35 +01:00
|
|
|
Patch204: missing_font_paths.diff
|
2006-12-18 15:48:26 +01:00
|
|
|
|
|
|
|
%description
|
|
|
|
This package contains the X.Org Server.
|
|
|
|
|
|
|
|
|
|
|
|
|
2007-05-23 12:28:42 +02:00
|
|
|
%package extra
|
2009-12-02 12:28:35 +01:00
|
|
|
License: GPLv2+ ; MIT License (or similar)
|
2007-05-23 12:28:42 +02:00
|
|
|
Summary: Additional Xservers (Xdmx, Xephyr, Xnest, Xvfb)
|
|
|
|
Group: System/X11/Servers/XF86_4
|
2009-06-09 17:53:07 +02:00
|
|
|
Provides: xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-server:/usr/bin/Xvfb
|
2007-05-23 12:28:42 +02:00
|
|
|
Obsoletes: xorg-x11-Xnest xorg-x11-Xvfb
|
2008-07-11 21:58:47 +02:00
|
|
|
Requires: xorg-x11-fonts-core xorg-x11 Mesa
|
2007-09-22 23:43:29 +02:00
|
|
|
AutoReqProv: on
|
2007-05-23 12:28:42 +02:00
|
|
|
|
|
|
|
%description extra
|
|
|
|
This package contains additional Xservers (Xdmx, Xephyr, Xnest, Xvfb).
|
|
|
|
|
|
|
|
|
|
|
|
|
2006-12-18 15:48:26 +01:00
|
|
|
%package sdk
|
2009-12-02 12:28:35 +01:00
|
|
|
License: GPLv2+ ; MIT License (or similar)
|
2009-06-05 23:08:21 +02:00
|
|
|
Summary: X.Org Server SDK
|
2006-12-18 15:48:26 +01:00
|
|
|
Group: System/Libraries
|
|
|
|
Provides: xorg-x11-sdk
|
|
|
|
Obsoletes: xorg-x11-sdk
|
2008-11-04 18:08:06 +01:00
|
|
|
Requires: xorg-x11-proto-devel xorg-x11-xtrans-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXrender-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXt-devel xorg-x11-libXmu-devel xorg-x11-libXfixes-devel xorg-x11-libxkbfile-devel xorg-x11-libfontenc-devel xorg-x11-libXv-devel xorg-x11-libXprintUtil-devel xorg-x11-devel freetype2-devel fontconfig-devel libdrm-devel xorg-x11-server
|
2007-09-22 23:43:29 +02:00
|
|
|
AutoReqProv: on
|
2006-12-18 15:48:26 +01:00
|
|
|
|
|
|
|
%description sdk
|
|
|
|
This package contains the X.Org Server SDK.
|
|
|
|
|
|
|
|
|
|
|
|
|
2007-01-15 01:00:17 +01:00
|
|
|
%if %vnc
|
2007-11-23 01:47:00 +01:00
|
|
|
|
2007-01-15 01:00:17 +01:00
|
|
|
%package -n xorg-x11-Xvnc
|
2009-12-02 12:28:35 +01:00
|
|
|
License: GPLv2+ ; MIT License (or similar)
|
2007-01-15 01:00:17 +01:00
|
|
|
Summary: VNC Server for the X Window System
|
|
|
|
Group: System/X11/Servers/XF86_4
|
2007-11-16 00:56:44 +01:00
|
|
|
Requires: xorg-x11-fonts-core xorg-x11
|
2007-01-15 01:00:17 +01:00
|
|
|
Provides: vnc:/usr/X11R6/bin/Xvnc XFree86-Xvnc
|
|
|
|
Obsoletes: XFree86-Xvnc
|
|
|
|
%ifarch ia64
|
|
|
|
Provides: vnc-x86
|
|
|
|
Obsoletes: vnc-x86
|
|
|
|
%endif
|
2007-09-22 23:43:29 +02:00
|
|
|
AutoReqProv: on
|
2007-01-15 01:00:17 +01:00
|
|
|
|
|
|
|
%description -n xorg-x11-Xvnc
|
|
|
|
An X Window System server for Virtual Network Computing (VNC).
|
|
|
|
|
|
|
|
|
|
|
|
|
2006-12-18 15:48:26 +01:00
|
|
|
%endif
|
2007-11-23 01:47:00 +01:00
|
|
|
|
2006-12-18 15:48:26 +01:00
|
|
|
%prep
|
2009-03-04 15:02:05 +01:00
|
|
|
%setup -q -n xorg-server-%{dirsuffix} -a4 -a7
|
2006-12-18 15:48:26 +01:00
|
|
|
%patch1
|
2007-06-07 13:17:09 +02:00
|
|
|
%patch2
|
2006-12-18 15:48:26 +01:00
|
|
|
%patch6
|
2007-10-03 01:21:25 +02:00
|
|
|
%patch8 -p0
|
2006-12-18 15:48:26 +01:00
|
|
|
%patch13
|
2007-12-13 14:12:10 +01:00
|
|
|
%patch14
|
2006-12-18 15:48:26 +01:00
|
|
|
%patch16 -p2
|
|
|
|
%patch23
|
|
|
|
%patch27
|
|
|
|
%patch29
|
|
|
|
%patch36 -p0
|
2007-01-15 01:00:17 +01:00
|
|
|
%if %vnc
|
|
|
|
%patch39 -p1
|
2008-07-11 02:26:04 +02:00
|
|
|
%patch40 -p0
|
|
|
|
%patch42 -p1
|
2008-08-02 05:26:20 +02:00
|
|
|
%patch43 -p0
|
2008-08-07 01:37:06 +02:00
|
|
|
%patch44
|
2008-10-26 01:47:09 +02:00
|
|
|
%patch46 -p1
|
2009-01-09 02:10:45 +01:00
|
|
|
%patch47 -p1
|
2009-07-03 16:28:16 +02:00
|
|
|
%patch48 -p1
|
2010-03-20 03:42:15 +01:00
|
|
|
%patch49 -p0
|
2007-10-20 17:42:04 +02:00
|
|
|
chmod 755 hw/vnc/symlink-vnc.sh
|
2007-01-15 01:00:17 +01:00
|
|
|
%endif
|
2007-01-29 17:36:20 +01:00
|
|
|
%patch45 -p0
|
2007-07-05 00:23:51 +02:00
|
|
|
pushd xorg-docs-*
|
|
|
|
%patch67
|
|
|
|
popd
|
2007-09-06 21:06:55 +02:00
|
|
|
%patch77
|
2007-09-22 23:43:29 +02:00
|
|
|
%patch79 -p1
|
2007-12-06 01:45:28 +01:00
|
|
|
%patch93
|
2008-03-21 02:47:42 +01:00
|
|
|
%patch101 -p1
|
2008-04-03 02:42:46 +02:00
|
|
|
%patch103
|
2008-04-06 09:29:25 +02:00
|
|
|
%patch104 -p1
|
2008-04-09 22:04:32 +02:00
|
|
|
%patch106 -p1
|
2008-05-26 23:18:34 +02:00
|
|
|
%patch112 -p0
|
2008-11-07 15:54:35 +01:00
|
|
|
%patch123 -p0
|
2008-11-18 13:58:47 +01:00
|
|
|
%patch125 -p1
|
2008-11-28 16:10:51 +01:00
|
|
|
%patch127 -p1
|
2009-02-06 16:48:49 +01:00
|
|
|
%patch128
|
2009-02-26 03:43:28 +01:00
|
|
|
pushd hw/xfree86/os-support/bus
|
|
|
|
%patch129 -p0
|
|
|
|
popd
|
2009-03-24 20:34:33 +01:00
|
|
|
%patch132 -p1
|
2009-06-05 23:08:21 +02:00
|
|
|
%patch143 -p0
|
2009-06-06 01:12:56 +02:00
|
|
|
%patch145 -p0
|
2009-06-12 18:04:54 +02:00
|
|
|
%patch162 -p1
|
2009-08-04 21:52:16 +02:00
|
|
|
%if %moblin
|
2009-06-03 00:58:26 +02:00
|
|
|
%patch163 -p1
|
2009-06-12 18:04:54 +02:00
|
|
|
%endif
|
2009-06-03 00:58:26 +02:00
|
|
|
%patch164 -p1
|
2009-08-04 21:52:16 +02:00
|
|
|
%if %moblin
|
2009-06-29 16:57:54 +02:00
|
|
|
%patch168 -p1
|
2009-08-04 21:52:16 +02:00
|
|
|
%endif
|
|
|
|
%patch169 -p1
|
|
|
|
%if %moblin
|
|
|
|
%patch170 -p1
|
2009-09-10 12:54:30 +02:00
|
|
|
%patch171 -p1
|
2009-08-04 21:52:16 +02:00
|
|
|
%endif
|
|
|
|
#
|
2009-09-10 12:54:30 +02:00
|
|
|
%patch200 -p1
|
2009-10-12 12:15:18 +02:00
|
|
|
%patch202 -p1
|
|
|
|
%patch203 -p1
|
2009-12-02 12:28:35 +01:00
|
|
|
%patch204 -p0
|
2006-12-18 15:48:26 +01:00
|
|
|
|
|
|
|
%build
|
2007-07-05 00:23:51 +02:00
|
|
|
pushd xorg-docs-*
|
|
|
|
autoreconf -fi
|
2008-10-06 16:50:56 +02:00
|
|
|
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
|
|
|
%configure
|
2007-07-05 00:23:51 +02:00
|
|
|
make
|
|
|
|
popd
|
2006-12-18 15:48:26 +01:00
|
|
|
autoreconf -fi
|
2008-07-05 02:00:28 +02:00
|
|
|
# DRI2 disabled for Xserver 1.5 as libdrm 2.3.1 doesn't have the
|
|
|
|
# drmBO functionality.
|
2009-11-02 12:48:04 +01:00
|
|
|
./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
|
2006-12-18 15:48:26 +01:00
|
|
|
%if %fglrx_driver_hack
|
|
|
|
--with-release-major=7 \
|
2007-03-30 16:35:00 +02:00
|
|
|
--with-release-minor=2 \
|
2006-12-18 15:48:26 +01:00
|
|
|
--with-release-patch=0 \
|
|
|
|
--with-release-snap=0 \
|
|
|
|
--with-release-date="%(date)" \
|
2007-03-30 16:35:00 +02:00
|
|
|
--with-release-version=7.2.0.0 \
|
2007-01-15 01:00:17 +01:00
|
|
|
%endif
|
|
|
|
%if %vnc
|
2007-10-20 17:42:04 +02:00
|
|
|
--enable-vnc \
|
2008-09-24 17:44:51 +02:00
|
|
|
--disable-xcliplist \
|
2006-12-18 15:48:26 +01:00
|
|
|
%endif
|
|
|
|
--prefix=/usr \
|
|
|
|
--sysconfdir=/etc \
|
|
|
|
--libdir=%{_libdir} \
|
|
|
|
--mandir=%{_mandir} \
|
|
|
|
--enable-builddocs \
|
|
|
|
--enable-install-libxf86config \
|
|
|
|
%ifarch %EXPERIMENTAL
|
|
|
|
--enable-glx-tls \
|
|
|
|
--enable-multibuffer \
|
|
|
|
%endif
|
|
|
|
%ifarch s390 s390x
|
|
|
|
--disable-aiglx \
|
|
|
|
%else
|
|
|
|
--enable-aiglx \
|
|
|
|
%endif
|
|
|
|
--enable-lbx \
|
|
|
|
--enable-xdmcp \
|
|
|
|
--enable-xdm-auth-1 \
|
2008-07-24 22:22:10 +02:00
|
|
|
--enable-dri \
|
2009-04-29 00:58:35 +02:00
|
|
|
--enable-dri2 \
|
2006-12-18 15:48:26 +01:00
|
|
|
%ifarch s390 s390x
|
|
|
|
--disable-xorg \
|
|
|
|
%else
|
|
|
|
--enable-xorg \
|
|
|
|
%endif
|
2009-06-09 17:53:07 +02:00
|
|
|
--disable-dmx \
|
2006-12-18 15:48:26 +01:00
|
|
|
--enable-xnest \
|
|
|
|
--enable-kdrive \
|
|
|
|
--enable-xephyr \
|
|
|
|
--disable-xsdl \
|
|
|
|
--enable-xprint \
|
|
|
|
--disable-kbd_mode \
|
2007-05-23 12:28:42 +02:00
|
|
|
--disable-xprint \
|
2008-08-06 01:59:36 +02:00
|
|
|
--enable-record \
|
2009-01-29 23:25:39 +01:00
|
|
|
--enable-xcsecurity \
|
2010-03-20 03:42:15 +01:00
|
|
|
--enable-config-udev \
|
2006-12-18 15:48:26 +01:00
|
|
|
--with-log-dir="/var/log" \
|
|
|
|
--with-os-name="openSUSE" \
|
|
|
|
--with-os-vendor="SUSE LINUX" \
|
|
|
|
--with-fontdir="/usr/share/fonts" \
|
|
|
|
--with-xkb-path="/usr/share/X11/xkb" \
|
|
|
|
--with-xkb-output="/var/lib/xkb/compiled"
|
2007-10-03 01:21:25 +02:00
|
|
|
#make %{?jobs:-j %jobs}
|
|
|
|
make
|
2007-08-12 11:48:57 +02:00
|
|
|
make -C hw/kdrive %{?jobs:-j %jobs}
|
2006-12-18 15:48:26 +01:00
|
|
|
|
|
|
|
%install
|
2007-07-05 00:23:51 +02:00
|
|
|
make -C xorg-docs-* install DESTDIR=$RPM_BUILD_ROOT
|
2006-12-18 15:48:26 +01:00
|
|
|
make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
make -C hw/kdrive install DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
%ifnarch s390 s390x
|
|
|
|
# remove .la files
|
|
|
|
find $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/ -name "*.la" | \
|
|
|
|
xargs rm
|
|
|
|
install -m 644 hw/xfree86/parser/{xf86Parser.h,xf86Optrec.h} \
|
|
|
|
$RPM_BUILD_ROOT/usr/include/xorg
|
|
|
|
# add compatibility symlinks for SUSE <= 10.1
|
|
|
|
%if %suse_version <= 1010
|
|
|
|
mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin
|
|
|
|
ln -snf ../../bin/X $RPM_BUILD_ROOT/usr/X11R6/bin/X
|
|
|
|
ln -snf ../../bin/Xorg $RPM_BUILD_ROOT/usr/X11R6/bin/Xorg
|
|
|
|
%endif
|
|
|
|
chmod u+s $RPM_BUILD_ROOT/usr/bin/Xorg
|
2009-02-16 12:26:36 +01:00
|
|
|
mkdir -p $RPM_BUILD_ROOT/var/lib/X11
|
|
|
|
ln -snf ../../../usr/bin/Xorg $RPM_BUILD_ROOT/var/lib/X11/X
|
|
|
|
ln -snf ../../var/lib/X11/X $RPM_BUILD_ROOT/usr/bin/X
|
2006-12-18 15:48:26 +01:00
|
|
|
mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/updates/{fonts,input,linux,drivers,multimedia,extensions}
|
|
|
|
install -m 644 $RPM_SOURCE_DIR/README.updates $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/updates
|
2007-02-19 23:30:37 +01:00
|
|
|
%if %suse_version <= 1010
|
2006-12-18 15:48:26 +01:00
|
|
|
mkdir -p $RPM_BUILD_ROOT/etc/permissions.d
|
|
|
|
cat > $RPM_BUILD_ROOT/etc/permissions.d/xorg-x11-server.easy << EOF
|
|
|
|
/usr/bin/Xorg root:root 4711
|
|
|
|
EOF
|
|
|
|
cat > $RPM_BUILD_ROOT/etc/permissions.d/xorg-x11-server.paranoid << EOF
|
|
|
|
/usr/bin/Xorg root:root 0711
|
|
|
|
EOF
|
2007-02-19 23:30:37 +01:00
|
|
|
cat > $RPM_BUILD_ROOT/etc/permissions.d/xorg-x11-server.secure << EOF
|
2006-12-18 15:48:26 +01:00
|
|
|
/usr/bin/Xorg root:root 0711
|
|
|
|
EOF
|
2007-02-19 23:30:37 +01:00
|
|
|
%endif
|
2006-12-18 15:48:26 +01:00
|
|
|
%else
|
|
|
|
rm -f $RPM_BUILD_ROOT/usr/share/aclocal/*.m4
|
|
|
|
%endif
|
|
|
|
%if %suse_version > 1010
|
|
|
|
mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
|
2009-03-11 19:34:39 +01:00
|
|
|
install -m 644 $RPM_SOURCE_DIR/modprobe.nvidia $RPM_BUILD_ROOT/etc/modprobe.d/50-nvidia.conf
|
2006-12-18 15:48:26 +01:00
|
|
|
%endif
|
2007-11-19 10:28:13 +01:00
|
|
|
%if %vnc
|
2008-06-26 01:19:13 +02:00
|
|
|
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services
|
|
|
|
cat > $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/%{name} << EOF
|
|
|
|
## Name: VNC Server
|
|
|
|
## Description: Opens ports for VNC Server
|
|
|
|
TCP="5801 5901"
|
|
|
|
EOF
|
2008-07-05 02:00:28 +02:00
|
|
|
%endif
|
|
|
|
%ifarch s390 s390x
|
|
|
|
rm $RPM_BUILD_ROOT/usr/%{_lib}/pkgconfig/*.pc
|
2008-10-28 00:46:27 +01:00
|
|
|
make -C hw/xfree86/parser
|
|
|
|
mkdir -p $RPM_BUILD_ROOT/usr/include/xorg \
|
|
|
|
$RPM_BUILD_ROOT//usr/%{_lib}
|
|
|
|
install -m 644 hw/xfree86/parser/{xf86Parser.h,xf86Optrec.h} \
|
|
|
|
$RPM_BUILD_ROOT/usr/include/xorg
|
|
|
|
install -m 644 hw/xfree86/parser/libxf86config.a \
|
|
|
|
$RPM_BUILD_ROOT//usr/%{_lib}
|
2008-07-05 02:00:28 +02:00
|
|
|
%endif
|
2009-01-19 02:20:48 +01:00
|
|
|
%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
|
2009-12-16 10:07:21 +01:00
|
|
|
install -m 755 %_sourcedir/xlog2xconf.sh %buildroot/usr/bin/xlog2xconf
|
2006-12-18 15:48:26 +01:00
|
|
|
|
|
|
|
%clean
|
|
|
|
rm -rf "$RPM_BUILD_ROOT"
|
|
|
|
%ifnarch s390 s390x
|
|
|
|
%verifyscript
|
|
|
|
%verify_permissions -e /usr/bin/Xorg
|
|
|
|
%endif
|
|
|
|
|
|
|
|
%pre
|
|
|
|
test -L usr/lib/X11 && rm usr/lib/X11
|
|
|
|
rm -rf etc/X11/xserver/
|
|
|
|
exit 0
|
|
|
|
|
|
|
|
%post
|
|
|
|
%ifnarch s390 s390x
|
2009-01-19 02:20:48 +01:00
|
|
|
%{fillup_only -an displaymanager}
|
2006-12-18 15:48:26 +01:00
|
|
|
%run_permissions
|
|
|
|
rm -f var/log/XFree86.*.log*
|
|
|
|
# SaX2 writes xorg.conf since SuSE 9.3
|
|
|
|
# - create backup of XF86Config
|
|
|
|
# - copy XF86Config to xorg.conf
|
|
|
|
# - set XF86Config symlink to xorg.conf
|
|
|
|
pushd etc/X11 &> /dev/null
|
|
|
|
# get rid of symlinks
|
|
|
|
for file in xorg.conf XF86Config; do
|
|
|
|
if [ -L $file ]; then
|
|
|
|
symlink=$file
|
|
|
|
while test -L $symlink; do
|
|
|
|
tmp=$(readlink $symlink)
|
|
|
|
rm -f $symlink
|
|
|
|
symlink=$tmp
|
|
|
|
done
|
|
|
|
mv $symlink $file
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
if [ ! -f xorg.conf -a -f XF86Config ]; then
|
|
|
|
cp XF86Config xorg.conf
|
|
|
|
fi
|
|
|
|
if [ -f xorg.conf ]; then
|
|
|
|
#test -f XF86Config && old XF86Config
|
|
|
|
ln -snf xorg.conf XF86Config
|
|
|
|
fi
|
|
|
|
popd &> /dev/null
|
|
|
|
if [ -f etc/X11/xorg.conf ]; then
|
|
|
|
# SuSE 10.1 --> SuSE 10.2: X11 fonts have moved to /usr/share/fonts
|
2008-01-28 16:42:43 +01:00
|
|
|
# SuSE 10.1 --> SuSE 10.2: radeonold --> radeon
|
2008-11-28 16:10:51 +01:00
|
|
|
# openSUSE 11.0 --> openSUSE 11.1: i810 --> intel (Bug #448458)
|
2008-01-28 16:42:43 +01:00
|
|
|
if grep -q -e /usr/X11R6/lib/X11/fonts/ \
|
2006-12-18 15:48:26 +01:00
|
|
|
-e /usr/X11/lib/X11/fonts/ \
|
|
|
|
-e /usr/lib/X11/fonts/ \
|
|
|
|
etc/X11/xorg.conf; then
|
|
|
|
sed -i.post_xorg-x11-server \
|
|
|
|
-e 's+/usr/X11R6/lib/X11/fonts/+/usr/share/fonts/+g' \
|
|
|
|
-e 's+/usr/X11/lib/X11/fonts/+/usr/share/fonts/+g' \
|
|
|
|
-e 's+/usr/lib/X11/fonts/+/usr/share/fonts/+g' \
|
|
|
|
etc/X11/xorg.conf
|
|
|
|
fi
|
2008-01-28 16:42:43 +01:00
|
|
|
if grep -q \"radeonold\" etc/X11/xorg.conf; then
|
|
|
|
# only switch to radeon if radeonold is no longer available (Bug #355009)
|
|
|
|
if test ! -f /usr/%{_lib}/xorg/modules/drivers/radeonold_drv.so; then
|
|
|
|
sed -i.post_xorg-x11-server -e 's/\"radeonold\"/\"radeon\"/g' \
|
|
|
|
etc/X11/xorg.conf
|
|
|
|
fi
|
|
|
|
fi
|
2008-11-28 16:10:51 +01:00
|
|
|
if grep -q \"i810\" etc/X11/xorg.conf; then
|
|
|
|
sed -i.post_xorg-x11-server -e 's/\"i810\"/\"intel\"/g' \
|
|
|
|
etc/X11/xorg.conf
|
|
|
|
fi
|
2009-10-21 02:06:49 +02:00
|
|
|
# Document how to restore previous input driver behaviour in xorg.conf files created
|
|
|
|
# on openSUSE <= 11.1
|
2009-09-16 23:20:07 +02:00
|
|
|
if ! grep -q "will be disabled unless 'Option \"AutoAddDevices\" \"off\"'" etc/X11/xorg.conf; then
|
2009-10-21 02:06:49 +02:00
|
|
|
if ! grep -q "\"AutoAddDevices\" \"off\"" etc/X11/xorg.conf; then
|
2009-09-16 23:20:07 +02:00
|
|
|
sed -i '
|
|
|
|
/Section "ServerFlags"/{
|
|
|
|
h
|
|
|
|
g
|
|
|
|
a\
|
2009-10-21 02:06:49 +02:00
|
|
|
# Uncomment the following option to reenable kbd/mouse driver input sections. \
|
|
|
|
# Otherwise evdev driver is used. \
|
|
|
|
#Option "AutoAddDevices" "off"
|
2009-09-16 23:20:07 +02:00
|
|
|
}
|
|
|
|
' etc/X11/xorg.conf
|
2009-10-21 02:06:49 +02:00
|
|
|
fi
|
2009-09-16 23:20:07 +02:00
|
|
|
fi
|
2006-12-18 15:48:26 +01:00
|
|
|
fi
|
|
|
|
%endif
|
|
|
|
# Installation of init script seems to be disabled by default
|
|
|
|
# Create symbolic run level links for xprint start script
|
|
|
|
if false; then
|
|
|
|
%{fillup_and_insserv -p xprint}
|
|
|
|
fi
|
|
|
|
exit 0
|
|
|
|
|
|
|
|
%preun
|
|
|
|
# Installation of init script seems to be disabled by default
|
|
|
|
if false; then
|
|
|
|
%stop_on_removal xprint
|
|
|
|
fi
|
|
|
|
exit 0
|
|
|
|
|
|
|
|
%postun
|
|
|
|
# installation of init script seems to be disabled by default
|
|
|
|
# Rearrange run level symlinks after removing the xprint init script
|
|
|
|
if false; then
|
|
|
|
%{insserv_cleanup}
|
|
|
|
fi
|
|
|
|
exit 0
|
|
|
|
|
|
|
|
%pre sdk
|
|
|
|
test -L usr/include/X11 && rm usr/include/X11
|
|
|
|
exit 0
|
|
|
|
|
|
|
|
%files
|
|
|
|
%defattr(-,root,root)
|
|
|
|
%if %suse_version > 1010
|
|
|
|
%dir /etc/modprobe.d
|
2009-03-11 19:34:39 +01:00
|
|
|
/etc/modprobe.d/50-nvidia.conf
|
2006-12-18 15:48:26 +01:00
|
|
|
%endif
|
2010-01-18 14:04:02 +01:00
|
|
|
#%ifarch ppc64 x86_64
|
|
|
|
#%dir /usr/%{_lib}/X11
|
|
|
|
#%endif
|
2006-12-18 15:48:26 +01:00
|
|
|
%dir /usr/%{_lib}/xorg
|
2008-07-05 02:00:28 +02:00
|
|
|
%ifnarch s390 s390x
|
2009-02-16 12:26:36 +01:00
|
|
|
%dir /var/lib/X11
|
2006-12-18 15:48:26 +01:00
|
|
|
%endif
|
|
|
|
%dir /var/lib/xkb
|
|
|
|
%dir /var/lib/xkb/compiled
|
|
|
|
%ifnarch s390 s390x
|
2007-02-19 23:30:37 +01:00
|
|
|
%if %suse_version <= 1010
|
2006-12-18 15:48:26 +01:00
|
|
|
/etc/permissions.d/%name.*
|
2007-02-19 23:30:37 +01:00
|
|
|
%endif
|
2006-12-18 15:48:26 +01:00
|
|
|
%if %suse_version <= 1010
|
|
|
|
/usr/X11R6/bin/X
|
|
|
|
/usr/X11R6/bin/Xorg
|
|
|
|
%endif
|
|
|
|
/usr/bin/X
|
|
|
|
%endif
|
|
|
|
%ifnarch s390 s390x
|
|
|
|
%verify(not mode) /usr/bin/Xorg
|
2009-12-16 10:07:21 +01:00
|
|
|
/usr/bin/xlog2xconf
|
2006-12-18 15:48:26 +01:00
|
|
|
%endif
|
|
|
|
%ifnarch s390 s390x
|
|
|
|
/usr/bin/cvt
|
|
|
|
%endif
|
|
|
|
%ifnarch s390 s390x
|
|
|
|
/usr/bin/gtf
|
|
|
|
%endif
|
|
|
|
%ifnarch s390 s390x
|
2010-01-18 14:04:02 +01:00
|
|
|
#/usr/%{_lib}/X11/*
|
2006-12-18 15:48:26 +01:00
|
|
|
/usr/%{_lib}/xorg/modules/
|
2007-08-12 11:48:57 +02:00
|
|
|
%{_mandir}/man4/*
|
2006-12-18 15:48:26 +01:00
|
|
|
%endif
|
2008-07-05 02:00:28 +02:00
|
|
|
/usr/%{_lib}/xorg/protocol.txt
|
2006-12-18 15:48:26 +01:00
|
|
|
%{_mandir}/man1/*
|
2008-01-26 18:22:58 +01:00
|
|
|
%exclude %{_mandir}/man1/Xnest.1*
|
|
|
|
%exclude %{_mandir}/man1/Xvfb.1*
|
2008-07-05 02:00:28 +02:00
|
|
|
%ifnarch s390 s390x
|
2007-10-20 17:42:04 +02:00
|
|
|
%{_mandir}/man5/*
|
2008-07-05 02:00:28 +02:00
|
|
|
%endif
|
2007-07-14 17:39:59 +02:00
|
|
|
%{_mandir}/man7/*
|
2006-12-18 15:48:26 +01:00
|
|
|
%ifnarch s390 s390x
|
2009-02-16 12:26:36 +01:00
|
|
|
/var/lib/X11/X
|
2006-12-18 15:48:26 +01:00
|
|
|
%endif
|
|
|
|
/var/lib/xkb/compiled/README.compiled
|
2009-01-19 02:20:48 +01:00
|
|
|
%ifnarch s390 s390x
|
|
|
|
/var/adm/fillup-templates/sysconfig.displaymanager-%name
|
|
|
|
%endif
|
2007-05-23 12:28:42 +02:00
|
|
|
|
|
|
|
%files extra
|
|
|
|
%defattr(-,root,root)
|
|
|
|
/usr/bin/Xephyr
|
|
|
|
/usr/bin/Xnest
|
|
|
|
/usr/bin/Xvfb
|
2008-01-26 18:22:58 +01:00
|
|
|
%{_mandir}/man1/Xnest.1*
|
|
|
|
%{_mandir}/man1/Xvfb.1*
|
2006-12-18 15:48:26 +01:00
|
|
|
|
|
|
|
%files sdk
|
|
|
|
%defattr(-,root,root)
|
|
|
|
/usr/include/xorg/
|
|
|
|
/usr/%{_lib}/*.a
|
2008-10-28 00:46:27 +01:00
|
|
|
%ifnarch s390 s390x
|
2008-07-05 02:00:28 +02:00
|
|
|
/usr/%{_lib}/pkgconfig/*.pc
|
2006-12-18 15:48:26 +01:00
|
|
|
/usr/share/aclocal/*.m4
|
|
|
|
%endif
|
2007-01-15 01:00:17 +01:00
|
|
|
%if %vnc
|
|
|
|
|
|
|
|
%files -n xorg-x11-Xvnc
|
|
|
|
%defattr(-, root, root)
|
2008-06-26 01:19:13 +02:00
|
|
|
/etc/sysconfig/SuSEfirewall2.d/services/%{name}
|
2007-01-15 01:00:17 +01:00
|
|
|
/usr/bin/Xvnc
|
|
|
|
%endif
|
2007-11-23 01:47:00 +01:00
|
|
|
|
2007-02-19 23:30:37 +01:00
|
|
|
%changelog
|