packages: skype-static/skype-static.spec - unify with skype.spec

glen glen at pld-linux.org
Tue Jun 15 07:19:12 CEST 2010 

Author: glen                         Date: Tue Jun 15 05:19:12 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify with skype.spec

---- Files affected:
packages/skype-static:
   skype-static.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: packages/skype-static/skype-static.spec
diff -u packages/skype-static/skype-static.spec:1.21 packages/skype-static/skype-static.spec:1.22
--- packages/skype-static/skype-static.spec:1.21	Tue Jun 15 07:18:27 2010
+++ packages/skype-static/skype-static.spec	Tue Jun 15 07:19:07 2010
@@ -1,15 +1,15 @@
 # $Revision$, $Date$
+%define		pkgname skype
 Summary:	p2p VoIP application
 Summary(pl.UTF-8):	Aplikacja VoIP p2p
 Name:		skype-static
-%define		_altname skype
 Version:	2.1.0.81
-Release:	2
+Release:	4
 # 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/%{_altname}_static-%{version}.tar.bz2
+Source0:	http://download.skype.com/linux/%{pkgname}_static-%{version}.tar.bz2
 # Source0-md5:	137a4a749c8fb3b76c3410514c7e2053
 Patch0:		%{name}-desktop.patch
 URL:		http://www.skype.com/
@@ -37,22 +37,23 @@
 na <http://www.skype.com/go/redistribution/>.
 
 %prep
-%setup -q -n %{_altname}_static-%{version}
+%setup -q -n %{pkgname}_static-%{version}
 %patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{_altname},%{_datadir}/%{_altname}/{lang,sounds,avatars},%{_iconsdir}/hicolor/{16x16,32x32,48x48}/apps/,%{_desktopdir},%{_sysconfdir}/dbus-1/system.d}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{pkgname},%{_datadir}/%{pkgname}/{lang,sounds,avatars},%{_desktopdir},/etc/dbus-1/system.d}
 
-install %{_altname} $RPM_BUILD_ROOT%{_bindir}
-install sounds/*.wav $RPM_BUILD_ROOT%{_datadir}/%{_altname}/sounds
-install lang/*.qm $RPM_BUILD_ROOT%{_datadir}/%{_altname}/lang
-install avatars/*.png $RPM_BUILD_ROOT%{_datadir}/%{_altname}/avatars
-install skype.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
-install icons/SkypeBlue_16x16.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/16x16/apps/%{_altname}.png
-install icons/SkypeBlue_32x32.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/32x32/apps/%{_altname}.png
-install icons/SkypeBlue_48x48.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/apps/%{_altname}.png
-install *.desktop $RPM_BUILD_ROOT%{_desktopdir}
+install -p %{pkgname} $RPM_BUILD_ROOT%{_bindir}
+cp -a sounds/*.wav $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/sounds
+cp -a lang/*.qm $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/lang
+cp -a avatars/*.png $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/avatars
+cp -a skype.conf $RPM_BUILD_ROOT/etc/dbus-1/system.d
+cp -a *.desktop $RPM_BUILD_ROOT%{_desktopdir}
+install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/{16x16,32x32,48x48}/apps
+cp -a icons/SkypeBlue_16x16.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/16x16/apps/%{pkgname}.png
+cp -a icons/SkypeBlue_32x32.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/32x32/apps/%{pkgname}.png
+cp -a icons/SkypeBlue_48x48.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/apps/%{pkgname}.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,48 +61,36 @@
 %files
 %defattr(644,root,root,755)
 %doc LICENSE
-%attr(755,root,root) %{_bindir}/*
-%dir %{_datadir}/%{_altname}
-%{_datadir}/%{_altname}/sounds
-%{_datadir}/%{_altname}/avatars
-
-%dir %{_datadir}/%{_altname}/lang
-# %lang(ar) %{_datadir}/%{_altname}/lang/skype_ar.qm
-%lang(bg) %{_datadir}/%{_altname}/lang/skype_bg.qm
-# %lang(cs) %{_datadir}/%{_altname}/lang/skype_cs.qm
-# %lang(cz) %{_datadir}/%{_altname}/lang/skype_cz.qm
-# %lang(da) %{_datadir}/%{_altname}/lang/skype_da.qm
-%lang(de) %{_datadir}/%{_altname}/lang/skype_de.qm
-# %lang(el) %{_datadir}/%{_altname}/lang/skype_el.qm
-%lang(en) %{_datadir}/%{_altname}/lang/skype_en.qm
-%lang(es) %{_datadir}/%{_altname}/lang/skype_es.qm
-%lang(et) %{_datadir}/%{_altname}/lang/skype_et.qm
-# %lang(fi) %{_datadir}/%{_altname}/lang/skype_fi.qm
-%lang(fr) %{_datadir}/%{_altname}/lang/skype_fr.qm
-# %lang(he) %{_datadir}/%{_altname}/lang/skype_he.qm
-# %lang(hu) %{_datadir}/%{_altname}/lang/skype_hu.qm
-%lang(it) %{_datadir}/%{_altname}/lang/skype_it.qm
-%lang(ja) %{_datadir}/%{_altname}/lang/skype_ja.qm
-%lang(ko) %{_datadir}/%{_altname}/lang/skype_ko.qm
-%lang(lv) %{_datadir}/%{_altname}/lang/skype_lv.qm
-%lang(lt) %{_datadir}/%{_altname}/lang/skype_lt.qm
-# %lang(nl) %{_datadir}/%{_altname}/lang/skype_nl.qm
-# %lang(nb) %{_datadir}/%{_altname}/lang/skype_nb.qm
-%lang(pl) %{_datadir}/%{_altname}/lang/skype_pl.qm
-%lang(pt_BR) %{_datadir}/%{_altname}/lang/skype_pt_br.qm
-%lang(pt) %{_datadir}/%{_altname}/lang/skype_pt_pt.qm
-%lang(ro) %{_datadir}/%{_altname}/lang/skype_ro.qm
-%lang(ru) %{_datadir}/%{_altname}/lang/skype_ru.qm
-# %lang(sv)  %{_datadir}/%{_altname}/lang/skype_sv.qm
-%lang(th) %{_datadir}/%{_altname}/lang/skype_th.qm
-%lang(tr) %{_datadir}/%{_altname}/lang/skype_tr.qm
-# probably zh
-%lang(zh_CN) %{_datadir}/%{_altname}/lang/skype_zh_s.qm
-# probably zh_TW
-%lang(zh_TW) %{_datadir}/%{_altname}/lang/skype_zh_t.qm
-
 /etc/dbus-1/system.d/skype.conf
-%{_iconsdir}/hicolor/*x*/apps/%{_altname}.png
+%attr(755,root,root) %{_bindir}/skype
+
+%dir %{_datadir}/%{pkgname}
+%{_datadir}/%{pkgname}/sounds
+%{_datadir}/%{pkgname}/avatars
+
+%dir %{_datadir}/%{pkgname}/lang
+%lang(bg) %{_datadir}/%{pkgname}/lang/skype_bg.qm
+%lang(de) %{_datadir}/%{pkgname}/lang/skype_de.qm
+%lang(en) %{_datadir}/%{pkgname}/lang/skype_en.qm
+%lang(es) %{_datadir}/%{pkgname}/lang/skype_es.qm
+%lang(et) %{_datadir}/%{pkgname}/lang/skype_et.qm
+%lang(fr) %{_datadir}/%{pkgname}/lang/skype_fr.qm
+%lang(it) %{_datadir}/%{pkgname}/lang/skype_it.qm
+%lang(ja) %{_datadir}/%{pkgname}/lang/skype_ja.qm
+%lang(ko) %{_datadir}/%{pkgname}/lang/skype_ko.qm
+%lang(lt) %{_datadir}/%{pkgname}/lang/skype_lt.qm
+%lang(lv) %{_datadir}/%{pkgname}/lang/skype_lv.qm
+%lang(pl) %{_datadir}/%{pkgname}/lang/skype_pl.qm
+%lang(pt) %{_datadir}/%{pkgname}/lang/skype_pt_pt.qm
+%lang(pt_BR) %{_datadir}/%{pkgname}/lang/skype_pt_br.qm
+%lang(ro) %{_datadir}/%{pkgname}/lang/skype_ro.qm
+%lang(ru) %{_datadir}/%{pkgname}/lang/skype_ru.qm
+%lang(th) %{_datadir}/%{pkgname}/lang/skype_th.qm
+%lang(tr) %{_datadir}/%{pkgname}/lang/skype_tr.qm
+%lang(zh_CN) %{_datadir}/%{pkgname}/lang/skype_zh_s.qm
+%lang(zh_TW) %{_datadir}/%{pkgname}/lang/skype_zh_t.qm
+
+%{_iconsdir}/hicolor/*x*/apps/%{pkgname}.png
 %{_desktopdir}/*.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -110,6 +99,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2010/06/15 05:19:07  glen
+- unify with skype.spec
+
 Revision 1.21  2010/06/15 05:18:27  glen
 - versioned provides
 
@@ -117,7 +109,7 @@
 - release 2
 
 Revision 1.19  2010/05/29 22:41:30  arekm
-P: skype-program
+- P: skype-program
 
 Revision 1.18  2010/02/14 15:45:22  arvenil
 - up to 2.1.0.81
================================================================

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

More information about the pld-cvs-commit mailing list