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

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

@@ -1,16 +1,16 @@
 Summary: Powerful image loading and rendering library
 Summary: Powerful image loading and rendering library
 Summary(ja): 強力な画像ロード & レンダリングライブラリ
 Summary(ja): 強力な画像ロード & レンダリングライブラリ
 Name: imlib2
 Name: imlib2
-Version: 1.4.9
+Version: 1.6.1
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-License: BSD
 Group: System Environment/Libraries
 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
 Vendor: Project Vine
 Distribution: Vine Linux
 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libjpeg-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libpng-devel
@@ -79,7 +79,7 @@ loader_id3 - id3 tag image loader/saver
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-#%patch1 -p1
+%patch1000 -p1
 
 
 %build
 %build
 %configure --disable-static
 %configure --disable-static
@@ -102,7 +102,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %files
 %defattr(-,root,root,0755)
 %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.*
 %{_libdir}/lib*.so.*
 %{_bindir}/imlib2_*
 %{_bindir}/imlib2_*
 %{_datadir}/imlib2
 %{_datadir}/imlib2
@@ -126,6 +127,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/imlib2/loaders/*.so
 %{_libdir}/imlib2/loaders/*.so
 
 
 %changelog
 %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
 * Wed May 18 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.9-1
 - new upstream release.
 - new upstream release.
 
 

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

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