packages: skype/skype.spec - there is no 64bit skype, use ubuntu build as s...

[glen]

Author: glen                         Date: Thu Feb 18 09:41:57 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- there is no 64bit skype, use ubuntu build as source, it does not crash and has avatars packaged

---- Files affected:
packages/skype:
   skype.spec (1.82 -> 1.83) 

---- Diffs:

================================================================
Index: packages/skype/skype.spec
diff -u packages/skype/skype.spec:1.82 packages/skype/skype.spec:1.83
--- packages/skype/skype.spec:1.82	Fri Jan 22 17:30:34 2010
+++ packages/skype/skype.spec	Thu Feb 18 10:41:52 2010
@@ -8,10 +8,8 @@
 # distributing on CD-ROM and similar media requires approval
 License:	Commercial, redistributable (see LICENSE)
 Group:		Applications/Communications
-Source0:	http://download.skype.com/linux/%{name}-%{version}-fc10.i586.rpm
-# Source0-md5:	fe9ba37b14d9a9ac2c8f65ac0721e5bd
-Source1:	http://download.skype.com/linux/%{name}-ubuntu-intrepid_%{version}-1_amd64.deb
-# Source1-md5:	1c4da1a157e95418be10e84900924f92
+Source0:	http://download.skype.com/linux/%{name}-ubuntu-intrepid_%{version}-1_amd64.deb
+# Source0-md5:	1c4da1a157e95418be10e84900924f92
 Patch0:		%{name}-desktop.patch
 URL:		http://www.skype.com/
 BuildRequires:	rpm-utils
@@ -25,7 +23,7 @@
 Requires:	iconv
 Requires:	libsigc++ >= 2.0
 Conflicts:	skype-static
-ExclusiveArch:	%{ix86} %{x8664}
+ExclusiveArch:	%{ix86}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_enable_debug_packages	0
@@ -51,16 +49,10 @@
 
 %prep
 %setup -qcT
-%ifarch %{ix86}
-rpm2cpio %{SOURCE0} | cpio -dimu
-mv usr/share/doc/skype-%{version}/LICENSE .
-%endif
-%ifarch %{x8664}
-ar x %{SOURCE1}
+ar x %{SOURCE0}
 tar xzf data.tar.gz
 mv usr/share/doc/skype/copyright LICENSE
 mv usr/share/skype/avatars .
-%endif
 mv usr/bin/skype .
 mv usr/share/skype/sounds .
 mv usr/share/skype/lang .
@@ -79,7 +71,7 @@
 cp -a skype.conf $RPM_BUILD_ROOT/etc/dbus-1/system.d
 cp -a skype.png $RPM_BUILD_ROOT%{_pixmapsdir}
 cp -a *.desktop $RPM_BUILD_ROOT%{_desktopdir}
-[ -d avatars ] && cp -a avatars $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -a avatars $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,13 +79,12 @@
 %files
 %defattr(644,root,root,755)
 %doc LICENSE
+/etc/dbus-1/system.d/skype.conf
 %attr(755,root,root) %{_bindir}/skype
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/sounds
-%ifarch %{x8664}
 %{_datadir}/%{name}/avatars
-%endif
 
 %dir %{_datadir}/%{name}/lang
 %lang(bg) %{_datadir}/%{name}/lang/skype_bg.qm
@@ -118,7 +109,6 @@
 %lang(zh) %{_datadir}/%{name}/lang/skype_zh_s.qm
 %lang(zh_TW) %{_datadir}/%{name}/lang/skype_zh_t.qm
 
-/etc/dbus-1/system.d/skype.conf
 %{_pixmapsdir}/*.png
 %{_desktopdir}/*.desktop
 
@@ -128,6 +118,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.83  2010/02/18 09:41:52  glen
+- there is no 64bit skype, use ubuntu build as source, it does not crash and has avatars packaged
+
 Revision 1.82  2010/01/22 16:30:34  glen
 - 64bit skype
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/skype/skype.spec?r1=1.82&r2=1.83&f=u