- updated to 1.7.4

- removed obsolete startup script
- fix directory in current startup script

diff --git a/skype.sh b/skype.sh
deleted file mode 100755 (executable)
index 1e6f478..0000000
--- a/skype.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# parses --dbpath argument from skype args ignores everything else
-parse_args() {
-       local arg
-       while [ $# -gt 0 ]; do
-               case "$1" in
-               --dbpath)
-                       SKYPE_DIR=$2
-                       return
-               ;;
-               --dbpath=*)
-                       SKYPE_DIR=${1#--dbpath=}
-                       return
-               ;;
-               esac
-               shift
-       done
-}
-
-# Legacy dir
-SKYPE_DIR="$HOME/.Skype"
-
-# XDG path
-if [ ! -d "$SKYPE_DIR" ]; then
-       SKYPE_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/Skype"
-fi
-
-parse_args "$@"
-
-if [ ! -d "$SKYPE_DIR" ]; then
-       install -d "$SKYPE_DIR"
-fi
-
-if [ -f "$SKYPE_DIR/env" ]; then
-       . "$SKYPE_DIR/env"
-fi
-
-exec /usr/lib/skype --dbpath="$SKYPE_DIR" "$@"

diff --git a/skype.spec b/skype.spec
index f7610594fd402e2516011c6ad9855d8d854df38a..f802b66ab966937087c4f84661e17cf5d313bdc9 100644 (file)
--- a/skype.spec
+++ b/skype.spec
@@ -6,7 +6,7 @@
 Summary:       p2p VoIP application
 Summary(pl.UTF-8):     Aplikacja VoIP p2p
 Name:          skype
-Version:       1.6.2
+Version:       1.7.4
 Release:       1
 Epoch:         1
 # http://www.skype.com/company/legal/promote/distributionterms.html
@@ -14,8 +14,7 @@ Epoch:                1
 License:       Commercial, redistributable (see LICENSE)
 Group:         Applications/Communications
 Source0:       https://repo.skype.com/latest/%{pkgname}forlinux-64.deb
-# Source0-md5: c3baf39fd1ee9ab8fd2f94a618bd6d57
-Source1:       %{name}.sh
+# Source0-md5: 82dd3d59fde84c4e5b62d69208d8879c
 Patch0:                %{name}-desktop.patch
 URL:           https://www.skype.com/
 BuildRequires: tar >= 1:1.22
@@ -34,7 +33,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _noautoprovfiles        %{_appdir}
 
 # list of script capabilities (regexps) not to be used in Provides
-%define                _noautoreq              %{int_caps}
+%define                _noautoreq              %{int_caps}
 
 %define                _appdir         %{_libdir}/skypeforlinux
 
@@ -77,6 +76,8 @@ ln -s skypeforlinux $RPM_BUILD_ROOT%{_bindir}/%{name}
 cp -a skypeforlinux/* $RPM_BUILD_ROOT%{_appdir}
 cp -a usr/share/* $RPM_BUILD_ROOT%{_datadir}
 
+sed -i -e 's|/share/|/%{_lib}/|g' $RPM_BUILD_ROOT%{_bindir}/skypeforlinux
+
 %clean
 rm -rf $RPM_BUILD_ROOT