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
This commit is contained in:
Stefan Dirsch 2011-11-28 18:06:42 +00:00 committed by Git OBS Bridge
parent dba7988b93
commit 8fa4c55e1b
2 changed files with 13 additions and 3 deletions

View File

@ -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

View File

@ -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