Author: glen Date: Fri Jan 22 16:30:40 2010 GMT Module: packages Tag: HEAD ---- Log message: - 64bit skype
---- Files affected: packages/skype: skype.spec (1.81 -> 1.82) ---- Diffs: ================================================================ Index: packages/skype/skype.spec diff -u packages/skype/skype.spec:1.81 packages/skype/skype.spec:1.82 --- packages/skype/skype.spec:1.81 Fri Jan 22 17:20:35 2010 +++ packages/skype/skype.spec Fri Jan 22 17:30:34 2010 @@ -10,6 +10,8 @@ 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 Patch0: %{name}-desktop.patch URL: http://www.skype.com/ BuildRequires: rpm-utils @@ -23,7 +25,7 @@ Requires: iconv Requires: libsigc++ >= 2.0 Conflicts: skype-static -ExclusiveArch: %{ix86} +ExclusiveArch: %{ix86} %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _enable_debug_packages 0 @@ -49,14 +51,22 @@ %prep %setup -qcT +%ifarch %{ix86} rpm2cpio %{SOURCE0} | cpio -dimu +mv usr/share/doc/skype-%{version}/LICENSE . +%endif +%ifarch %{x8664} +ar x %{SOURCE1} +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 . mv etc/dbus-1/system.d/skype.conf . mv usr/share/pixmaps/skype.png . mv usr/share/applications/skype.desktop . -mv usr/share/doc/skype-%{version}/LICENSE . %patch0 -p1 %install @@ -69,6 +79,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} %clean rm -rf $RPM_BUILD_ROOT @@ -80,6 +91,9 @@ %dir %{_datadir}/%{name} %{_datadir}/%{name}/sounds +%ifarch %{x8664} +%{_datadir}/%{name}/avatars +%endif %dir %{_datadir}/%{name}/lang %lang(bg) %{_datadir}/%{name}/lang/skype_bg.qm @@ -114,6 +128,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.82 2010/01/22 16:30:34 glen +- 64bit skype + Revision 1.81 2010/01/22 16:20:35 glen - add uk translation ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/skype/skype.spec?r1=1.81&r2=1.82&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
