rpms/lpf-skype/devel skype-wrapper, NONE, 1.1 lpf-skype.spec, 1.14, 1.15 skype.spec.in, 1.3, 1.4
Author: slaanesh
Update of /cvs/nonfree/rpms/lpf-skype/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13971
Modified Files:
lpf-skype.spec skype.spec.in
Added Files:
skype-wrapper
Log Message:
* Mon May 19 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-3
- Allow command line parameters to be passed to wrapper.
--- NEW FILE skype-wrapper ---
#!/bin/sh
PULSE_LATENCY_MSEC=30 skype-bin $@
Index: lpf-skype.spec
===================================================================
RCS file: /cvs/nonfree/rpms/lpf-skype/devel/lpf-skype.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- lpf-skype.spec 29 Jan 2014 07:48:42 -0000 1.14
+++ lpf-skype.spec 19 May 2014 09:48:18 -0000 1.15
@@ -5,7 +5,7 @@
Name: lpf-skype
Version: 4.2.0.13
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Skype Messaging and Telephony Client package bootstrap
@@ -65,6 +65,10 @@
%changelog
+* Mon May 19 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-3
+- Allow command line parameters to be passed to wrapper.
+- Fix desktop file Exec line.
+
* Wed Jan 29 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-1
- Update to 4.2.0.13.
Index: skype.spec.in
===================================================================
RCS file: /cvs/nonfree/rpms/lpf-skype/devel/skype.spec.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- skype.spec.in 29 Jan 2014 07:48:43 -0000 1.3
+++ skype.spec.in 19 May 2014 09:48:18 -0000 1.4
@@ -5,7 +5,7 @@
Name: skype
Version: 4.2.0.13
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Skype Messaging and Telephony Client
License: Skype End User License Agreement
@@ -13,6 +13,7 @@
# Download at:
# http://www.skype.com/intl/en/get-skype/on-your-computer/linux/downloading...
Source0: http://download.skype.com/linux/%{name}-%{version}.tar.bz2
+Source1: %{name}-wrapper
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
@@ -38,25 +39,29 @@
%prep
%setup -q
-cat << EOF > %{name}-wrapper
-#!/bin/sh
-PULSE_LATENCY_MSEC=30 skype-bin
-EOF
+
sed -i 's/\r$//' LICENSE
%build
# Nothing to build
%install
-# Fedora 20+ needs a wrapper for PulseAudio latency
mkdir -p %{buildroot}%{_sysconfdir}/prelink.conf.d/
+
+
+# Fedora 20+ needs a wrapper for PulseAudio latency
%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
-install -p -D -m 755 %{name}-wrapper %{buildroot}%{_bindir}/%{name}
+
+install -p -D -m 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
install -p -D -m 655 %{name} %{buildroot}%{_bindir}/%{name}-bin
echo "-b %{_bindir}/skype-bin" >
%{buildroot}%{_sysconfdir}/prelink.conf.d/%{name}-%{_arch}.conf
+sed -i -e 's/Exec=env PULSE_LATENCY_MSEC=60 skype %U/Exec=env PULSE_LATENCY_MSEC=30
skype-bin %U/g' %{name}.desktop
+
%else
+
install -p -D -m 655 %{name} %{buildroot}%{_bindir}/%{name}
echo "-b %{_bindir}/skype" >
%{buildroot}%{_sysconfdir}/prelink.conf.d/%{name}-%{_arch}.conf
+
%endif
install -p -D -m 644 %{name}.conf
%{buildroot}%{_sysconfdir}/dbus-1/system.d/%{name}.conf
@@ -103,6 +108,12 @@
%{_datadir}/%{name}
%changelog
+* Mon May 19 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-3
+- Allow command line parameters to be passed to wrapper.
+
+* Wed May 14 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-2
+- Fix desktop file Exec line.
+
* Wed Jan 29 2014 Simone Caronni <negativo17(a)gmail.com> - 4.2.0.13-1
- Updated to 4.2.0.13.