rpm/tigervnc
SHA256
1
0
Fork 0
forked from pool/tigervnc
Code Pull Requests Activity

Accepting request 308971 from home:oertel:branches:X11:XOrg

Browse Source 
- add buildrequires for xf86driproto and presentproto to
  match xserver
- disable dri2 on s390/s390x

OBS-URL: https://build.opensuse.org/request/show/308971
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=63
This commit is contained in:
Egbert Eich 2015-07-27 18:03:07 +00:00 committed by Git OBS Bridge
parent c2c6f83c0a
commit 55c62da252
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tigervnc.changes
View File

@ -17,6 +17,13 @@ Wed Jul 15 11:52:02 UTC 2015 - msrb@suse.com
- Work with fltk 1.3.2. - Work with fltk 1.3.2.
* N_tigervnc_revert_fltk_1_3_3_requirements.patch * N_tigervnc_revert_fltk_1_3_3_requirements.patch
-------------------------------------------------------------------
Thu May 28 02:10:46 CEST 2015 - ro@suse.de
- add buildrequires for xf86driproto and presentproto to
match xserver
- disable dri2 on s390/s390x
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 20 12:10:10 UTC 2015 - msrb@suse.com Mon Apr 20 12:10:10 UTC 2015 - msrb@suse.com

11
tigervnc.spec
View File

@ -72,6 +72,7 @@ BuildRequires: pkgconfig(libtasn1)
BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(pciaccess) >= 0.8.0 BuildRequires: pkgconfig(pciaccess) >= 0.8.0
BuildRequires: pkgconfig(pixman-1) >= 0.15.20 BuildRequires: pkgconfig(pixman-1) >= 0.15.20
BuildRequires: pkgconfig(presentproto) >= 1.0
BuildRequires: pkgconfig(randrproto) >= 1.2.99.3 BuildRequires: pkgconfig(randrproto) >= 1.2.99.3
BuildRequires: pkgconfig(recordproto) >= 1.13.99.1 BuildRequires: pkgconfig(recordproto) >= 1.13.99.1
BuildRequires: pkgconfig(renderproto) >= 0.11 BuildRequires: pkgconfig(renderproto) >= 0.11
@ -82,6 +83,7 @@ BuildRequires: pkgconfig(xau)
BuildRequires: pkgconfig(xcmiscproto) >= 1.2.0 BuildRequires: pkgconfig(xcmiscproto) >= 1.2.0
BuildRequires: pkgconfig(xdmcp) BuildRequires: pkgconfig(xdmcp)
BuildRequires: pkgconfig(xextproto) >= 7.0.99.3 BuildRequires: pkgconfig(xextproto) >= 7.0.99.3
BuildRequires: pkgconfig(xf86driproto) >= 2.1.1
BuildRequires: pkgconfig(xfont) >= 1.4.2 BuildRequires: pkgconfig(xfont) >= 1.4.2
BuildRequires: pkgconfig(xineramaproto) BuildRequires: pkgconfig(xineramaproto)
BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xkbfile)
@ -174,7 +176,10 @@ autoreconf -fi
--disable-static --disable-xinerama \ --disable-static --disable-xinerama \
--with-xkb-path="/usr/share/X11/xkb" \ --with-xkb-path="/usr/share/X11/xkb" \
--with-xkb-output="/var/lib/xkb/compiled" \ --with-xkb-output="/var/lib/xkb/compiled" \
--enable-glx --enable-dri --enable-dri2 \ --enable-glx --enable-dri \
%ifnarch s390 s390x
--enable-dri2 \
%endif
--disable-config-dbus \ --disable-config-dbus \
--disable-config-hal \ --disable-config-hal \
--disable-config-udev \ --disable-config-udev \
@ -291,7 +296,7 @@ fi
%exclude /usr/%{_lib}/xorg/protocol.txt %exclude /usr/%{_lib}/xorg/protocol.txt
%exclude /usr/%{_lib}/xorg/modules/extensions/libvnc.la %exclude /usr/%{_lib}/xorg/modules/extensions/libvnc.la
%ifnarch s390x %ifnarch s390 s390x
%{_libdir}/xorg/modules/extensions/libvnc.so %{_libdir}/xorg/modules/extensions/libvnc.so
%else %else
%exclude %{_libdir}/xorg/modules %exclude %{_libdir}/xorg/modules
@ -304,7 +309,7 @@ fi
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-server %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-server
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd
%ifnarch s390x %ifnarch s390 s390x
%config(noreplace) /etc/X11/xorg.conf.d/10-libvnc.conf %config(noreplace) /etc/X11/xorg.conf.d/10-libvnc.conf
%else %else
%exclude /etc/X11/xorg.conf.d %exclude /etc/X11/xorg.conf.d