From dba7988b934bc022c3a1ee625feec497c1758e5512ed27239d8f409d8448a007 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 28 Nov 2011 14:46:07 +0000 Subject: [PATCH 1/3] Accepting request 94086 from home:oertel:branches:openSUSE:Factory - fix build on s390/s390x OBS-URL: https://build.opensuse.org/request/show/94086 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=364 --- xorg-x11-server.changes | 5 +++++ xorg-x11-server.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 487b313..551be7b 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 28 15:28:26 CET 2011 - ro@suse.de + +- fix build on s390/s390x + ------------------------------------------------------------------- Sun Nov 20 06:49:40 UTC 2011 - coolo@suse.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 6d8d150..2414345 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -293,7 +293,7 @@ TCP="5801 5901" EOF %endif %ifarch s390 s390x -rm $RPM_BUILD_ROOT/etc/X11/10-evdev.conf +rm -f $RPM_BUILD_ROOT/etc/X11/10-evdev.conf make -C hw/xfree86/parser mkdir -p $RPM_BUILD_ROOT/usr/include/xorg \ $RPM_BUILD_ROOT/usr/%{_lib} From 8fa4c55e1b4af0ea97d0d33126e40ec9d6c01ae41b7ebdc04bcd5d7b06290770 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 28 Nov 2011 18:06:42 +0000 Subject: [PATCH 2/3] Accepting request 94136 from home:oertel:branches:openSUSE:Factory - complete s390 fixes OBS-URL: https://build.opensuse.org/request/show/94136 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=365 --- xorg-x11-server.changes | 7 ++++++- xorg-x11-server.spec | 9 +++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 551be7b..8419074 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,5 +1,10 @@ ------------------------------------------------------------------- -Mon Nov 28 15:28:26 CET 2011 - ro@suse.de +Mon Nov 28 16:04:58 CET 2011 - ro@suse.de + +- complete s390 fixes + +------------------------------------------------------------------- +Mon Nov 28 16:02:56 CET 2011 - ro@suse.de - fix build on s390/s390x diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 2414345..d7578db 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -299,8 +299,13 @@ 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 \ +if [ -f hw/xfree86/parser/.libs/libxf86config.a ] ; then + install -m 644 hw/xfree86/parser/.libs/libxf86config.a \ $RPM_BUILD_ROOT//usr/%{_lib} +else + install -m 644 hw/xfree86/parser/libxf86config.a \ + $RPM_BUILD_ROOT//usr/%{_lib} +fi %endif %ifnarch s390 s390x mkdir -p %buildroot/var/adm/fillup-templates @@ -372,7 +377,6 @@ exit 0 /etc/modprobe.d/50-nvidia.conf %verify(not mode) /usr/bin/Xorg /usr/bin/X -/usr/bin/Xvfb /usr/bin/cvt /usr/bin/gtf /usr/%{_lib}/xorg/modules/ @@ -381,6 +385,7 @@ exit 0 /var/adm/fillup-templates/sysconfig.displaymanager-%name /var/lib/X11/X %endif +/usr/bin/Xvfb /usr/bin/xorg-backtrace %files extra From ce4a21cf91b911eb549ba1e8749e9dce4875a1849ee30a5efcb29f00ddfbef39 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 1 Dec 2011 11:53:28 +0000 Subject: [PATCH 3/3] Accepting request 94593 from home:oertel:branches:openSUSE:Factory - also package list.h in s390 so that sax2-tools can build OBS-URL: https://build.opensuse.org/request/show/94593 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=366 --- xorg-x11-server.changes | 5 +++++ xorg-x11-server.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 8419074..cd596a7 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 30 17:18:16 CET 2011 - ro@suse.de + +- also package list.h in s390 so that sax2-tools can build + ------------------------------------------------------------------- Mon Nov 28 16:04:58 CET 2011 - ro@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index d7578db..0b2621d 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -299,6 +299,8 @@ 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 include/list.h \ + $RPM_BUILD_ROOT/usr/include/xorg if [ -f hw/xfree86/parser/.libs/libxf86config.a ] ; then install -m 644 hw/xfree86/parser/.libs/libxf86config.a \ $RPM_BUILD_ROOT//usr/%{_lib}