packages: skype/skype.spec - merge 2.1.0.47 from DEVEL

[glen]

Author: glen                         Date: Tue Nov  3 09:01:25 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merge 2.1.0.47 from DEVEL

---- Files affected:
packages/skype:
   skype.spec (1.75 -> 1.76) 

---- Diffs:

================================================================
Index: packages/skype/skype.spec
diff -u packages/skype/skype.spec:1.75 packages/skype/skype.spec:1.76
--- packages/skype/skype.spec:1.75	Mon Nov  2 22:39:49 2009
+++ packages/skype/skype.spec	Tue Nov  3 10:01:19 2009
@@ -25,7 +25,11 @@
 ExclusiveArch:	%{ix86}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define	no_install_post_strip	1
+%define		_enable_debug_packages	0
+%define		no_install_post_strip	1
+
+# So that building package on AC system won't write package name dep that Th system can't understand (libstdc++4)
+%define		_noautoreqdep	libstdc++.so.6
 
 %description
 p2p VoIP application.
@@ -47,13 +51,13 @@
 
 %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},%{_sysconfdir}/dbus-1/system.d}
+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 %{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%{_sysconfdir}/dbus-1/system.d
+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
@@ -116,6 +120,23 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76  2009/11/03 09:01:19  glen
+- merge 2.1.0.47 from DEVEL
+
+Revision 1.72.2.4  2009/10/02 06:33:59  glen
+- _noautoreqdep on libstdc++.so.6
+
+Revision 1.72.2.3  2009/10/02 06:31:27  glen
+- skip debug package, fix dbus path
+
+Revision 1.72.2.2  2009/09/09 21:24:37  arvenil
+- don't strip (no more segmentation fault)
+- release 0.2
+
+Revision 1.72.2.1  2009/09/02 10:02:07  lisu
+- start update to 2.1.0.47 beta
+- crash after start (segmentation fault)
+
 Revision 1.75  2009/11/02 21:39:49  mmazur
 - forgot about md5sum
 
================================================================

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