[packages/skype] - up to 4.1.0.20, upated deps

glen glen at pld-linux.org
Tue Nov 27 15:33:06 CET 2012


commit dda126a1ed1c7a60688efb1d563852499654bc46
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Nov 27 16:32:55 2012 +0200

    - up to 4.1.0.20, upated deps

 skype-desktop.patch | 14 +++++++-------
 skype.spec          | 19 ++++++++++++-------
 2 files changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/skype.spec b/skype.spec
index 05db081..5017c9d 100644
--- a/skype.spec
+++ b/skype.spec
@@ -1,18 +1,20 @@
 %define		pkgname skype
-%define		qtver	4.4.0
+%define		qtver	4.7
+%define		dbus	1.0
+%define		bluez	4.0.0
 %define		asound	1.0.18
-%define		pulseaudio	0.9.16
+%define		pulseaudio	1.0
 Summary:	p2p VoIP application
 Summary(pl.UTF-8):	Aplikacja VoIP p2p
 Name:		skype
-Version:	4.0.0.8
-Release:	2
+Version:	4.1.0.20
+Release:	1
 # http://www.skype.com/company/legal/promote/distributionterms.html
 # distributing on CD-ROM and similar media requires approval
 License:	Commercial, redistributable (see LICENSE)
 Group:		Applications/Communications
-Source0:	http://download.skype.com/linux/%{pkgname}-ubuntu_%{version}-1_i386.deb
-# Source0-md5:	d5990641c3c6d17b5a656e5b4aa90ad7
+Source0:	http://download.skype.com/linux/%{pkgname}-ubuntu-lucid_%{version}-1_i386.deb
+# Source0-md5:	4c8511c6be6c8dcb5b18829cd1ffe190
 Source1:	%{name}.sh
 Patch0:		%{name}-desktop.patch
 URL:		http://www.skype.com/
@@ -24,9 +26,11 @@ Requires:	QtDBus >= %{qtver}
 Requires:	QtGui >= %{qtver}
 Requires:	QtNetwork >= %{qtver}
 Requires:	alsa-lib >= %{asound}
+Requires:	dbus-libs > %{dbus}
 Requires:	iconv
 Requires:	libsigc++ >= 2.0
 Suggests:	pulseaudio >= %{pulseaudio}
+Suggests:	bluez-libs >= %{bluez}
 Provides:	skype-program = %{version}
 Conflicts:	skype-static
 ExclusiveArch:	%{ix86}
@@ -58,6 +62,7 @@ na <http://www.skype.com/go/redistribution/>.
 ar x %{SOURCE0}
 tar xzf data.tar.gz
 mv usr/share/doc/skype/copyright LICENSE
+mv usr/share/doc/skype/* .
 mv usr/share/skype/avatars .
 mv usr/bin/skype .
 mv usr/share/skype/sounds .
@@ -85,7 +90,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE
+%doc README LICENSE third-party_attributions.txt
 /etc/dbus-1/system.d/skype.conf
 %attr(755,root,root) %{_bindir}/skype
 %attr(755,root,root) %{_libdir}/skype
diff --git a/skype-desktop.patch b/skype-desktop.patch
index b0d01b2..e2faa6c 100644
--- a/skype-desktop.patch
+++ b/skype-desktop.patch
@@ -1,18 +1,18 @@
---- skype-2.1.0.47/skype.desktop~	2009-09-02 12:05:51.000000000 +0200
-+++ skype-2.1.0.47/skype.desktop	2009-09-02 12:05:51.000000000 +0200
-@@ -1,9 +1,11 @@
+--- skype-4.1.0.20/skype.desktop	2012-11-27 15:54:58.605967486 +0200
++++ skype-4.1.0.20/skype.desktop	2012-11-27 15:55:50.228363600 +0200
+@@ -1,11 +1,12 @@
  [Desktop Entry]
  Name=Skype
 -Comment=Skype Internet Telephony
 +Comment=p2p VoIP application
 +Comment[pl]=Aplikacja VoIP p2p
- Exec=skype
+ Exec=skype %U
 -Icon=skype.png
--Terminal=0
 +Icon=skype
-+Terminal=false
+ Terminal=false
  Type=Application
  Encoding=UTF-8
 -Categories=Network;Application;
 +Categories=Qt;Network;InstantMessaging;Telephony;
-+# vi: encoding=utf-8
+ MimeType=x-scheme-handler/skype;
+ X-KDE-Protocols=skype
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/skype.git/commitdiff/dda126a1ed1c7a60688efb1d563852499654bc46



More information about the pld-cvs-commit mailing list