Browse Source

freerdp-2.0.0-0.rc4, remmina-1.2.32.1-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11966 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 5 years ago
parent
commit
191fcefd22
2 changed files with 179 additions and 167 deletions
  1. 56 51
      f/freerdp/freerdp-vl.spec
  2. 123 116
      r/remmina/remmina-vl.spec

+ 56 - 51
f/freerdp/freerdp-vl.spec

@@ -1,40 +1,42 @@
+%define rcnumber rc4
+
 Name:           freerdp
 Name:           freerdp
 Summary:        Remote Desktop Protocol client
 Summary:        Remote Desktop Protocol client
 Summary(ja):    リモートデスクトッププロトコルクライアント
 Summary(ja):    リモートデスクトッププロトコルクライアント
-Version:        1.0.2
-Release:        2%{?_dist_release}
+Version:        2.0.0
+Release:        0%{?rcnumber:.%{rcnumber}}%{?_dist_release}
 
 
 Group:          Applications/Internet
 Group:          Applications/Internet
 License:        GPLv2+
 License:        GPLv2+
 URL:            http://www.freerdp.com/
 URL:            http://www.freerdp.com/
 
 
-Source0:	https://github.com/downloads/FreeRDP/FreeRDP/%{name}-%{version}.tar.gz
-# https://github.com/FreeRDP/FreeRDP/commit/165d39a290a109c0af16a1d223d1426cb524a844 backport
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 
-Patch0:         fastpath_send_input_pdu-sec_bytes.patch
-Patch1:         c10866db66c0d462ea7c2c38bb01740bcfb4fcb4.patch
-Patch2:         freerdp-1.0.2_xmlto.patch
+Source0:	https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-%{version}%{?rcnumber:-%{rcnumber}}.tar.gz
+# https://github.com/FreeRDP/FreeRDP/commit/165d39a290a109c0af16a1d223d1426cb524a844 backport
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  cmake
 BuildRequires:  cmake
 BuildRequires:  xmlto
 BuildRequires:  xmlto
-BuildRequires:  openssl-devel
+BuildRequires:  alsa-lib-devel
+BuildRequires:  cups-devel
 BuildRequires:  libX11-devel
 BuildRequires:  libX11-devel
-BuildRequires:  libXext-devel
-BuildRequires:  libXinerama-devel
 BuildRequires:  libXcursor-devel
 BuildRequires:  libXcursor-devel
 BuildRequires:  libXdamage-devel
 BuildRequires:  libXdamage-devel
-BuildRequires:  libXv-devel
+BuildRequires:  libXext-devel
+BuildRequires:  libXinerama-devel
 BuildRequires:  libxkbfile-devel
 BuildRequires:  libxkbfile-devel
+BuildRequires:  libXv-devel
+BuildRequires:  zlib-devel
+BuildRequires:  openssl-devel
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  pulseaudio-libs-devel
-BuildRequires:  alsa-lib-devel
-BuildRequires:  cups-devel
 BuildRequires:  pcsc-lite-devel
 BuildRequires:  pcsc-lite-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  desktop-file-utils
 
 
 Provides:       xfreerdp = %{version}-%{release}
 Provides:       xfreerdp = %{version}-%{release}
-Requires:       %{name}-libs = %{version}-%{release}, %{name}-plugins = %{version}-%{release}
-Requires:       %{name}-plugins = %{version}-%{release}
+Obsoletes:      freerdp-plugins < 2.0.0
+Requires:       %{name}-libs = %{version}-%{release}
 
 
 %description 
 %description 
 The xfreerdp Remote Desktop Protocol (RDP) client from the FreeRDP
 The xfreerdp Remote Desktop Protocol (RDP) client from the FreeRDP
@@ -58,18 +60,6 @@ in the RDP protocol.
 libfreerdpkbd implements functionality for handling keyboards in X.
 libfreerdpkbd implements functionality for handling keyboards in X.
 
 
 
 
-%package        plugins
-Summary:        Plugins for handling the standard RDP channels
-Summary(ja):    標準RDPチャンネルを扱うためのプラグイン
-Group:          System Environment/Libraries
-Requires:       %{name}-libs = %{version}-%{release}
-
-%description    plugins
-A set of plugins to the channel manager implementing the standard virtual
-channels extending RDP core functionality.  For example, sounds, clipboard
-sync, disk/printer redirection, etc.
-
-
 %package        devel
 %package        devel
 Summary:        Development files for %{name}
 Summary:        Development files for %{name}
 Summary(ja):    %{name}の開発ファイル
 Summary(ja):    %{name}の開発ファイル
@@ -83,10 +73,7 @@ developing applications that use %{name}-libs.
 
 
 
 
 %prep
 %prep
-%setup -q -n FreeRDP-%{version}
-#patch0 -p1
-#patch1 -p1
-%patch2 -p1
+%setup -q -n FreeRDP-%{version}%{?rcnumber:-%{rcnumber}}
 
 
 cat << EOF > xfreerdp.desktop 
 cat << EOF > xfreerdp.desktop 
 [Desktop Entry]
 [Desktop Entry]
@@ -103,41 +90,53 @@ EOF
 %build
 %build
 %cmake \
 %cmake \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \
+        -DWITH_ALSA=ON \
         -DWITH_CUPS=ON \
         -DWITH_CUPS=ON \
+        -DWITH_OPENSSL=ON \
         -DWITH_PCSC=ON \
         -DWITH_PCSC=ON \
-        -DWITH_PULSEAUDIO=ON \
+        -DWITH_PULSE=ON \
         -DWITH_X11=ON \
         -DWITH_X11=ON \
         -DWITH_XCURSOR=ON \
         -DWITH_XCURSOR=ON \
         -DWITH_XEXT=ON \
         -DWITH_XEXT=ON \
         -DWITH_XINERAMA=ON \
         -DWITH_XINERAMA=ON \
         -DWITH_XKBFILE=ON \
         -DWITH_XKBFILE=ON \
         -DWITH_XV=ON \
         -DWITH_XV=ON \
-        -DWITH_ALSA=ON \
+        -DWITH_ZLIB=ON \
         -DWITH_CUNIT=OFF \
         -DWITH_CUNIT=OFF \
         -DWITH_DIRECTFB=OFF \
         -DWITH_DIRECTFB=OFF \
         -DWITH_FFMPEG=OFF \
         -DWITH_FFMPEG=OFF \
-        -DWITH_SSE2=OFF \
-        -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \
+%ifarch x86_64
+    -DWITH_SSE2=ON \
+%else
+    -DWITH_SSE2=OFF \
+%endif
         .
         .
 
 
 
 
 make %{?_smp_mflags} 
 make %{?_smp_mflags} 
 
 
+pushd winpr/tools/makecert-cli
+make %{?_smp_mflags}
+popd
 
 
 %install
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+%makeinstall DESTDIR=%{buildroot}
+%makeinstall DESTDIR=%{buildroot} COMPONENT=tools
 
 
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+find %{buildroot} -name "*.a" -delete
 
 
 # No need for keymap files when using xkbfile
 # No need for keymap files when using xkbfile
 rm -rf $RPM_BUILD_ROOT/usr/share/freerdp
 rm -rf $RPM_BUILD_ROOT/usr/share/freerdp
 
 
-desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications xfreerdp.desktop
-install -p -D resources/FreeRDP_Icon_256px.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications xfreerdp.desktop
+install -p -D resources/FreeRDP_Icon_256px.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
 
 
 
 
 %clean
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 
 
 %post
 %post
@@ -153,29 +152,35 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%{_bindir}/xfreerdp
-%{_mandir}/man1/xfreerdp.*
 %{_datadir}/applications/xfreerdp.desktop
 %{_datadir}/applications/xfreerdp.desktop
 %{_datadir}/icons/hicolor/256x256/apps/%{name}.png
 %{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+%{_bindir}/winpr-hash
+%{_bindir}/winpr-makecert
+%{_bindir}/xfreerdp
+%{_mandir}/man1/winpr-hash.1.*
+%{_mandir}/man1/winpr-makecert.1.*
+%{_mandir}/man1/xfreerdp.1.*
 
 
 %files libs
 %files libs
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %doc LICENSE README ChangeLog
 %doc LICENSE README ChangeLog
-%{_libdir}/lib%{name}-*.so.*
-%dir %{_libdir}/%{name}/
-
-%files plugins
-%defattr(-,root,root,-)
-%{_libdir}/%{name}/*
+%{_libdir}/lib*.so.*
+%{_mandir}/man7/wlog.*
 
 
 %files devel
 %files devel
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%{_includedir}/%{name}/
-%{_libdir}/lib%{name}-*.so
-%{_libdir}/pkgconfig/%{name}.pc
+%{_includedir}/*
+%{_libdir}/cmake/*
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*.pc
 
 
 
 
 %changelog
 %changelog
+* 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.
+- dropped subpackage 'freerdp-plugins'.
+
 * Sun Jul 19 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.2-2
 * Sun Jul 19 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.2-2
 - add BuildRequires: alsa-lib-devel
 - add BuildRequires: alsa-lib-devel
 
 

+ 123 - 116
r/remmina/remmina-vl.spec

@@ -1,44 +1,25 @@
+%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.0.0
-Release:    5%{?_dist_release}
+Version: 	1.2.32.1
+Release:    1%{?_dist_release}
 
 
 License: 	GPLv2+ and MIT
 License: 	GPLv2+ and MIT
 Group: 		User Interface/Desktops
 Group: 		User Interface/Desktops
 URL: 		http://remmina.sourceforge.net/
 URL: 		http://remmina.sourceforge.net/
 
 
-Source0:	https://github.com/downloads/FreeRDP/Remmina/Remmina-%{version}.tar.gz
-#VCS: git:https://github.com/FreeRDP/Remmina.git
-
-# from lauchpad
-Source10:	remmina-ja.po
-
-# The following two patches will fix some linking errors
-# https://github.com/FreeRDP/Remmina/commit/503a008e
-Patch0:         remmina-1.0.0-fix-library-name.patch
-# https://github.com/FreeRDP/Remmina/commit/13f20367
-Patch1:         remmina-1.0.0-linker-error.patch
+Vendor:		Project Vine
+Distribution:	Vine Linux
 
 
-# The following 4 patches are needed to add clipboard support (#818155)
-# https://github.com/FreeRDP/Remmina/commit/3ebdd6e7
-Patch2:         remmina-1.0.0-add-clipboard-support.patch
-# https://github.com/FreeRDP/Remmina/commit/97c2af8c
-Patch3:         remmina-1.0.0-clipboard-bugfix.patch
-# https://github.com/FreeRDP/Remmina/commit/84327f81
-Patch4:         remmina-1.0.0-some-more-clipboard-fixes.patch
-# https://github.com/FreeRDP/Remmina/commit/c1ef3a16
-Patch5:		remmina-1.0.0-disconnect-signal-handler-after-disconnect.patch
+Source0:	https://gitlab.com/Remmina/Remmina/-/archive/v%{version}/Remmina-v%{version}.tar.bz2
 
 
-# https://github.com/FreeRDP/Remmina/commit/6ee20289
-Patch10:        remmina-1.0.0-fix-crashes-in-some-cases.patch
-# https://github.com/FreeRDP/Remmina/commit/b2277827
-Patch11:        remmina-1.0.0-fix-memory-leak.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=819976
-Patch20:        remmina-1.0.0-dsofix.patch
-
-Patch100:		remmina-1.0.0-vte3.patch
+# Cmake helper file to easy build plugins outside remmina source tree
+# See http://www.muflone.com/remmina-plugin-rdesktop/english/install.html which
+# use http://www.muflone.com/remmina-plugin-builder/ with remmina bundled source.
+# So we can't use it directly only as instructions.
+Source1:       pluginBuild-CMakeLists.txt
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  gtk3-devel
 BuildRequires:  gtk3-devel
@@ -51,9 +32,11 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  gnutls-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libvncserver-devel
 BuildRequires:  libvncserver-devel
-BuildRequires:  libgnome-keyring-devel
+BuildRequires:  libsecret-devel
 BuildRequires:  freerdp-devel >= 1.0.1
 BuildRequires:  freerdp-devel >= 1.0.1
 BuildRequires:  telepathy-glib-devel
 BuildRequires:  telepathy-glib-devel
+BuildRequires:  json-glib-devel
+BuildRequires:  libsoup-devel
 
 
 BuildRequires:  cmake
 BuildRequires:  cmake
 BuildRequires:  gettext
 BuildRequires:  gettext
@@ -81,30 +64,30 @@ Requires:       pkgconfig
 Header files and libraries for building a extension library for the
 Header files and libraries for building a extension library for the
 remmina.
 remmina.
 
 
-%package        plugins-common
-Summary:        Common files for Remmina Remote Desktop Client plugins
-Summary(ja):    Remmina プラグインの共通ファイル
-Group: 		User Interface/Desktops
-Requires:       %{name} >= 0.9
 
 
-%description    plugins-common
-Remmina is a remote desktop client written in GTK+, aiming to be
-useful for system administrators and travelers, who need to work 
-with lots of remote computers in front of either large monitors or 
-tiny netbooks.
+%package        plugins-exec
+Summary:        External execution plugin for Remmina Remote Desktop Client
+Summary(ja):	Remmina の外部プロセス実行プラグイン
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description    plugins-exec
+Remmina is a remote desktop client written in GTK+, aiming to be useful for
+system administrators and travelers, who need to work with lots of remote
+computers in front of either large monitors or tiny net-books.
 
 
-This package contains files shared among all plugins for the Remmina
-remote desktop client.
+This package contains the plugin to execute external processes (commands or
+applications) from the Remmina window.
 
 
 
 
-%package        plugins-gnome
+%package        plugins-secret
 Summary:        GNOME keyring integration for Remmina Remote Desktop Client
 Summary:        GNOME keyring integration for Remmina Remote Desktop Client
 Summary(ja):	Remmina の GNOMEキーリング統合
 Summary(ja):	Remmina の GNOMEキーリング統合
 Group: 		User Interface/Desktops
 Group: 		User Interface/Desktops
-Requires:       %{name}-plugins-common = %{version}-%{release}
-Requires:       libgnome-keyring
+Requires:       %{name} = %{version}-%{release}
+Obsoletes:      %{name}plugins-gnome < 1.2
+Provides:       %{name}-plugins-gnome = %{version}-%{release}
 
 
-%description    plugins-gnome
+%description    plugins-secret
 Remmina is a remote desktop client written in GTK+, aiming to be
 Remmina is a remote desktop client written in GTK+, aiming to be
 useful for system administrators and travelers, who need to work 
 useful for system administrators and travelers, who need to work 
 with lots of remote computers in front of either large monitors or
 with lots of remote computers in front of either large monitors or
@@ -118,7 +101,7 @@ Remmina remote desktop client.
 Summary:        NX plugin for Remmina Remote Desktop Client
 Summary:        NX plugin for Remmina Remote Desktop Client
 Summary(ja):	Remmina の NX プラグイン
 Summary(ja):	Remmina の NX プラグイン
 Group: 		User Interface/Desktops
 Group: 		User Interface/Desktops
-Requires:       %{name}-plugins-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 # temporally disabled
 # temporally disabled
 #Requires:       nx
 #Requires:       nx
 
 
@@ -136,7 +119,7 @@ client.
 Summary:        RDP plugin for Remmina Remote Desktop Client
 Summary:        RDP plugin for Remmina Remote Desktop Client
 Summary(ja):	Remmina の RDP プラグイン
 Summary(ja):	Remmina の RDP プラグイン
 Group: 		User Interface/Desktops
 Group: 		User Interface/Desktops
-Requires:       %{name}-plugins-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       freerdp
 Requires:       freerdp
 
 
 %description    plugins-rdp
 %description    plugins-rdp
@@ -153,7 +136,7 @@ Remmina remote desktop client.
 Summary:        Telepathy plugin for Remmina Remote Desktop Client
 Summary:        Telepathy plugin for Remmina Remote Desktop Client
 Summary(ja):	Remmina の Telepathy プラグイン
 Summary(ja):	Remmina の Telepathy プラグイン
 Group: 		User Interface/Desktops
 Group: 		User Interface/Desktops
-Requires:       %{name}-plugins-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 
 %description    plugins-telepathy
 %description    plugins-telepathy
 Remmina is a remote desktop client written in GTK+, aiming to be
 Remmina is a remote desktop client written in GTK+, aiming to be
@@ -165,11 +148,25 @@ This package contains the Telepathy plugin for the Remmina remote
 desktop  client.
 desktop  client.
 
 
 
 
+%package        plugins-st
+Summary:        Simple Terminal plugin for Remmina Remote Desktop Client
+Summary(ja):	Remmina のシンプルな端末プラグイン
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description    plugins-st
+Remmina is a remote desktop client written in GTK+, aiming to be useful for
+system administrators and travelers, who need to work with lots of remote
+computers in front of either large monitors or tiny net-books.
+
+This package contains the Simple Terminal plugin for the Remmina remote desktop
+client.
+
+
 %package        plugins-vnc
 %package        plugins-vnc
 Summary:        VNC plugin for Remmina Remote Desktop Client
 Summary:        VNC plugin for Remmina Remote Desktop Client
 Summary(ja):	Remmina の VNC プラグイン
 Summary(ja):	Remmina の VNC プラグイン
 Group: 		User Interface/Desktops
 Group: 		User Interface/Desktops
-Requires:       %{name}-plugins-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 
 %description    plugins-vnc
 %description    plugins-vnc
 Remmina is a remote desktop client written in GTK+, aiming to be
 Remmina is a remote desktop client written in GTK+, aiming to be
@@ -185,7 +182,7 @@ client.
 Summary:        XDMCP plugin for Remmina Remote Desktop Client
 Summary:        XDMCP plugin for Remmina Remote Desktop Client
 Summary(ja):	Remmina の XDMCP プラグイン
 Summary(ja):	Remmina の XDMCP プラグイン
 Group: 		User Interface/Desktops
 Group: 		User Interface/Desktops
-Requires:       %{name}-plugins-common = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       xorg-x11-server-Xephyr
 Requires:       xorg-x11-server-Xephyr
 
 
 %description    plugins-xdmcp
 %description    plugins-xdmcp
@@ -198,75 +195,60 @@ This package contains the XDMCP plugin for the Remmina remote desktop
 client.
 client.
 
 
 
 
-%prep
-%setup -qn FreeRDP-Remmina-356c033
-
-cp %{SOURCE10} remmina/po/ja.po
-
-%patch0 -p1 -b .fix-library-name
-%patch1 -p1 -b .linker-error
-
-%patch2 -p1 -b .add-clipboard-support
-%patch3 -p1 -b .clipboard-bugfix
-%patch4 -p1 -b .some-more-clipboard-fixes
-%patch5 -p1 -b .disconnect-signal-handler
+%package        gnome-session
+Summary:        Gnome Shell session for Remmina kiosk mode
+Summary(ja):	Remmina の GNOME Shell セッション
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       gnome-session
 
 
-%patch10 -p1 -b .fix-crashes-in-some-cases
-%patch11 -p1 -b .fix-memory-leak
+%description    gnome-session
+Remmina is a remote desktop client written in GTK+, aiming to be useful for
+system administrators and travelers, who need to work with lots of remote
+computers in front of either large monitors or tiny net-books.
 
 
-%patch20 -p0 -b .dsofix
+This package contains Remmina kiosk mode, including a Gnome Shell session
+that shows up under the display manager session menu.
 
 
-%patch100 -p1 -b .vte3
 
 
-# Don't hardcode libdir
-sed -i "s,/lib/remmina/plugins,/%{_lib}/remmina/plugins,g" CMakeLists.txt
+%prep
+%autosetup -n Remmina-v%{version}
 
 
 %build
 %build
 mkdir -p build
 mkdir -p build
-pushd build
 
 
 LDFLAGS="-Wl,-z,relro -Wl,--no-as-needed"
 LDFLAGS="-Wl,-z,relro -Wl,--no-as-needed"
 
 
-%cmake \
-  -DWITH_PTHREAD=ON \
+%cmake --build=build \
+  -DCMAKE_INSTALL_LIBDIR=%{_lib} \
+  -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+  -DWITH_APPINDICATOR=NO \
+  -DWITH_AVAHI=ON \
+  -DWITH_FREERDP=ON \
   -DWITH_GCRYPT=ON \
   -DWITH_GCRYPT=ON \
-  -DWITH_LIBSSH=ON \
-  -DWITH_VTE=ON \
   -DWITH_GETTEXT=ON \
   -DWITH_GETTEXT=ON \
   -DWITH_LIBSSH=ON \
   -DWITH_LIBSSH=ON \
-  -DWITH_FREERDP=ON \
+  -DWITH_PTHREAD=ON \
+  -DWITH_LIBSSH=ON \
   -DWITH_TELEPATHY=ON \
   -DWITH_TELEPATHY=ON \
+  -DWITH_VTE=ON \
   -DWITH_ZLIB=ON \
   -DWITH_ZLIB=ON \
   -DWITH_GETTEXT=ON \
   -DWITH_GETTEXT=ON \
-  -DWITH_AVAHI=ON \
-  -DWITH_APPINDICATOR=OFF \
   -LIBVNCSERVER_INCLUDE_DIRS=%{_includedir} \
   -LIBVNCSERVER_INCLUDE_DIRS=%{_includedir} \
-  -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
-  ..
+  .
 
 
 make %{?_smp_mflags}
 make %{?_smp_mflags}
-popd
 
 
 %install
 %install
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 # make install DESTDIR=%{buildroot}
 # make install DESTDIR=%{buildroot}
-make install/fast DESTDIR=%{buildroot} -C build
-
-
-# dirty hack as desktop file does not get built.
-sed 's,^_,,g' remmina/desktop/remmina.desktop.in > remmina/desktop/remmina.desktop
+%makeinstall DESTDIR=%{buildroot}
 
 
-# another dirty hack
-mv %{buildroot}/usr/share/remmina/icons %{buildroot}/usr/share/icons
-
-desktop-file-install --vendor="" --delete-original \
-  --add-category="RemoteAccess" \
-  --remove-key="Actions" \
-  --dir %{buildroot}%{_datadir}/applications \
-  remmina/desktop/remmina.desktop
+mkdir -p %{buildroot}/%{_libdir}/cmake/%{name}/
+cp -pr cmake/*.cmake %{buildroot}/%{_libdir}/cmake/%{name}/
+cp -pr config.h.in %{buildroot}/%{_includedir}/%{name}/
+cp -p %{SOURCE1} %{buildroot}/%{_includedir}/%{name}/
 
 
 %find_lang %{name}
 %find_lang %{name}
-%find_lang %{name}-plugins
 
 
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
@@ -292,60 +274,85 @@ fi
 
 
 %files -f %{name}.lang
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-# FIXME: Add NEWS if not empty
-%doc remmina/AUTHORS remmina/ChangeLog remmina/COPYING README 
+%license LICENSE
+%doc AUTHORS ChangeLog README.md
 %{_bindir}/%{name}
 %{_bindir}/%{name}
+%{_datadir}/metainfo/*.appdata.xml
 %{_datadir}/applications/*.desktop
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/*/*.*
+%{_datadir}/icons/hicolor/*/actions/*.*
+%{_datadir}/icons/hicolor/*/apps/*.*
+%{_datadir}/icons/hicolor/*/emblems/remmina-*.svg
+%{_datadir}/mime/packages/*.xml
 %{_datadir}/%{name}/
 %{_datadir}/%{name}/
+%dir %{_libdir}/remmina/
+%dir %{_libdir}/remmina/plugins/
+%{_mandir}/man1/%{name}.*
 
 
 %files devel
 %files devel
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %doc
 %doc
 %{_includedir}/%{name}/
 %{_includedir}/%{name}/
 %{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/cmake/%{name}/*.cmake
 
 
-%files plugins-common -f %{name}-plugins.lang
-%defattr(-,root,root,-)
-# FIXME: Add docs once there are some *proper* ones
-#%doc remmina-plugins/AUTHORS remmina-plugins/COPYING
-%dir %{_libdir}/remmina/
-%dir %{_libdir}/remmina/plugins/
+%files plugins-exec
+%{_libdir}/remmina/plugins/remmina-plugin-exec.so
 
 
-%files plugins-gnome
+%files plugins-secret
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%{_libdir}/remmina/plugins/remmina-plugins-gnome.so
+%{_libdir}/remmina/plugins/remmina-plugin-secret.so
 
 
 %files plugins-nx
 %files plugins-nx
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %{_libdir}/remmina/plugins/remmina-plugin-nx.so
 %{_libdir}/remmina/plugins/remmina-plugin-nx.so
-%{_datadir}/icons/hicolor/*/emblems/remmina-nx.png
+%{_datadir}/icons/hicolor/*/emblems/remmina-nx-symbolic.svg
 
 
 %files plugins-rdp
 %files plugins-rdp
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %{_libdir}/remmina/plugins/remmina-plugin-rdp.so
 %{_libdir}/remmina/plugins/remmina-plugin-rdp.so
-%{_datadir}/icons/hicolor/*/emblems/remmina-rdp-ssh.png
-%{_datadir}/icons/hicolor/*/emblems/remmina-rdp.png
+%{_datadir}/icons/hicolor/*/emblems/remmina-rdp-ssh-symbolic.svg
+%{_datadir}/icons/hicolor/*/emblems/remmina-rdp-symbolic.svg
 
 
 %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}/telepathy/clients/Remmina.client
+%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Remmina.service
+%{_datadir}/telepathy/clients/Remmina.client
+
+%files plugins-st
+%{_libdir}/remmina/plugins/remmina-plugin-st.so
+%{_datadir}/icons/hicolor/*/emblems/remmina-tool-symbolic.svg
 
 
 %files plugins-vnc
 %files plugins-vnc
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %{_libdir}/remmina/plugins/remmina-plugin-vnc.so
 %{_libdir}/remmina/plugins/remmina-plugin-vnc.so
-%{_datadir}/icons/hicolor/*/emblems/remmina-vnc-ssh.png
-%{_datadir}/icons/hicolor/*/emblems/remmina-vnc.png
+%{_datadir}/icons/hicolor/*/emblems/remmina-vnc-ssh-symbolic.svg
+%{_datadir}/icons/hicolor/*/emblems/remmina-vnc-symbolic.svg
 
 
 %files plugins-xdmcp
 %files plugins-xdmcp
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %{_libdir}/remmina/plugins/remmina-plugin-xdmcp.so
 %{_libdir}/remmina/plugins/remmina-plugin-xdmcp.so
-%{_datadir}/icons/hicolor/*/emblems/remmina-xdmcp-ssh.png
-%{_datadir}/icons/hicolor/*/emblems/remmina-xdmcp.png
+%{_datadir}/icons/hicolor/*/emblems/remmina-xdmcp-ssh-symbolic.svg
+%{_datadir}/icons/hicolor/*/emblems/remmina-xdmcp-symbolic.svg
+
+%files gnome-session
+%{_bindir}/gnome-session-remmina
+%{_bindir}/remmina-gnome
+%{_datadir}/gnome-session/sessions/remmina-gnome.session
+%{_datadir}/xsessions/remmina-gnome.desktop
+%{_mandir}/man1/gnome-session-remmina.1.*
+%{_mandir}/man1/remmina-gnome.1.*
 
 
 %changelog
 %changelog
+* Sun Dec 02 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.32.1-1
+- new upstream release.
+- dropped all patches.
+- dropped Source10.
+- added Source1.
+- droped a subpackage 'remmina-plugins-common'.
+- renamed a subpackage 'remmina-plugins-gnome' to 'remmina-plugins-secret'.
+- added subpackages 'remmina-{plugins-{exec,st},gnome-session}'.
+
 * Fri Feb 26 2016 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.0.0-5
 * Fri Feb 26 2016 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.0.0-5
 - rebuild with libssh 0.7.3
 - rebuild with libssh 0.7.3