packages: skype/skype.spec - use fc10.rpm as source, that version does not ...

Mon Jan 18 17:55:42 CET 2010

Author: glen                         Date: Mon Jan 18 16:55:42 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use fc10.rpm as source, that version does not crash with qt4.6
- avatars are not present in there, feel free to restore from previous tarball if they are so precious
- rel 2

---- Files affected:
packages/skype:
   skype.spec (1.78 -> 1.79) 

---- Diffs:

================================================================
Index: packages/skype/skype.spec
diff -u packages/skype/skype.spec:1.78 packages/skype/skype.spec:1.79

--- packages/skype/skype.spec:1.78	Mon Dec 28 12:10:11 2009
+++ packages/skype/skype.spec	Mon Jan 18 17:55:37 2010
@@ -3,15 +3,16 @@
 Summary(pl.UTF-8):	Aplikacja VoIP p2p
 Name:		skype
 Version:	2.1.0.47
-Release:	1
+Release:	2
 # 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/%{name}-%{version}.tar.bz2
-# Source0-md5:	7396164fb926705300d72cd478458d36
+Source0:	http://download.skype.com/linux/%{name}-%{version}-fc10.i586.rpm
+# Source0-md5:	08b40dee4b507dfbdb949e441006cd60
 Patch0:		%{name}-desktop.patch
 URL:		http://www.skype.com/
+BuildRequires:	rpm-utils
 # to force 32bit iconv
 Requires:	%{_libdir}/gconv
 Requires:	QtCore >= 4.2.1
@@ -47,21 +48,26 @@
 na <http://www.skype.com/go/redistribution/>.
 
 %prep
-%setup -q
+%setup -qcT
+rpm2cpio %{SOURCE0} | cpio -dimu
+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
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name},%{_datadir}/%{name}/{lang,sounds,avatars},%{_iconsdir}/hicolor/{16x16,32x32,48x48}/apps,%{_desktopdir},/etc/dbus-1/system.d}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name},%{_datadir}/%{name}/{lang,sounds,avatars},%{_pixmapsdir},%{_desktopdir},/etc/dbus-1/system.d}
 
-install %{name} $RPM_BUILD_ROOT%{_bindir}
+install -p %{name} $RPM_BUILD_ROOT%{_bindir}
 cp -a sounds/*.wav $RPM_BUILD_ROOT%{_datadir}/%{name}/sounds
 cp -a lang/*.qm $RPM_BUILD_ROOT%{_datadir}/%{name}/lang
-cp -a avatars/*.png $RPM_BUILD_ROOT%{_datadir}/%{name}/avatars
 cp -a skype.conf $RPM_BUILD_ROOT/etc/dbus-1/system.d
-cp -a icons/SkypeBlue_16x16.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/16x16/apps/%{name}.png
-cp -a icons/SkypeBlue_32x32.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/32x32/apps/%{name}.png
-cp -a icons/SkypeBlue_48x48.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/apps/%{name}.png
+cp -a skype.png $RPM_BUILD_ROOT%{_pixmapsdir}
 cp -a *.desktop $RPM_BUILD_ROOT%{_desktopdir}
 
 %clean
@@ -74,46 +80,31 @@
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/sounds
-%{_datadir}/%{name}/avatars
 
 %dir %{_datadir}/%{name}/lang
-# %lang(ar) %{_datadir}/%{name}/lang/skype_ar.qm
 %lang(bg) %{_datadir}/%{name}/lang/skype_bg.qm
-# %lang(cs) %{_datadir}/%{name}/lang/skype_cs.qm
-# %lang(cz) %{_datadir}/%{name}/lang/skype_cz.qm
-# %lang(da) %{_datadir}/%{name}/lang/skype_da.qm
 %lang(de) %{_datadir}/%{name}/lang/skype_de.qm
-# %lang(el) %{_datadir}/%{name}/lang/skype_el.qm
 %lang(en) %{_datadir}/%{name}/lang/skype_en.qm
 %lang(es) %{_datadir}/%{name}/lang/skype_es.qm
 %lang(et) %{_datadir}/%{name}/lang/skype_et.qm
-# %lang(fi) %{_datadir}/%{name}/lang/skype_fi.qm
 %lang(fr) %{_datadir}/%{name}/lang/skype_fr.qm
-# %lang(he) %{_datadir}/%{name}/lang/skype_he.qm
-# %lang(hu) %{_datadir}/%{name}/lang/skype_hu.qm
 %lang(it) %{_datadir}/%{name}/lang/skype_it.qm
 %lang(ja) %{_datadir}/%{name}/lang/skype_ja.qm
 %lang(ko) %{_datadir}/%{name}/lang/skype_ko.qm
 %lang(lv) %{_datadir}/%{name}/lang/skype_lv.qm
 %lang(lt) %{_datadir}/%{name}/lang/skype_lt.qm
-# %lang(nl) %{_datadir}/%{name}/lang/skype_nl.qm
-# %lang(nb) %{_datadir}/%{name}/lang/skype_nb.qm
 %lang(pl) %{_datadir}/%{name}/lang/skype_pl.qm
-# probably pt_BR
 %lang(pt_BR) %{_datadir}/%{name}/lang/skype_pt_br.qm
 %lang(pt) %{_datadir}/%{name}/lang/skype_pt_pt.qm
 %lang(ro) %{_datadir}/%{name}/lang/skype_ro.qm
 %lang(ru) %{_datadir}/%{name}/lang/skype_ru.qm
-# %lang(sv)  %{_datadir}/%{name}/lang/skype_sv.qm
 %lang(th) %{_datadir}/%{name}/lang/skype_th.qm
 %lang(tr) %{_datadir}/%{name}/lang/skype_tr.qm
-# probably zh
 %lang(zh) %{_datadir}/%{name}/lang/skype_zh_s.qm
-# probably zh_TW
 %lang(zh_TW) %{_datadir}/%{name}/lang/skype_zh_t.qm
 
 /etc/dbus-1/system.d/skype.conf
-%{_iconsdir}/hicolor/*x*/apps/%{name}.png
+%{_pixmapsdir}/*.png
 %{_desktopdir}/*.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -122,6 +113,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2010/01/18 16:55:37  glen
+- use fc10.rpm as source, that version does not crash with qt4.6
+- avatars are not present in there, feel free to restore from previous tarball if they are so precious
+- rel 2
+
 Revision 1.78  2009/12/28 11:10:11  pluto
 - nostrip explanation.
 
================================================================

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

