Hello community, here is the log from the commit of package tigervnc for openSUSE:Factory checked in at 2014-01-13 10:56:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tigervnc (Old) and /work/SRC/openSUSE:Factory/.tigervnc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tigervnc" Changes: -------- --- /work/SRC/openSUSE:Factory/tigervnc/tigervnc.changes 2014-01-02 11:15:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tigervnc.new/tigervnc.changes 2014-01-13 10:56:30.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Jan 10 15:11:50 UTC 2014 - sndir...@suse.com + +- do not include vnc Xserver module and xorg.conf snippet on s390x + +------------------------------------------------------------------- +Thu Jan 9 11:40:13 UTC 2014 - m...@suse.com + +- Remove unnecessary BuildRequires for binutils-gold. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tigervnc.spec ++++++ --- /var/tmp/diff_new_pack.31kWCH/_old 2014-01-13 10:56:32.000000000 +0100 +++ /var/tmp/diff_new_pack.31kWCH/_new 2014-01-13 10:56:32.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package xorg-x11-Xvnc +# spec file for package tigervnc # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,30 +15,74 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: tigervnc Version: 1.3.0 Release: 0 -License: GPL-2.0 and MIT Conflicts: tightvnc -BuildRequires: xorg-x11-server-sdk Mesa-devel libopenssl-devel gcc-c++ libjpeg-devel fltk-devel -BuildRequires: nasm gcc-c++ pkgconfig(xproto) pkgconfig(x11) pkgconfig(xext) pkgconfig(xtst) -BuildRequires: cmake autoconf automake libtool binutils-gold -BuildRequires: java-devel jpackage-utils +BuildRequires: Mesa-devel +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: cmake +BuildRequires: fltk-devel +BuildRequires: gcc-c++ +BuildRequires: gcc-c++ +BuildRequires: java-devel +BuildRequires: jpackage-utils +BuildRequires: libjpeg-devel +BuildRequires: libopenssl-devel +BuildRequires: libtool +BuildRequires: nasm +BuildRequires: xorg-x11-server-sdk +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xproto) +BuildRequires: pkgconfig(xtst) # Because of keytool to build java client +BuildRequires: libgcrypt-devel +BuildRequires: libgpg-error-devel BuildRequires: mozilla-nss -BuildRequires: xorg-x11-libICE-devel xorg-x11-libSM-devel pkgconfig(libtasn1) pkgconfig(gnutls) libgcrypt-devel libgpg-error-devel pam-devel +BuildRequires: pam-devel +BuildRequires: pkg-config +BuildRequires: xmlto +BuildRequires: xorg-x11-libICE-devel +BuildRequires: xorg-x11-libSM-devel +BuildRequires: pkgconfig(bigreqsproto) >= 1.1.0 +BuildRequires: pkgconfig(compositeproto) >= 0.4 +BuildRequires: pkgconfig(damageproto) >= 1.1 +BuildRequires: pkgconfig(dri) +BuildRequires: pkgconfig(fixesproto) >= 4.1 +BuildRequires: pkgconfig(fontsproto) BuildRequires: pkgconfig(fontutil) -BuildRequires: pkg-config xmlto pkgconfig(pixman-1) >= 0.15.20 pkgconfig(glproto) pkgconfig(gl) pkgconfig(dri) pkgconfig(openssl) -BuildRequires: pkgconfig(fixesproto) >= 4.1 pkgconfig(damageproto) >= 1.1 pkgconfig(xcmiscproto) >= 1.2.0 pkgconfig(xtrans) >= 1.2.2 -BuildRequires: pkgconfig(bigreqsproto) >= 1.1.0 pkgconfig(xproto) >= 7.0.17 pkgconfig(randrproto) >= 1.2.99.3 pkgconfig(renderproto) >= 0.11 -BuildRequires: pkgconfig(xextproto) >= 7.0.99.3 pkgconfig(inputproto) >= 1.9.99.902 pkgconfig(kbproto) >= 1.0.3 pkgconfig(fontsproto) -BuildRequires: pkgconfig(videoproto) pkgconfig(compositeproto) >= 0.4 pkgconfig(recordproto) >= 1.13.99.1 pkgconfig(scrnsaverproto) >= 1.1 -BuildRequires: pkgconfig(resourceproto) pkgconfig(xineramaproto) pkgconfig(xkbfile) pkgconfig(xau) pkgconfig(xdmcp) pkgconfig(xfont) >= 1.4.2 +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(glproto) +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(inputproto) >= 1.9.99.902 +BuildRequires: pkgconfig(kbproto) >= 1.0.3 +BuildRequires: pkgconfig(libtasn1) +BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(pciaccess) >= 0.8.0 -URL: http://sourceforge.net/apps/mediawiki/tigervnc/ +BuildRequires: pkgconfig(pixman-1) >= 0.15.20 +BuildRequires: pkgconfig(randrproto) >= 1.2.99.3 +BuildRequires: pkgconfig(recordproto) >= 1.13.99.1 +BuildRequires: pkgconfig(renderproto) >= 0.11 +BuildRequires: pkgconfig(resourceproto) +BuildRequires: pkgconfig(scrnsaverproto) >= 1.1 +BuildRequires: pkgconfig(videoproto) +BuildRequires: pkgconfig(xau) +BuildRequires: pkgconfig(xcmiscproto) >= 1.2.0 +BuildRequires: pkgconfig(xdmcp) +BuildRequires: pkgconfig(xextproto) >= 7.0.99.3 +BuildRequires: pkgconfig(xfont) >= 1.4.2 +BuildRequires: pkgconfig(xineramaproto) +BuildRequires: pkgconfig(xkbfile) +BuildRequires: pkgconfig(xproto) >= 7.0.17 +BuildRequires: pkgconfig(xtrans) >= 1.2.2 +Url: http://sourceforge.net/apps/mediawiki/tigervnc/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Group: System/X11/Servers/XF86_4 Summary: A high-performance, platform-neutral implementation of VNC +License: GPL-2.0 and MIT +Group: System/X11/Servers/XF86_4 Source1: tigervnc-1.3.0.tar.bz2 Source2: xorg-server-1.13.0.tar.bz2 Source3: vnc.xinetd @@ -142,7 +186,9 @@ popd install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/xinetd.d/vnc +%ifnarch s390x install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-libvnc.conf +%endif install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/vnc-server install -D -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/vnc-httpd install -D -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}/vnc_inetd_httpd @@ -177,14 +223,24 @@ %exclude /usr/%{_lib}/xorg/protocol.txt %exclude /usr/%{_lib}/xorg/modules/extensions/libvnc.la +%ifnarch s390x %{_libdir}/xorg/modules/extensions/libvnc.so +%else +%exclude %{_libdir}/xorg/modules +%exclude %{_libdir}/xorg/modules/extensions +%exclude %{_libdir}/xorg/modules/extensions/libvnc.so +%endif %exclude /var/lib/xkb/compiled/README.compiled /etc/sysconfig/SuSEfirewall2.d/services/vnc-server /etc/sysconfig/SuSEfirewall2.d/services/vnc-httpd +%ifnarch s390x %config(noreplace) /etc/X11/xorg.conf.d/10-libvnc.conf +%else +%exclude /etc/X11/xorg.conf.d +%endif %config(noreplace) /etc/xinetd.d/vnc %dir /etc/slp.reg.d %config(noreplace) /etc/slp.reg.d/vnc.reg -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
