1
0
OBS User unknown 2007-11-23 00:47:00 +00:00 committed by Git OBS Bridge
parent be197b3e18
commit d9bd344587
3 changed files with 12 additions and 14 deletions

View File

@ -1,11 +0,0 @@
--- configure.ac.orig 2007-09-29 18:10:34.558821750 +0200
+++ configure.ac 2007-09-29 18:10:44.487442250 +0200
@@ -606,7 +606,7 @@
XEXT_LIB='$(top_builddir)/Xext/libXext.la'
XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
-PIXMAN="[pixman-1 >= 0.9.5]"
+PIXMAN="[pixman >= 0.9.5]"
PKG_CHECK_MODULES(PIXMAN, $PIXMAN)
AC_SUBST(PIXMAN_CFLAGS)

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Nov 22 23:01:03 CET 2007 - sndirsch@suse.de
- pixman.diff no longer required
-------------------------------------------------------------------
Sun Nov 18 14:14:22 CET 2007 - sndirsch@suse.de

View File

@ -21,7 +21,7 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.3
Release: 29
Release: 31
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@ -84,7 +84,6 @@ Patch69: xserver-mode-fuzzy-check.diff
Patch72: randr12-8d230319040f0a7f72231da2bf5ec97dc3612e21.diff
Patch77: fbdevhw.diff
Patch79: edit_data_sanity_check.diff
Patch80: pixman.diff
Patch81: xserver-1.3.0-xkb-and-loathing.patch
Patch83: ia64linuxPciInit.diff
Patch84: commit-feac075.diff
@ -110,6 +109,7 @@ This package contains additional Xservers (Xdmx, Xephyr, Xnest, Xvfb).
%ifnarch s390 s390x
%package sdk
Summary: X.Org Server SDK.
Group: System/Libraries
@ -125,6 +125,7 @@ This package contains the X.Org Server SDK.
%endif
%if %vnc
%package -n xorg-x11-Xvnc
Summary: VNC Server for the X Window System
Group: System/X11/Servers/XF86_4
@ -143,6 +144,7 @@ An X Window System server for Virtual Network Computing (VNC).
%endif
%prep
%setup -q -n xorg-server-%{dirsuffix} -b1 -a4 -a7 -a8
test -s hw/xfree86/os-support/shared/ia64Pci.h || \
@ -200,7 +202,6 @@ popd
%patch72 -p1
%patch77
%patch79 -p1
%patch80
%patch81 -p1
%patch83
%patch84 -p1
@ -534,7 +535,10 @@ exit 0
%defattr(-, root, root)
/usr/bin/Xvnc
%endif
%changelog
* Thu Nov 22 2007 - sndirsch@suse.de
- pixman.diff no longer required
* Sun Nov 18 2007 - sndirsch@suse.de
- s390(x): allow mfb build without Xorg server being built
* Thu Nov 15 2007 - sndirsch@suse.de