Browse Source

updated 2 packages

fltk-1.3.5-1

tigervnc-1.10.1-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12329 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 4 years ago
parent
commit
af6a0d12e6
2 changed files with 61 additions and 76 deletions
  1. 14 10
      f/fltk/fltk-vl.spec
  2. 47 66
      t/tigervnc/tigervnc-vl.spec

+ 14 - 10
f/fltk/fltk-vl.spec

@@ -6,7 +6,7 @@
 Summary:  C++ user interface toolkit
 Summary(ja):    C++用の軽量GUIライブラリキット
 Name:   fltk
-Version:  1.3.4
+Version:  1.3.5
 %define subversion 2
 
 %if "%{?snap:1}" == "1"
@@ -16,16 +16,16 @@ Release:  1%{?_dist_release}
 %endif
 
 # see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
-License:  LGPLv2+ with exceptions
-Group:    System Environment/Libraries
-URL:      http://www.fltk.org/
+License:        LGPLv2+ with exceptions
+Group:          System Environment/Libraries
+URL:            http://www.fltk.org/
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
 %if "%{?snap:1}" == "1"
 Source0:  http://ftp.easysw.com/pub/fltk/snapshots/fltk-1.3.x-%{snap}.tar.gz
 %else
-Source0:  http://ftp.easysw.com/pub/fltk/%{version}/%{name}-%{version}-%{subversion}-source.tar.bz2
+Source0:  https://www.fltk.org/pub/fltk/1.3.5/fltk-%{version}-source.tar.bz2
 %endif
 
 ## FIXME/TODO: upstream these asap -- Rex
@@ -79,7 +79,7 @@ Requires: %{name}-devel = %{version}-%{release}
 %if "%{?snap:1}" == "1"
 %setup -q -n fltk-1.3.x-%{snap}
 %else
-%setup -q -n %{name}-%{version}-%{subversion}
+%setup -q -n %{name}-%{version}
 %endif
 
 %patch1 -p1 -b .fltk_config
@@ -157,10 +157,11 @@ update-desktop-database >& /dev/null ||:
 
 %files
 %defattr(-,root,root,-)
-%doc ANNOUNCEMENT CHANGES COPYING CREDITS README
+%license COPYING
+%doc ANNOUNCEMENT CHANGES CREDITS README
 %{_libdir}/libfltk.so.*
 %{_libdir}/libfltk_forms.so.*
-%{_libdir}/libfltk_gl.so.*
+#{_libdir}/libfltk_gl.so.*
 %{_libdir}/libfltk_images.so.*
 
 %files devel
@@ -170,12 +171,12 @@ update-desktop-database >& /dev/null ||:
 %{_includedir}/FL/
 %{_libdir}/libfltk.so
 %{_libdir}/libfltk_forms.so
-%{_libdir}/libfltk_gl.so
+#{_libdir}/libfltk_gl.so
 %{_libdir}/libfltk_images.so
 %if "%{?_disable_static:1}" != "1"
 %{_libdir}/libfltk.a
 %{_libdir}/libfltk_forms.a
-%{_libdir}/libfltk_gl.a
+#{_libdir}/libfltk_gl.a
 %{_libdir}/libfltk_images.a
 %endif
 %{_mandir}/man1/fltk-config.1*
@@ -190,6 +191,9 @@ update-desktop-database >& /dev/null ||:
 
 
 %changelog
+* Mon Mar 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.3.5-1
+- updated to 1.3.5.
+
 * Sun Sep 02 2018 Toshiaki Ara <ara_t@384.jp> - 1.3.4-1
 - update to 1.3.4-2
 - remove old patch

+ 47 - 66
t/tigervnc/tigervnc-vl.spec

@@ -1,16 +1,20 @@
-Name:		tigervnc
-Version:	1.7.1
-Release:	1%{?_dist_release}
-Summary:	A TigerVNC remote display system
-Group:		User Interface/Desktops
-License:	GPLv2+
-URL:		http://www.tigervnc.com
-
-Source0:	%{name}-%{version}.tar.gz
-Source1:	vncserver.service.upstart
-Source2:	vncserver.sysconfig.upstart
-Source3:	10-libvnc.conf
-Source6:	vncviewer.desktop
+Name:           tigervnc
+Version:        1.10.1
+Release:        1%{?_dist_release}
+Summary:        A TigerVNC remote display system
+Group:          User Interface/Desktops
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPLv2+
+URL:            http://www.tigervnc.com
+
+Source0:        https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source1:        vncserver.service.upstart
+Source2:        vncserver.sysconfig.upstart
+Source3:        10-libvnc.conf
+Source6:        vncviewer.desktop
 
 #[ad-hoc] xorg-x11-server-source: has no hw/xfree86/Xorg.sh.in
 Source1000:     Xorg.sh.in
@@ -23,11 +27,12 @@ Obsoletes:	vnc < 4.1.3, vnc-libs < 4.1.3, vnc-server < 4.1.3
 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:	libdrm-devel, libXt-devel, pixman-devel libXfont2-devel
 BuildRequires:	libxkbfile-devel, openssl-devel, libpciaccess-devel
-BuildRequires:	mesa-libGL-devel, libXinerama-devel, ImageMagick
+BuildRequires:	mesa-libGL-devel, mesa-libEGL-devel
+BuildRequires:	libXinerama-devel, ImageMagick
 BuildRequires:  freetype2-devel, libXdmcp-devel, libxshmfence-devel
-BuildRequires:	desktop-file-utils, java-devel, jpackage-utils
+BuildRequires:	desktop-file-utils
 BuildRequires:	libjpeg-turbo-devel, gnutls-devel, pam-devel
 BuildRequires:	cmake
 # TigerVNC 1.4.x requires fltk 1.3.3 for keyboard handling support
@@ -39,18 +44,15 @@ Requires(postun):coreutils
 
 Requires:	hicolor-icon-theme
 
-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
+Patch1:         tigervnc-manpages.patch
+Patch2:         tigervnc-getmaster.patch
+Patch3:         tigervnc-shebang.patch
+Patch4:         tigervnc-xstartup.patch
+Patch5:         tigervnc-utilize-system-crypto-policies.patch
+Patch7:         tigervnc-passwd-crash-with-malloc-checks.patch
+
+#Patch100:       tigervnc-xserver120.patch
 
-# This is tigervnc-%{version}/unix/xserver116.patch rebased on the latest xorg
-# Patch100:       tigervnc-xserver119.patch
-Patch100:       tigervnc-xserver116-rebased.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -81,52 +83,42 @@ This package includes the following components:
  - set of utilities: It makes usage of TigerVNC server more user friendly
  - x0vncserver program: It can export your active X session
 
-%package server-applet
-Summary:	Java TigerVNC viewer applet for TigerVNC server
-Group:		User Interface/X
-Requires:	tigervnc-server, java, jpackage-utils
-BuildArch:	noarch
-
-%description server-applet
-The Java TigerVNC viewer applet for web browsers. 
-Install this package to allow clients to use web browser when connect 
-to the TigerVNC server.
-
 
 %prep
 %setup -q
 
-%patch1 -p1 -b .xserver119
-%patch2 -p1 -b .inetd
-%patch3 -p1 -b .libvnc-os
-
 cp -r /usr/share/xorg-x11-server-source/* unix/xserver || exit 1
 cp -a %{SOURCE1000} unix/xserver/hw/xfree86/ || exit 1
 pushd unix/xserver
 for all in `find . -type f -perm -001`; do
 	chmod -x "$all"
 done
-%patch100 -p1 -b .xserver116-rebased
+#patch100 -p1 -b .xserver116-rebased
+patch -p1 < ../xserver119.patch
 popd
 
 # Synchronise manpages and --help output (bug #980870).
-%patch7 -p1 -b .manpages
+%patch1 -p1 -b .manpages
 
 # libvnc.so: don't use unexported GetMaster function (bug #744881 again).
-%patch8 -p1 -b .getmaster
+%patch2 -p1 -b .getmaster
 
 # Don't use shebang in vncserver script.
-%patch9 -p1 -b .shebang
+%patch3 -p1 -b .shebang
 
 # Clearer xstartup file (bug #923655).
-%patch14 -p1 -b .xstartup
+%patch4 -p1 -b .xstartup
 
 # Utilize system-wide crypto policies
-%patch18 -p1 -b .utilize-system-crypto-policies.patch
+%patch5 -p1 -b .utilize-system-crypto-policies
+
+%patch7 -p1 -b .tigervnc-passwd-crash-with-malloc-checks
 
 %build
 #export CFLAGS="$RPM_OPT_FLAGS -fpic"
 #export CXXFLAGS="$CFLAGS"
+export CFLAGS="$RPM_OPT_FLAGS -fpic"
+export CXXFLAGS="$CFLAGS -std=c++11"
 
 %{cmake} .
 make %{?_smp_mflags}
@@ -159,12 +151,6 @@ pushd media
 make
 popd
 
-# Build Java applet
-pushd java
-%{cmake} .
-JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" make
-popd
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -194,13 +180,6 @@ desktop-file-install \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	%{SOURCE6}
 
-# Install Java applet
-pushd java
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/vnc/classes
-install -m755 VncViewer.jar $RPM_BUILD_ROOT%{_datadir}/vnc/classes
-install -m644 com/tigervnc/vncviewer/index.vnc $RPM_BUILD_ROOT%{_datadir}/vnc/classes
-popd
-
 %find_lang %{name} %{name}.lang
 
 # remove unwanted files
@@ -233,7 +212,8 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README.txt LICENCE.TXT
+%license LICENCE.TXT
+%doc README.txt
 %{_bindir}/vncviewer
 %{_datadir}/applications/*
 %{_mandir}/man1/vncviewer.1*
@@ -256,12 +236,13 @@ fi
 %{_libdir}/xorg/modules/extensions/libvnc.so
 %config %{_sysconfdir}/X11/xorg.conf.d/10-libvnc.conf
 
-%files server-applet
-%defattr(-,root,root,-)
-%doc java/com/tigervnc/vncviewer/README
-%{_datadir}/vnc/classes/*
 
 %changelog
+* Mon Mar 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.1-1
+- new upstream release.
+- replaced all patches.
+- dropped java stuff.
+
 * Wed Apr  5 2017 Munehiro Yamamoto <munepi@vinelinux.org> 1.7.1-1
 - new upstream release
 - added BR: libxshmfence-devel