Browse Source

new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10986 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 7 years ago
parent
commit
604e3f1656
1 changed files with 23 additions and 27 deletions
  1. 23 27
      t/tigervnc/tigervnc-vl.spec

+ 23 - 27
t/tigervnc/tigervnc-vl.spec

@@ -1,5 +1,5 @@
 Name:		tigervnc
-Version:	1.6.0
+Version:	1.7.1
 Release:	1%{?_dist_release}
 Summary:	A TigerVNC remote display system
 Group:		User Interface/Desktops
@@ -20,14 +20,13 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Provides:	vnc = 4.1.3, vnc-libs = 4.1.3, vnc-server = 4.1.3
 Obsoletes:	vnc < 4.1.3, vnc-libs < 4.1.3, vnc-server < 4.1.3
 
-BuildRequires:	automake, autoconf, libtool, gettext
-BuildRequires:	libX11-devel
+BuildRequires:	libX11-devel, automake, autoconf, libtool, gettext
 BuildRequires:	libXext-devel, xorg-x11-server-source, libXi-devel
 BuildRequires:	xorg-x11-xtrans-devel, xorg-x11-util-macros, libXtst-devel
 BuildRequires:	libdrm-devel, libXt-devel, pixman-devel libXfont-devel
 BuildRequires:	libxkbfile-devel, openssl-devel, libpciaccess-devel
 BuildRequires:	mesa-libGL-devel, libXinerama-devel, ImageMagick
-BuildRequires:  freetype2-devel, libXdmcp-devel
+BuildRequires:  freetype2-devel, libXdmcp-devel, libxshmfence-devel
 BuildRequires:	desktop-file-utils, java-devel, jpackage-utils
 BuildRequires:	libjpeg-turbo-devel, gnutls-devel, pam-devel
 BuildRequires:	cmake
@@ -40,18 +39,17 @@ Requires(postun):coreutils
 
 Requires:	hicolor-icon-theme
 
-Patch1:		tigervnc-cookie.patch
-Patch3:		tigervnc-libvnc-os.patch
-Patch4:		tigervnc11-rh692048.patch
-Patch5:		tigervnc-inetd-nowait.patch
-Patch7:		tigervnc-manpages.patch
-Patch8:		tigervnc-getmaster.patch
-Patch9:		tigervnc-shebang.patch
-Patch14:	tigervnc-xstartup.patch
-Patch15:	tigervnc-xserver118.patch
-# Patch17:	tigervnc-xorg118-QueueKeyboardEvents.patch
+Patch1:         tigervnc-1.7.0-xserver119-support.patch
+Patch2:         0001-Fix-inetd-not-working-with-xserver-1.19.patch
+Patch3:         tigervnc-libvnc-os.patch
+Patch7:         tigervnc-manpages.patch
+Patch8:         tigervnc-getmaster.patch
+Patch9:         tigervnc-shebang.patch
+Patch14:        tigervnc-xstartup.patch
+Patch18:        tigervnc-utilize-system-crypto-policies.patch
 
 # This is tigervnc-%{version}/unix/xserver116.patch rebased on the latest xorg
+# Patch100:       tigervnc-xserver119.patch
 Patch100:       tigervnc-xserver116-rebased.patch
 
 %description
@@ -98,9 +96,9 @@ to the TigerVNC server.
 %prep
 %setup -q
 
-%patch1 -p1 -b .cookie
+%patch1 -p1 -b .xserver119
+%patch2 -p1 -b .inetd
 %patch3 -p1 -b .libvnc-os
-%patch4 -p1 -b .rh692048
 
 cp -r /usr/share/xorg-x11-server-source/* unix/xserver || exit 1
 cp -a %{SOURCE1000} unix/xserver/hw/xfree86/ || exit 1
@@ -111,10 +109,6 @@ done
 %patch100 -p1 -b .xserver116-rebased
 popd
 
-# Applied Debian patch to fix busy loop when run from inetd in nowait
-# mode (bug #920373).
-%patch5 -p1 -b .inetd-nowait
-
 # Synchronise manpages and --help output (bug #980870).
 %patch7 -p1 -b .manpages
 
@@ -127,10 +121,8 @@ popd
 # Clearer xstartup file (bug #923655).
 %patch14 -p1 -b .xstartup
 
-# Allow build against xorg-x11-server-1.18.
-%patch15 -p1 -b .xserver118
-
-# %patch17 -p1 -b .xorg118-QueueKeyboardEvents
+# Utilize system-wide crypto policies
+%patch18 -p1 -b .utilize-system-crypto-policies.patch
 
 %build
 #export CFLAGS="$RPM_OPT_FLAGS -fpic"
@@ -170,7 +162,7 @@ popd
 # Build Java applet
 pushd java
 %{cmake} .
-make
+JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" make
 popd
 
 %install
@@ -197,7 +189,7 @@ install -m644 tigervnc_$s.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x$s/a
 done
 popd
 
-mkdir $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	%{SOURCE6}
@@ -270,7 +262,11 @@ fi
 %{_datadir}/vnc/classes/*
 
 %changelog
-* Sun Jan 10 2016 Munehiro Yamamoto <munepi@vinelinux.org> 1.6.0
+* Wed Apr  5 2017 Munehiro Yamamoto <munepi@vinelinux.org> 1.7.1-1
+- new upstream release
+- added BR: libxshmfence-devel
+
+* Sun Jan 10 2016 Munehiro Yamamoto <munepi@vinelinux.org> 1.6.0-1
 - new upstream release
 
 * Sun Mar 22 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.4.3-1