From 7d8bfedfce9ef9a3021d1310b767dd794c71721e Mon Sep 17 00:00:00 2001 From: Sérgio M. Basto Date: Feb 25 2020 01:20:04 +0000 Subject: Update to 0.9.16 Java viewers moved to https://github.com/LibVNC/libvncserver/tree/master/webclients/java-applet classes and jars have been removed from upstream sources. Remove support to EL5 Encoding and permissions of files seems that are correct, no need to fix. rpmlint doesn't find any hardcoded rpath --- diff --git a/.gitignore b/.gitignore index e673320..604f506 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /x11vnc-0.9.13.tar.gz /x11vnc-0.9.8-disableRpath.patch /x11vnc-0.9.14-dev.tar.gz +/x11vnc-0.9.16.tar.gz diff --git a/sources b/sources index 66c2617..2787f45 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -823ad4a93100f11a74c8c8fd46695b2f x11vnc-0.9.14-dev.tar.gz +SHA512 (x11vnc-0.9.16.tar.gz) = 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec diff --git a/x11vnc-0.9.8-disableRpath.patch b/x11vnc-0.9.8-disableRpath.patch deleted file mode 100644 index 3a85391..0000000 --- a/x11vnc-0.9.8-disableRpath.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- configure.orig 2009-06-19 18:44:21.000000000 +0400 -+++ configure 2009-07-29 16:01:13.000000000 +0400 -@@ -4183,7 +4183,7 @@ - "SunOS 5"*) - echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 - echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 -- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" -+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4233,9 +4233,9 @@ - if test $ac_R_nospace = yes; then - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 -- X_LIBS="$X_LIBS -R$x_libraries" -+ X_LIBS="$X_LIBS" - else -- LIBS="$ac_xsave_LIBS -R $x_libraries" -+ LIBS="$ac_xsave_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4285,7 +4285,7 @@ - if test $ac_R_space = yes; then - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 -- X_LIBS="$X_LIBS -R $x_libraries" -+ X_LIBS="$X_LIBS" - else - echo "$as_me:$LINENO: result: neither works" >&5 - echo "${ECHO_T}neither works" >&6 -@@ -6705,7 +6705,7 @@ - if test ! -z "$HAVE_LIBXFIXES" -o ! -z "$HAVE_LIBXDAMAGE"; then - # need /usr/sfw/lib in RPATH for Solaris 10 and later - case `(uname -sr) 2>/dev/null` in -- "SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS -R/usr/sfw/lib" ;; -+ "SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS" ;; - esac - fi - if test ! -z "$HAVE_LIBXRANDR"; then -@@ -7026,9 +7026,9 @@ - if test "x$ld_minus_R" = "xno"; then - : - elif test "x$GCC" = "xyes"; then -- LDFLAGS="$LDFLAGS -Xlinker -R$with_ssl/lib" -+ LDFLAGS="$LDFLAGS -Xlinker" - else -- LDFLAGS="$LDFLAGS -R$with_ssl/lib" -+ LDFLAGS="$LDFLAGS" - fi - fi - echo "$as_me:$LINENO: checking for RAND_file_name in -lcrypto" >&5 -@@ -7910,13 +7910,6 @@ - fi - if test "x$with_system_libvncserver" != "xyes"; then - rflag="" -- if test "x$ld_minus_R" = "xno"; then -- : -- elif test "x$GCC" = "xyes"; then -- rflag="-Xlinker -R$with_system_libvncserver/lib" -- else -- rflag="-R$with_system_libvncserver/lib" -- fi - cmd="$with_system_libvncserver/bin/libvncserver-config" - if $cmd --version 1>/dev/null 2>&1; then - cvers=`$cmd --version 2>/dev/null` -@@ -7958,9 +7951,9 @@ - if test "x$ld_minus_R" = "xno"; then - : - elif test "x$GCC" = "xyes"; then -- rflag=" -Xlinker -R$rprefix/lib " -+ rflag=" -Xlinker " - else -- rflag=" -R$rprefix/lib " -+ rflag=" " - fi - cvers=`libvncserver-config --version 2>/dev/null` - cscore=`echo "$cvers" | tr '.' ' ' | awk '{print 10000 * $1 + 100 * $2 + $3}'` -@@ -8039,9 +8032,9 @@ - : - elif test "x$GCC" = "xyes"; then - # this is not complete... in general a rat's nest. -- LDFLAGS="$LDFLAGS -Xlinker -R$with_jpeg/lib" -+ LDFLAGS="$LDFLAGS -Xlinker" - else -- LDFLAGS="$LDFLAGS -R$with_jpeg/lib" -+ LDFLAGS="$LDFLAGS" - fi - fi - if test "${ac_cv_header_jpeglib_h+set}" = set; then -@@ -8320,9 +8313,9 @@ - if test "x$ld_minus_R" = "xno"; then - : - elif test "x$GCC" = "xyes"; then -- LDFLAGS="$LDFLAGS -Xlinker -R$with_zlib/lib" -+ LDFLAGS="$LDFLAGS -Xlinker" - else -- LDFLAGS="$LDFLAGS -R$with_zlib/lib" -+ LDFLAGS="$LDFLAGS" - fi - fi - if test "${ac_cv_header_zlib_h+set}" = set; then diff --git a/x11vnc.spec b/x11vnc.spec index 25cc252..103aa09 100644 --- a/x11vnc.spec +++ b/x11vnc.spec @@ -1,40 +1,39 @@ +# https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/master/f/buildflags.md#legacy-fcommon +%define _legacy_common_support 1 + Summary: VNC server for the current X11 session Summary(ru): VNC-сервер для текущей сессии X11 -Name: x11vnc -Version: 0.9.14 -Release: 13%{?dist} +Name: x11vnc +Version: 0.9.16 +Release: 1%{?dist} License: GPLv2 -URL: http://www.karlrunge.com/x11vnc/ -Source0: http://%{name}.sourceforge.net/dev/%{name}-%{version}-dev.tar.gz +URL: https://github.com/LibVNC/x11vnc +Source0: https://github.com/LibVNC/x11vnc/archive/%{version}/%{name}-%{version}.tar.gz -# Actually only /usr/bin/wish needed. -Requires: tk -BuildRequires: gcc +BuildRequires: gcc +BuildRequires: libtool BuildRequires: avahi-devel -BuildRequires: libjpeg-devel openssl-devel zlib-devel +BuildRequires: libjpeg-devel +BuildRequires: openssl-devel +BuildRequires: zlib-devel BuildRequires: libX11-devel -BuildRequires: libXdamage-devel libXext-devel libXfixes-devel -BuildRequires: libXinerama-devel libXrandr-devel libXtst-devel +BuildRequires: libXdamage-devel +BuildRequires: libXext-devel +BuildRequires: libXfixes-devel +BuildRequires: libXinerama-devel +BuildRequires: libXrandr-devel +BuildRequires: libXtst-devel BuildRequires: libvncserver-devel BuildRequires: xorg-x11-proto-devel -# In Fedora 12 (and Epel 6) /usr/include/X11/extensions/XInput.h in libXi-devel but in -# previous versions in xorg-x11-proto-devel /usr/include/X11/extensions/shmproto.h -# placed in libXext-devel in F12 and in xorg-x11-proto-devel early. -%if 0%{?fedora} > 11 || 0%{?rhel} > 5 BuildRequires: libXi-devel libXext-devel -%endif Requires: Xvfb +# Actually only /usr/bin/wish needed. +Requires: tk -# Fedora don't want hardcoded rpaths. -Patch1: x11vnc-0.9.8-disableRpath.patch - -# Package intended to EL-5 too, so we still need define BuildRoot - -# Required java not available on EL-5.ppc, EL-6.ppc64 -%if ! ( ( "%{_arch}"=="ppc" && 5 == 0%{?rhel} ) || ( "%{_arch}"=="ppc64" && 6 == 0%{?rhel} ) ) -%global java_support 1 -%endif +# Java viewers now are available on +# https://github.com/LibVNC/libvncserver/tree/master/webclients/java-applet +Obsoletes: x11vnc-javaviewers < 0.9.14-14 %description What WinVNC is to Windows x11vnc is to X Window System, i.e. a server @@ -55,99 +54,39 @@ versatile and productive while still easy to use program. в гибкий и производительный инструмент, который, однако, остаётся прост в использовании. -%if 0%{?java_support} -%package javaviewers -Version: %{version} -Summary: VNC clients (browser java applets) -Summary(ru): VNC-клиенты в виде java-аплетов для браузеров -Requires: %{name} = %{version}-%{release} -License: GPLv2+ -# EL-5 does not support noarch subpackages ( https://fedorahosted.org/fedora-infrastructure/ticket/1772#comment:4 ) -%if 0%{?fedora} > 9 || 0%{?rhel} > 5 -BuildArch: noarch -%endif -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: jpackage-utils - -%description javaviewers -The package contains the corresponding java clients for %{name}. They -can be used with any java-enabled browser and provide an easy access to -the server without the need to install software on the client machine. - -%description -l ru javaviewers -Java-клиенты для использования совместно с %{name} прямо из браузера -без необходимости ставить какой бы то ни было софт. - -Должно по идее работать с любым современным браузером, где есть -поддержка Java -%endif # EL.ppc %prep %setup -q -%patch1 -p0 -b .rpath -# fix source perms for the -debuginfo package rpmlint warnings -find -name "*.c" -o -name "*.h" -exec %{__chmod} 0644 {} \; - -for file in README AUTHORS; do - # ISO-8859-1 is my assumption. - iconv -f ISO-8859-1 -t UTF-8 "$file" > "$file.new" - touch --reference "$file" "$file.new" - mv "$file.new" "$file" -done - -# Delete prebuilt binaries -find -name '*.jar' -exec rm {} \; %build -%configure --with-system-libvncserver --without-tightvnc-filetransfer - -%if 0%{?java_support} -# First rebuild jars, what have been removed in %%prep. -pushd classes/ssl/src -%{__make} %{?_smp_mflags} - # Alternative to patch Makefiles. - for jarfile in *.jar; do - %{__ln_s} src/$jarfile ../; - %{__ln_s} ssl/src/$jarfile ../../; - done -popd -%else -%{__rm} -rf classes -sed -ri 's/(DUST_)?SUBDIRS = x11vnc classes/\1SUBDIRS = x11vnc/' Makefile -%endif - -%{__make} %{?_smp_mflags} +./autogen.sh +%configure --with-system-libvncserver --without-tightvnc-filetransfer +%make_build -%install -%{__rm} -rf %{buildroot} -%{__make} install DESTDIR="%{buildroot}" -%if 0%{?java_support} -# And Java viewers -pushd classes/ssl -%{__make} install DESTDIR="%{buildroot}" -popd +%install +%make_install -# Rename README file to avoid name bump -%{__mv} classes/ssl/src/tight/README classes/ssl/src/tight/README.tight -%{__mv} classes/ssl/src/ultra/README classes/ssl/src/ultra/README.ultra -%endif %files -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%license COPYING +%doc ChangeLog NEWS README %{_mandir}/man1/x11vnc.1* %{_bindir}/x11vnc +%{_bindir}/Xdummy %{_datadir}/applications/x11vnc.desktop -%if 0%{?java_support} -%files javaviewers -%doc classes/ssl/README classes/ssl/src/tight/README.tight classes/ssl/src/ultra/README.ultra -%{_datadir}/%{name} -%exclude %{_datadir}/%{name}/classes/ssl/README -%endif - %changelog +* Tue Feb 11 2020 Sérgio Basto - 0.9.16-1 +- Update to 0.9.16 +- Java viewers moved to + https://github.com/LibVNC/libvncserver/tree/master/webclients/java-applet +- classes and jars have been removed from upstream sources. +- Remove support to EL5 +- Encoding and permissions of files seems that are correct, no need to fix. +- rpmlint doesn't find any hardcoded rpath + * Fri Jan 31 2020 Fedora Release Engineering - 0.9.14-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild