Browse Source

updated 3 packages

freerdp-2.1.0-1

imlib2-1.6.1-1

remmina-1.4.3-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12400 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 2 years ago
parent
commit
1e529a6439
3 changed files with 47 additions and 26 deletions
  1. 13 11
      f/freerdp/freerdp-vl.spec
  2. 12 7
      i/imlib2/imlib2-vl.spec
  3. 22 8
      r/remmina/remmina-vl.spec

+ 13 - 11
f/freerdp/freerdp-vl.spec

@@ -1,20 +1,17 @@
-%define rcnumber rc4
+#define rcnumber rc4
 
 Name:           freerdp
 Summary:        Remote Desktop Protocol client
 Summary(ja):    リモートデスクトッププロトコルクライアント
-Version:        2.0.0
-Release:        0%{?rcnumber:.%{rcnumber}}%{?_dist_release}
-
+Version:        2.1.0
+Release:        1%{?rcnumber:.%{rcnumber}}%{?_dist_release}
 Group:          Applications/Internet
-License:        GPLv2+
-URL:            http://www.freerdp.com/
-
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
-Source0:	https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-%{version}%{?rcnumber:-%{rcnumber}}.tar.gz
-# https://github.com/FreeRDP/FreeRDP/commit/165d39a290a109c0af16a1d223d1426cb524a844 backport
+License:        GPLv2+
+URL:            http://www.freerdp.com/
+Source0:        https://pub.freerdp.com/releases/freerdp-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  cmake
@@ -28,6 +25,7 @@ BuildRequires:  libXext-devel
 BuildRequires:  libXinerama-devel
 BuildRequires:  libxkbfile-devel
 BuildRequires:  libXv-devel
+BuildRequires:  libusb1-devel
 BuildRequires:  zlib-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pulseaudio-libs-devel
@@ -73,7 +71,7 @@ developing applications that use %{name}-libs.
 
 
 %prep
-%setup -q -n FreeRDP-%{version}%{?rcnumber:-%{rcnumber}}
+%setup -q
 
 cat << EOF > xfreerdp.desktop 
 [Desktop Entry]
@@ -163,7 +161,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files libs
 %defattr(-,root,root,-)
-%doc LICENSE README ChangeLog
+%license LICENSE
+%doc README ChangeLog
 %{_libdir}/lib*.so.*
 %{_mandir}/man7/wlog.*
 
@@ -176,6 +175,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat May 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.0-1
+- updated to 2.1.0.
+
 * Sun Dec 02 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.0-1.rc4
 - updated to 2.0.0-RC4.
 - dropped all patches.

+ 12 - 7
i/imlib2/imlib2-vl.spec

@@ -1,16 +1,16 @@
 Summary: Powerful image loading and rendering library
 Summary(ja): 強力な画像ロード & レンダリングライブラリ
 Name: imlib2
-Version: 1.4.9
+Version: 1.6.1
 Release: 1%{?_dist_release}
-License: BSD
 Group: System Environment/Libraries
-URL: http://www.enlightenment.org/Libraries/Imlib2
-Source: http://downloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.bz2
-#Patch1:         imlib2-1.4.3-cve-2010-0991.patch
 Vendor: Project Vine
 Distribution: Vine Linux
 
+License: BSD
+Source: https://downloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.bz2
+Patch1000: CVE-2020-12761.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -79,7 +79,7 @@ loader_id3 - id3 tag image loader/saver
 
 %prep
 %setup -q
-#%patch1 -p1
+%patch1000 -p1
 
 %build
 %configure --disable-static
@@ -102,7 +102,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,0755)
-%doc AUTHORS README COPYING doc/index.html doc/imlib2.gif doc/blank.gif
+%license COPYING
+%doc AUTHORS README doc/index.html doc/imlib2.gif doc/blank.gif
 %{_libdir}/lib*.so.*
 %{_bindir}/imlib2_*
 %{_datadir}/imlib2
@@ -126,6 +127,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/imlib2/loaders/*.so
 
 %changelog
+* Sat May 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.1-1
+- new upstream release.
+- added Patch1000 to fix CVE-2020-12761.
+
 * Wed May 18 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.9-1
 - new upstream release.
 

+ 22 - 8
r/remmina/remmina-vl.spec

@@ -1,18 +1,18 @@
+%bcond_with telepathy
+
 %define _unpackaged_files_terminate_build 1
 
 Summary: 	Remote Desktop Connection utility
 Summary(ja): 	リモートデスクトップ接続ユーティリティ
 Name: 		remmina
-Version: 	1.2.32.1
+Version: 	1.4.3
 Release:    1%{?_dist_release}
-
-License: 	GPLv2+ and MIT
 Group: 		User Interface/Desktops
-URL: 		http://remmina.sourceforge.net/
-
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
+License: 	GPLv2+ and MIT
+URL: 		https://remmina.org/
 Source0:	https://gitlab.com/Remmina/Remmina/-/archive/v%{version}/Remmina-v%{version}.tar.bz2
 
 # Cmake helper file to easy build plugins outside remmina source tree
@@ -26,15 +26,18 @@ BuildRequires:  gtk3-devel
 BuildRequires:  vte3-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libssh-devel
-BuildRequires:  avahi-ui-devel
+BuildRequires:  avahi-ui-gtk3-devel
 BuildRequires:  libxkbfile-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gnutls-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libvncserver-devel
 BuildRequires:  libsecret-devel
+BuildRequires:  libsodium-devel
 BuildRequires:  freerdp-devel >= 1.0.1
+%if %{with telepathy}
 BuildRequires:  telepathy-glib-devel
+%endif
 BuildRequires:  json-glib-devel
 BuildRequires:  libsoup-devel
 
@@ -131,7 +134,7 @@ tiny netbooks.
 This package contains the Remote Desktop Protocol (RDP) plugin for the
 Remmina remote desktop client.
 
-
+%if %{with telepathy}
 %package        plugins-telepathy
 Summary:        Telepathy plugin for Remmina Remote Desktop Client
 Summary(ja):	Remmina の Telepathy プラグイン
@@ -146,7 +149,7 @@ tiny netbooks.
 
 This package contains the Telepathy plugin for the Remmina remote
 desktop  client.
-
+%endif
 
 %package        plugins-st
 Summary:        Simple Terminal plugin for Remmina Remote Desktop Client
@@ -229,7 +232,9 @@ LDFLAGS="-Wl,-z,relro -Wl,--no-as-needed"
   -DWITH_LIBSSH=ON \
   -DWITH_PTHREAD=ON \
   -DWITH_LIBSSH=ON \
+%if %{with telepathy}
   -DWITH_TELEPATHY=ON \
+%endif
   -DWITH_VTE=ON \
   -DWITH_ZLIB=ON \
   -DWITH_GETTEXT=ON \
@@ -277,16 +282,20 @@ fi
 %license LICENSE
 %doc AUTHORS ChangeLog README.md
 %{_bindir}/%{name}
+%{_bindir}/%{name}-file-wrapper
 %{_datadir}/metainfo/*.appdata.xml
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/actions/*.*
 %{_datadir}/icons/hicolor/*/apps/*.*
 %{_datadir}/icons/hicolor/*/emblems/remmina-*.svg
+%{_datadir}/icons/hicolor/apps/*.*
+%{_datadir}/icons/hicolor/scalable/panel/remmina-*.svg
 %{_datadir}/mime/packages/*.xml
 %{_datadir}/%{name}/
 %dir %{_libdir}/remmina/
 %dir %{_libdir}/remmina/plugins/
 %{_mandir}/man1/%{name}.*
+%{_mandir}/man1/%{name}-file-wrapper.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -313,11 +322,13 @@ fi
 %{_datadir}/icons/hicolor/*/emblems/remmina-rdp-ssh-symbolic.svg
 %{_datadir}/icons/hicolor/*/emblems/remmina-rdp-symbolic.svg
 
+%if %{with telepathy}
 %files plugins-telepathy
 %defattr(-,root,root,-)
 %{_libdir}/remmina/plugins/remmina-plugin-telepathy.so
 %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Remmina.service
 %{_datadir}/telepathy/clients/Remmina.client
+%endif
 
 %files plugins-st
 %{_libdir}/remmina/plugins/remmina-plugin-st.so
@@ -344,6 +355,9 @@ fi
 %{_mandir}/man1/remmina-gnome.1.*
 
 %changelog
+* Sat May 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.3-1
+- new upstream release.
+
 * Sun Dec 02 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.32.1-1
 - new upstream release.
 - dropped all patches.