rpms/lpf-skype/devel lpf-skype.spec,1.10,1.11 skype.spec.in,1.1,1.2

[Simone Caronni]

Author: slaanesh

Update of /cvs/nonfree/rpms/lpf-skype/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4700

Modified Files:
	lpf-skype.spec skype.spec.in 
Log Message:
* Wed Dec 04 2013 Simone Caronni <negativo17 at gmail.com> - 4.2.0.11-11
- Review fixes.



Index: lpf-skype.spec
===================================================================
RCS file: /cvs/nonfree/rpms/lpf-skype/devel/lpf-skype.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lpf-skype.spec	4 Dec 2013 09:19:10 -0000	1.10
+++ lpf-skype.spec	4 Dec 2013 15:16:50 -0000	1.11
@@ -1,9 +1,11 @@
+%define debug_package %{nil}
+
 # %%global will not work here, lazy evaluation needed.
 %define         target_pkg %(t=%{name}; echo ${t#lpf-})
 
 Name:           lpf-skype
 Version:        4.2.0.11
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        Skype Messaging and Telephony Client package bootstrap
 
@@ -16,14 +18,15 @@
 Source2:        LICENSE
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  lpf = 0-11
-Requires:       lpf >= 0-11
+BuildRequires:  lpf >= 0.13
+Requires:       lpf >= 0.13
 
 
 %description
 Bootstrap package allowing the lpf system to build the non-redistributable skype
 package.
 
+The skype package is available only for i686 systems.
 
 %prep
 %setup -cT
@@ -62,6 +65,9 @@
 
 
 %changelog
+* Wed Dec 04 2013 Simone Caronni <negativo17 at gmail.com> - 4.2.0.11-11
+- Review fixes.
+
 * Wed Dec 04 2013 Simone Caronni <negativo17 at gmail.com> - 4.2.0.11-10
 - Making build require 0-11 for now.
 


Index: skype.spec.in
===================================================================
RCS file: /cvs/nonfree/rpms/lpf-skype/devel/skype.spec.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- skype.spec.in	21 Nov 2013 10:50:27 -0000	1.1
+++ skype.spec.in	4 Dec 2013 15:16:50 -0000	1.2
@@ -1,5 +1,7 @@
-%define debug_package %{nil}
-%define __spec_install_post /usr/lib/rpm/brp-compress
+# Binary package, no debuginfo should be generated
+%global debug_package %{nil}
+# Avoid binary manipulation or the main executable gets corrupted
+%global __spec_install_post /usr/lib/rpm/brp-compress
 
 Name:           skype
 Version:        4.2.0.11
@@ -27,11 +29,12 @@
 
 %package data
 Summary:        Skype Messaging and Telephony Client data files
-BuildArch:		noarch
+BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 
 %description data
-This package contains icons, sounds and support files for the main Skype package.
+This package contains icons, sounds and support files for the main Skype
+package.
 
 %prep
 %setup -q
@@ -39,6 +42,7 @@
 #!/bin/sh
 PULSE_LATENCY_MSEC=30 skype-bin
 EOF
+sed -i 's/\r$//' LICENSE
 
 %build
 # Nothing to build
@@ -70,19 +74,20 @@
 
 %post data
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-update-mime-database /usr/share/mime &> /dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
 
 %postun data
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
-update-mime-database /usr/share/mime &> /dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
 
 %posttrans data
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
+# Always replace the prelink information, the binary gets corrupted otherwise
 %config %{_sysconfdir}/prelink.conf.d/%{name}-%{_arch}.conf
 %{_bindir}/%{name}
 %if 0%{?fedora} >= 20
@@ -91,6 +96,7 @@
 
 %files data
 %doc LICENSE README third-party_attributions.txt
+# DBus information comes from upstream
 %config %{_sysconfdir}/dbus-1/system.d/%{name}.conf
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png