rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

Accepting request 94696 from X11:XOrg

Browse Source 
- also package list.h in s390 so that sax2-tools can build

- complete s390 fixes 

- fix build on s390/s390x

OBS-URL: https://build.opensuse.org/request/show/94696
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=226
This commit is contained in:
Stephan Kulow 2011-12-02 08:28:47 +00:00 committed by Git OBS Bridge
commit 22210a71d6
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xorg-x11-server.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
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
- complete s390 fixes
-------------------------------------------------------------------
Mon Nov 28 16:02:56 CET 2011 - ro@suse.de
- fix build on s390/s390x
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Nov 20 06:49:40 UTC 2011 - coolo@suse.com Sun Nov 20 06:49:40 UTC 2011 - coolo@suse.com

11
xorg-x11-server.spec
View File

@ -293,14 +293,21 @@ TCP="5801 5901"
EOF EOF
%endif %endif
%ifarch s390 s390x %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 make -C hw/xfree86/parser
mkdir -p $RPM_BUILD_ROOT/usr/include/xorg \ mkdir -p $RPM_BUILD_ROOT/usr/include/xorg \
$RPM_BUILD_ROOT/usr/%{_lib} $RPM_BUILD_ROOT/usr/%{_lib}
install -m 644 hw/xfree86/parser/{xf86Parser.h,xf86Optrec.h} \ install -m 644 hw/xfree86/parser/{xf86Parser.h,xf86Optrec.h} \
$RPM_BUILD_ROOT/usr/include/xorg $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}
else
install -m 644 hw/xfree86/parser/libxf86config.a \ install -m 644 hw/xfree86/parser/libxf86config.a \
$RPM_BUILD_ROOT//usr/%{_lib} $RPM_BUILD_ROOT//usr/%{_lib}
fi
%endif %endif
%ifnarch s390 s390x %ifnarch s390 s390x
mkdir -p %buildroot/var/adm/fillup-templates mkdir -p %buildroot/var/adm/fillup-templates
@ -372,7 +379,6 @@ exit 0
/etc/modprobe.d/50-nvidia.conf /etc/modprobe.d/50-nvidia.conf
%verify(not mode) /usr/bin/Xorg %verify(not mode) /usr/bin/Xorg
/usr/bin/X /usr/bin/X
/usr/bin/Xvfb
/usr/bin/cvt /usr/bin/cvt
/usr/bin/gtf /usr/bin/gtf
/usr/%{_lib}/xorg/modules/ /usr/%{_lib}/xorg/modules/
@ -381,6 +387,7 @@ exit 0
/var/adm/fillup-templates/sysconfig.displaymanager-%name /var/adm/fillup-templates/sysconfig.displaymanager-%name
/var/lib/X11/X /var/lib/X11/X
%endif %endif
/usr/bin/Xvfb
/usr/bin/xorg-backtrace /usr/bin/xorg-backtrace
%files extra %files extra