[tvheadend] Update to 4.2.6
by Mohamed ElMorabity
commit a4bef8fdeb82578f779c68b894b39044abd24c63
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Tue Mar 27 13:56:43 2018 +0200
Update to 4.2.6
.gitignore | 1 +
sources | 2 +-
tvheadend.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5dfcb6a..6161bce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/tvheadend-4.2.3.tar.gz
/tvheadend-4.2.4.tar.gz
/tvheadend-4.2.5.tar.gz
+/tvheadend-4.2.6.tar.gz
diff --git a/sources b/sources
index 3363adb..5292193 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5f6065c1dcb1d3bc1a4cb757d2741c0 tvheadend-4.2.5.tar.gz
+ed593fa2e4bab6130aaf20f5017d23fb tvheadend-4.2.6.tar.gz
diff --git a/tvheadend.spec b/tvheadend.spec
index 1594fd3..d922c0e 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -2,8 +2,8 @@
%global tvheadend_group video
Name: tvheadend
-Version: 4.2.5
-Release: 7%{?dist}
+Version: 4.2.6
+Release: 1%{?dist}
Summary: TV streaming server and digital video recorder
Group: Applications/Multimedia
@@ -154,6 +154,9 @@ exit 0
%changelog
+* Tue Mar 27 2018 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.6-1
+- Update to 4.2.6
+
* Sat Mar 17 2018 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.5-7
- Add explicite Requires on tar and bzip2 (required by Tvheadend for
configuration backups)
6 years, 8 months
[steam/el7] Re-add icon cache scriptlets for EPEL, as it's still required. Remove firewalld differences for EPEL
by Simone Caronni
commit 4e0da91689859d148b6526b1d66e30e3bc0d83ad
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Tue Mar 27 09:22:57 2018 +0200
Re-add icon cache scriptlets for EPEL, as it's still required.
Remove firewalld differences for EPEL.
steam.spec | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/steam.spec b/steam.spec
index 14aa0c2..4d82841 100644
--- a/steam.spec
+++ b/steam.spec
@@ -1,12 +1,9 @@
# Binary package, no debuginfo should be generated
%global debug_package %{nil}
-# If firewalld macro is not defined, define it here:
-%{!?firewalld_reload:%global firewalld_reload test -f /usr/bin/firewall-cmd && firewall-cmd --reload --quiet || :}
-
Name: steam
Version: 1.0.0.54
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: Installer for the Steam software distribution service
# Redistribution and repackaging for Linux is allowed, see license file
License: Steam License Agreement
@@ -79,13 +76,8 @@ Requires: systemd-libs%{?_isa}
# Required for the firewall rules
# http://fedoraproject.org/wiki/PackagingDrafts/ScriptletSnippets/Firewalld
-%if 0%{?rhel}
-Requires: firewalld
-Requires(post): firewalld
-%else
Requires: firewalld-filesystem
Requires(post): firewalld-filesystem
-%endif
# Required for hardware decoding during In-Home Streaming (intel)
# Since libva-intel-driver on f28+ there is hw detection with appstream
@@ -153,6 +145,7 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/appdata/
%post
%if 0%{?rhel} == 7
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
/usr/bin/update-desktop-database &> /dev/null || :
%endif
%firewalld_reload
@@ -160,6 +153,14 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/appdata/
%postun
%if 0%{?rhel} == 7
/usr/bin/update-desktop-database &> /dev/null || :
+
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ %{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%files
@@ -178,6 +179,10 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/appdata/
%{_udevrulesdir}/*
%changelog
+* Tue Mar 27 2018 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.54-17
+- Re-add icon cache scriptlets for EPEL, as it's still required.
+- Remove firewalld differences for EPEL.
+
* Tue Mar 27 2018 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.54-16
- Restore libstdc++ patch.
- Update udev rules.
6 years, 8 months
[steam/f26] Re-add icon cache scriptlets for EPEL, as it's still required. Remove firewalld differences for EPEL
by Simone Caronni
commit ea8f49dc48aa5815aea098c789ed9feff501f0b1
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Tue Mar 27 09:22:57 2018 +0200
Re-add icon cache scriptlets for EPEL, as it's still required.
Remove firewalld differences for EPEL.
steam.spec | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/steam.spec b/steam.spec
index 14aa0c2..4d82841 100644
--- a/steam.spec
+++ b/steam.spec
@@ -1,12 +1,9 @@
# Binary package, no debuginfo should be generated
%global debug_package %{nil}
-# If firewalld macro is not defined, define it here:
-%{!?firewalld_reload:%global firewalld_reload test -f /usr/bin/firewall-cmd && firewall-cmd --reload --quiet || :}
-
Name: steam
Version: 1.0.0.54
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: Installer for the Steam software distribution service
# Redistribution and repackaging for Linux is allowed, see license file
License: Steam License Agreement
@@ -79,13 +76,8 @@ Requires: systemd-libs%{?_isa}
# Required for the firewall rules
# http://fedoraproject.org/wiki/PackagingDrafts/ScriptletSnippets/Firewalld
-%if 0%{?rhel}
-Requires: firewalld
-Requires(post): firewalld
-%else
Requires: firewalld-filesystem
Requires(post): firewalld-filesystem
-%endif
# Required for hardware decoding during In-Home Streaming (intel)
# Since libva-intel-driver on f28+ there is hw detection with appstream
@@ -153,6 +145,7 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/appdata/
%post
%if 0%{?rhel} == 7
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
/usr/bin/update-desktop-database &> /dev/null || :
%endif
%firewalld_reload
@@ -160,6 +153,14 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/appdata/
%postun
%if 0%{?rhel} == 7
/usr/bin/update-desktop-database &> /dev/null || :
+
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ %{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%files
@@ -178,6 +179,10 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/appdata/
%{_udevrulesdir}/*
%changelog
+* Tue Mar 27 2018 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.54-17
+- Re-add icon cache scriptlets for EPEL, as it's still required.
+- Remove firewalld differences for EPEL.
+
* Tue Mar 27 2018 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.54-16
- Restore libstdc++ patch.
- Update udev rules.
6 years, 8 months
[steam/f26: 4/4] Restore libstdc++ patch. Update udev rules. Remove obsolete scriptlets.
by Simone Caronni
commit 5419033fa29d4082557de49dce652574ffdd15c9
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Tue Mar 27 08:56:39 2018 +0200
Restore libstdc++ patch.
Update udev rules.
Remove obsolete scriptlets.
51-these-are-not-joysticks-rm.rules | 6 ++++++
steam-3273.patch | 11 +++++++++++
steam.spec | 26 ++++++++++++--------------
3 files changed, 29 insertions(+), 14 deletions(-)
---
diff --git a/51-these-are-not-joysticks-rm.rules b/51-these-are-not-joysticks-rm.rules
index 2e7e25d..3e0ab40 100644
--- a/51-these-are-not-joysticks-rm.rules
+++ b/51-these-are-not-joysticks-rm.rules
@@ -3,6 +3,10 @@
# This file is auto-generated. For more information:
# https://github.com/denilsonsa/udev-joystick-blacklist
+SUBSYSTEM=="input", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c30a", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}=""
+SUBSYSTEM=="input", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c30a", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}=""
+SUBSYSTEM=="input", ATTRS{idVendor}=="04d9", ATTRS{idProduct}=="a0df", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}=""
+SUBSYSTEM=="input", ATTRS{idVendor}=="04d9", ATTRS{idProduct}=="a0df", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}=""
SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0010", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}=""
SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0010", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}=""
SUBSYSTEM=="input", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0011", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}=""
@@ -65,6 +69,8 @@ SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="f613", ENV{ID_IN
SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="f613", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}=""
SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="f624", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}=""
SUBSYSTEM=="input", ATTRS{idVendor}=="09da", ATTRS{idProduct}=="f624", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}=""
+SUBSYSTEM=="input", ATTRS{idVendor}=="1b1c", ATTRS{idProduct}=="1b3c", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}=""
+SUBSYSTEM=="input", ATTRS{idVendor}=="1b1c", ATTRS{idProduct}=="1b3c", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}=""
SUBSYSTEM=="input", ATTRS{idVendor}=="1d57", ATTRS{idProduct}=="ad03", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}=""
SUBSYSTEM=="input", ATTRS{idVendor}=="1d57", ATTRS{idProduct}=="ad03", KERNEL=="js[0-9]*", RUN+="/bin/rm %E{DEVNAME}", ENV{ID_INPUT_JOYSTICK}=""
SUBSYSTEM=="input", ATTRS{idVendor}=="1e7d", ATTRS{idProduct}=="2e4a", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ID_INPUT_JOYSTICK}=""
diff --git a/steam-3273.patch b/steam-3273.patch
new file mode 100644
index 0000000..462ea4a
--- /dev/null
+++ b/steam-3273.patch
@@ -0,0 +1,11 @@
+diff -Naur steam.old/steam steam/steam
+--- steam.old/steam 2016-04-01 17:24:25.913225942 +0200
++++ steam/steam 2016-04-01 17:24:31.130311263 +0200
+@@ -198,3 +198,7 @@
+
+ # Workaround for bug 3570: https://github.com/ValveSoftware/steam-for-linux/issues/3570
+ rm -f /tmp/steam_chrome_shmem
++
++# Workaround for bug 3273: https://github.com/ValveSoftware/steam-for-linux/issues/3273
++rm -f $LAUNCHSTEAMPLATFORM/steam-runtime/i386/usr/lib/i386-linux-gnu/libstdc++.so.6*
++rm -f $LAUNCHSTEAMPLATFORM/steam-runtime/amd64/usr/lib/x86_64-linux-gnu/libstdc++.so.6*
diff --git a/steam.spec b/steam.spec
index 96a7cbd..14aa0c2 100644
--- a/steam.spec
+++ b/steam.spec
@@ -6,7 +6,7 @@
Name: steam
Version: 1.0.0.54
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: Installer for the Steam software distribution service
# Redistribution and repackaging for Linux is allowed, see license file
License: Steam License Agreement
@@ -35,9 +35,13 @@ Source10: README.Fedora
# https://github.com/ValveSoftware/steam-for-linux/issues/3570
Patch0: %{name}-3570.patch
+# Remove libstdc++ from runtime:
+# https://github.com/ValveSoftware/steam-for-linux/issues/3273
+Patch1: %{name}-3273.patch
+
# Make Steam Controller usable as a GamePad:
# https://steamcommunity.com/app/353370/discussions/0/490123197956024380/
-Patch1: %{name}-controller-gamepad-emulation.patch
+Patch2: %{name}-controller-gamepad-emulation.patch
BuildRequires: desktop-file-utils
BuildRequires: systemd
@@ -114,9 +118,7 @@ installation, automatic updates, achievements, SteamCloud synchronized savegame
and screenshot functionality, and many social features.
%prep
-%setup -q -n %{name}
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1 -n %{name}
sed -i 's/\r$//' %{name}.desktop
sed -i 's/\r$//' steam_install_agreement.txt
@@ -150,7 +152,6 @@ mkdir -p %{buildroot}%{_datadir}/appdata
install -p -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/appdata/
%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%if 0%{?rhel} == 7
/usr/bin/update-desktop-database &> /dev/null || :
%endif
@@ -160,16 +161,8 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/appdata/
%if 0%{?rhel} == 7
/usr/bin/update-desktop-database &> /dev/null || :
%endif
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- %{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
-%{!?_licensedir:%global license %%doc}
%license COPYING steam_install_agreement.txt
%doc README debian/changelog README.Fedora
%{_bindir}/%{name}
@@ -185,6 +178,11 @@ fi
%{_udevrulesdir}/*
%changelog
+* Tue Mar 27 2018 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.54-16
+- Restore libstdc++ patch.
+- Update udev rules.
+- Remove obsolete scriptlets.
+
* Mon Mar 26 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.0.54-15
- Switch to libva with f28+
6 years, 8 months