[plus4emu] Updated to upstream 1.2.10 Updated URL and Source0
by Andrea Musuruane
commit 44a6d6d13a102a5ebf92f937f300c36a8ec13390
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Feb 11 10:43:02 2017 +0100
Updated to upstream 1.2.10
Updated URL and Source0
.gitignore | 1 +
p4fliconv.desktop | 3 +-
p4makecfg.desktop | 3 +-
plus4emu-1.2.10-SConstruct.patch | 22 ++++++++++
plus4emu-1.2.9-SConstruct.patch | 29 -------------
plus4emu-1.2.9.2-compat-lua.patch | 57 --------------------------
plus4emu-1.2.9.2-gcc45.patch | 24 -----------
plus4emu-1.2.9.2-gcc46.patch | 11 -----
plus4emu.desktop | 11 -----
plus4emu.png | Bin 554 -> 0 bytes
plus4emu.spec | 84 +++++++++++++++++++-------------------
sources | 2 +-
12 files changed, 67 insertions(+), 180 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0cc1611..691dca3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
plus4emu-1.2.9.2.tar.bz2
+/plus4emu-1.2.10.tar.gz
diff --git a/p4fliconv.desktop b/p4fliconv.desktop
index 7a6e951..d64af6f 100644
--- a/p4fliconv.desktop
+++ b/p4fliconv.desktop
@@ -1,9 +1,8 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Plus4emu FLI Converter
Comment=High resolution interlaced FLI converter utility
Exec=p4fliconv
-Icon=plus4emu
+Icon=Cbm4
Terminal=false
Type=Application
Categories=Graphics;2DGraphics;
diff --git a/p4makecfg.desktop b/p4makecfg.desktop
index d4074bb..03f1046 100644
--- a/p4makecfg.desktop
+++ b/p4makecfg.desktop
@@ -1,9 +1,8 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Plus4emu config
Comment=Reinstall Plus4emu configuration files
Exec=p4makecfg
-Icon=plus4emu
+Icon=Cbm4
Terminal=false
Type=Application
Categories=Game;Emulator;
diff --git a/plus4emu-1.2.10-SConstruct.patch b/plus4emu-1.2.10-SConstruct.patch
new file mode 100644
index 0000000..5b640ce
--- /dev/null
+++ b/plus4emu-1.2.10-SConstruct.patch
@@ -0,0 +1,22 @@
+diff -durN plus4emu-1.2.10.orig/SConstruct plus4emu-1.2.10/SConstruct
+--- plus4emu-1.2.10.orig/SConstruct 2017-02-05 19:27:24.000000000 +0100
++++ plus4emu-1.2.10/SConstruct 2017-02-06 17:12:08.409841846 +0100
+@@ -20,17 +20,7 @@
+ mingwCrossCompile)))
+ enableBuildCache = int(ARGUMENTS.get('cache', 0))
+
+-compilerFlags = ''
+-if buildRelease:
+- if linux32CrossCompile or (mingwCrossCompile and not win64CrossCompile):
+- compilerFlags = ' -march=pentium2 '
+-if enableDebug and not buildRelease:
+- compilerFlags = ' -Wno-long-long -Wshadow -g -O0 ' + compilerFlags
+- compilerFlags = ' -Wall -W -ansi -pedantic ' + compilerFlags
+-else:
+- compilerFlags = ' -Wall -O3 ' + compilerFlags + ' -mtune=generic '
+- compilerFlags = compilerFlags + ' -fno-inline-functions '
+- compilerFlags = compilerFlags + ' -fomit-frame-pointer -ffast-math '
++compilerFlags = os.environ['CXXFLAGS']
+
+ # -----------------------------------------------------------------------------
+
diff --git a/plus4emu.spec b/plus4emu.spec
index 2dcd1d8..155344d 100644
--- a/plus4emu.spec
+++ b/plus4emu.spec
@@ -1,33 +1,24 @@
-%define binprefix p4
-
Name: plus4emu
-Version: 1.2.9.2
-Release: 8%{?dist}
+Version: 1.2.10
+Release: 1%{?dist}
Summary: Portable emulator of the Commodore 264 family of computers
License: GPLv2+
-URL: http://plus4emu.sourceforge.net
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Source1: %{name}.png
-Source2: README_%{name}.Fedora
-Source3: %{name}.desktop
-Source4: p4fliconv.desktop
-Source5: %{binprefix}makecfg.desktop
-Patch0: %{name}-1.2.9-SConstruct.patch
+URL: https://github.com/istvan-v/plus4emu
+Source0: https://github.com/istvan-v/plus4emu/archive/%{version}.tar.gz#/%{name}-%...
+Source1: README_%{name}.Fedora
+Source2: p4fliconv.desktop
+Source3: p4makecfg.desktop
+Patch0: %{name}-1.2.10-SConstruct.patch
Patch1: %{name}-1.2.5-fixpathissue.patch
-Patch2: %{name}-1.2.9.2-gcc45.patch
-Patch3: %{name}-1.2.9.2-gcc46.patch
-Patch4: %{name}-1.2.9.2-compat-lua.patch
BuildRequires: desktop-file-utils
-BuildRequires: fltk-fluid >= 1.1.0
+BuildRequires: fltk-fluid
BuildRequires: libsndfile-devel
-%if 0%{?fedora} >= 20
-BuildRequires: compat-lua-devel
-%else
BuildRequires: lua-devel
-%endif
-BuildRequires: portaudio-devel >= 18
+BuildRequires: portaudio-devel
BuildRequires: scons
BuildRequires: SDL-devel
+BuildRequires: libXcursor-devel
+BuildRequires: libXinerama-devel
Requires: hicolor-icon-theme
%description
@@ -40,45 +31,47 @@ quality hardware emulation.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
+# Remove fltk_jpeg, fltk_png, and fltk_z libraries from SConstruct
+sed -i 's/ -lfltk_jpeg//' SConstruct
+sed -i 's/ -lfltk_png//' SConstruct
+sed -i 's/ -lfltk_z//' SConstruct
# Fix EOL chars
sed -i 's/\r//' README NEWS
-# Rename makecfg to a less generic name to avoid possible conflicts
-sed -i 's|makecfg|%{binprefix}makecfg|' gui/main.cpp README
-
-# Rename compress to a less generic name to avoid possible conflicts
-sed -i 's|compress -|%{binprefix}compress -|' README
-
# ROM images are in datadir
sed -i 's|installDirectory + "roms"|"%{_datadir}/%{name}/roms"|' installer/makecfg.cpp
%build
export CXXFLAGS="%{optflags}"
-scons %{?_smp_mflags}
+# Use nopkgconfig=1 to disable package checking because it fails on Fedora
+scons %{?_smp_mflags} \
+ VERBOSE=1 \
+ nopkgconfig=1 \
+ debug=1
%install
mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-install -pm0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-install -pm0644 %{SOURCE2} README.Fedora
-install -pm0755 p4fliconv p4sconv plus4emu tapconv %{buildroot}%{_bindir}
-install -pm0755 makecfg %{buildroot}%{_bindir}/%{binprefix}makecfg
-install -pm0755 compress %{buildroot}%{_bindir}/%{binprefix}compress
+install -pm0755 p4compress p4fliconv p4makecfg p4sconv p4tapconv plus4emu \
+ %{buildroot}%{_bindir}
+
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+install -pm0644 resource/Cbm4.png \
+ %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+
+install -pm0644 %{SOURCE1} README.Fedora
desktop-file-install --dir %{buildroot}%{_datadir}/applications \
- %{SOURCE3}
+ resource/plus4emu.desktop
desktop-file-install --dir %{buildroot}%{_datadir}/applications \
- %{SOURCE4}
+ %{SOURCE2}
desktop-file-install --dir %{buildroot}%{_datadir}/applications \
- %{SOURCE5}
+ %{SOURCE3}
# install ROM images
mkdir -p %{buildroot}%{_datadir}/%{name}/roms
@@ -103,14 +96,19 @@ fi
%files
%{_bindir}/*
%{_datadir}/%{name}
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/Cbm4.png
%{_datadir}/applications/%{name}.desktop
%{_datadir}/applications/p4fliconv.desktop
-%{_datadir}/applications/%{binprefix}makecfg.desktop
-%doc README COPYING NEWS README.Fedora
+%{_datadir}/applications/p4makecfg.desktop
+%doc README NEWS README.Fedora
+%license COPYING resource/Read_me.txt
%changelog
+* Sat Feb 11 2017 Andrea Musuruane <musuruan(a)gmail.com> 1.2.10-1
+- Updated to upstream 1.2.10
+- Updated URL and Source0
+
* Mon Sep 01 2014 Sérgio Basto <sergio(a)serjux.com> - 1.2.9.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index b0d5a48..63fc842 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3b71aed343a341f62e688dd5bc5b9d1f plus4emu-1.2.9.2.tar.bz2
+e477527cd5ed10adb72ea9e46b292e42 plus4emu-1.2.10.tar.gz
7 years, 9 months
[ffmpeg] Updated to 3.2.4
by Leigh Scott
commit e0afea7891ef66ebb11b71bc59a1f4bad416af4f
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Feb 11 06:13:06 2017 +0000
Updated to 3.2.4
ffmpeg.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 6bd1161..4c26990 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -61,7 +61,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
-Version: 3.2.3
+Version: 3.2.4
Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
@@ -381,6 +381,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Sat Feb 11 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.2.4-1
+- Updated to 3.2.4
+
* Mon Feb 06 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.2.3-1
- Updated to 3.2.3
diff --git a/sources b/sources
index 8276ad0..c7f59c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f01244929a992bc5bae4136f329f4b1 ffmpeg-3.2.3.tar.xz
+39fd71024ac76ba35f04397021af5606 ffmpeg-3.2.4.tar.xz
7 years, 9 months
[buildsys-build-rpmfusion/f25] rebuild for kernel 4.9.9-200.fc25
by Nicolas Chauvet
commit 72969079ac22da3785b11cb4cf2c2feac37a3f79
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Feb 10 19:52:16 2017 +0100
rebuild for kernel 4.9.9-200.fc25
buildsys-build-rpmfusion-kerneldevpkgs-current | 8 ++++----
buildsys-build-rpmfusion.spec | 5 ++++-
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/buildsys-build-rpmfusion-kerneldevpkgs-current b/buildsys-build-rpmfusion-kerneldevpkgs-current
index e9ca94c..c333c3a 100644
--- a/buildsys-build-rpmfusion-kerneldevpkgs-current
+++ b/buildsys-build-rpmfusion-kerneldevpkgs-current
@@ -1,4 +1,4 @@
-4.8.6-300.fc25
-4.8.6-300.fc25smp
-4.8.6-300.fc25PAE
-4.8.6-300.fc25lpae
+4.9.9-200.fc25
+4.9.9-200.fc25smp
+4.9.9-200.fc25PAE
+4.9.9-200.fc25lpae
diff --git a/buildsys-build-rpmfusion.spec b/buildsys-build-rpmfusion.spec
index 6629809..330b3b2 100644
--- a/buildsys-build-rpmfusion.spec
+++ b/buildsys-build-rpmfusion.spec
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 25
-Release: 1
+Release: 2
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Feb 10 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 10:25-2
+- rebuild for kernel 4.9.9-200.fc25
+
* Mon Nov 14 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 10:25-1
- rebuild for kernel 4.8.6-300.fc25
7 years, 9 months
[steam/f24] - Remove noruntime subpackage, use default new mechanism that uses host libraries as per client upda
by Simone Caronni
commit 90079a8e70b03c5662b89c250e182dfca3073a02
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Fri Feb 10 19:08:28 2017 +0100
- Remove noruntime subpackage, use default new mechanism that uses host libraries as per client update of 19th January (5th January for beta): http://store.steampowered.com/news/26953/
- Add libdbusmenu-gtk3 library requirement on Fedora (luckily not RHEL/CentOS).
- Remove patch for window button behaviour, use shell profile.
steam-3210.patch | 13 ---
steam-disable-runtime.patch | 45 ---------
steam.csh | 12 ++-
steam.sh | 11 +-
steam.spec | 241 ++++----------------------------------------
5 files changed, 38 insertions(+), 284 deletions(-)
---
diff --git a/steam.csh b/steam.csh
index 76e2c24..35dfd6f 100644
--- a/steam.csh
+++ b/steam.csh
@@ -1,5 +1,9 @@
-# Disable Ubuntu 32 bit runtime
-if ( -x /usr/bin/steam ) then
- setenv STEAM_RUNTIME "0"
-endif
+# Improved interactions between the Steam runtime and host distribution
+# libraries, which should let Steam work out of the box with open-source
+# graphics drivers on modern distributions. If using an older distribution or
+# running into problems, set variable at 0 to revert to the previous behavior.
+# setenv STEAM_RUNTIME_PREFER_HOST_LIBRARIES 0
+# Unify close-to-tray behavior with other platforms. If using a distribution
+# that doesn't have proper compatible tray support set variable at 0.
+setenv STEAM_FRAME_FORCE_CLOSE 1
diff --git a/steam.sh b/steam.sh
index 4576810..3c1c645 100644
--- a/steam.sh
+++ b/steam.sh
@@ -1,2 +1,9 @@
-# Disable Ubuntu 32 bit runtime
-[ -x /usr/bin/steam ] && export STEAM_RUNTIME=0
+# Improved interactions between the Steam runtime and host distribution
+# libraries, which should let Steam work out of the box with open-source
+# graphics drivers on modern distributions. If using an older distribution or
+# running into problems, set variable at 0 to revert to the previous behavior.
+# STEAM_RUNTIME_PREFER_HOST_LIBRARIES=0
+
+# Unify close-to-tray behavior with other platforms. If using a distribution
+# that doesn't have proper compatible tray support set variable at 0.
+STEAM_FRAME_FORCE_CLOSE=1
diff --git a/steam.spec b/steam.spec
index e365dd7..28f9029 100644
--- a/steam.spec
+++ b/steam.spec
@@ -6,7 +6,7 @@
Name: steam
Version: 1.0.0.54
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Installer for the Steam software distribution service
# Redistribution and repackaging for Linux is allowed, see license file
License: Steam License Agreement
@@ -45,15 +45,6 @@ Patch1: %{name}-3273.patch
# https://steamcommunity.com/app/353370/discussions/0/490123197956024380/
Patch2: %{name}-controller-gamepad-emulation.patch
-# Make "X" window button close the program instead of minimizing like "_"
-Patch3: %{name}-3210.patch
-
-# Do not remove libstdc++ from runtime on systems where mesa is compiled with
-# a statically linked libstdc++ (Fedora 22+) and enable option to run without
-# Ubuntu runtime:
-# https://github.com/ValveSoftware/steam-for-linux/issues/3697
-Patch4: %{name}-disable-runtime.patch
-
BuildRequires: desktop-file-utils
BuildRequires: systemd
@@ -102,217 +93,26 @@ Requires: libva-intel-driver%{?_isa}
# Required for hardware decoding during In-Home Streaming (radeon/nouveau)
Requires: libvdpau%{?_isa}
-%description
-Installer for the Steam software distribution service.
-Steam is a software distribution service with an online store, automated
-installation, automatic updates, achievements, SteamCloud synchronized
-savegame and screenshot functionality, and many social features.
-
-%if !0%{?rhel}
-%package noruntime
-Summary: Use system libraries instead of the Steam Runtime
-Requires: steam = %{version}-%{release}
-Buildarch: noarch
-
-# After the Steam client has been downloaded once, run the following command and
-# then adjust the list of requirements to remove dependencies pulled in by other
-# packages.
-
-# cd ~/.local/share/Steam/ubuntu12_32/
-# for i in `ldd *.so | egrep -v "linux-gate.so|ld-linux.so" | awk '{print $1}'` `find steam-runtime/i386 -name "*.so*" -exec basename {} \;`; do
-# dnf repoquery -q --qf="Requires: %{name}" --whatprovides "$i"
-# done | sort | uniq | sed 's/$/%{?_isa}/g'
-
-# Then remove compiz and emerald.
-
-Requires: alsa-lib%{?_isa}
-Requires: alsa-plugins-arcamav%{?_isa}
-Requires: alsa-plugins-jack%{?_isa}
-Requires: alsa-plugins-oss%{?_isa}
-Requires: alsa-plugins-pulseaudio%{?_isa}
-Requires: alsa-plugins-samplerate%{?_isa}
-Requires: alsa-plugins-speex%{?_isa}
-Requires: alsa-plugins-upmix%{?_isa}
-Requires: alsa-plugins-usbstream%{?_isa}
-Requires: alsa-plugins-vdownmix%{?_isa}
-Requires: atk%{?_isa}
-Requires: avahi-libs%{?_isa}
-Requires: bzip2-libs%{?_isa}
-Requires: cairo%{?_isa}
-Requires: compat-libgcrypt%{?_isa}
-Requires: cups-libs%{?_isa}
-Requires: dbus-glib%{?_isa}
-Requires: dbus-libs%{?_isa}
-Requires: dconf%{?_isa}
-Requires: elfutils-libelf%{?_isa}
-Requires: elfutils-libs%{?_isa}
-Requires: expat%{?_isa}
-Requires: ffmpeg-libs%{?_isa}
-Requires: flac-libs%{?_isa}
-Requires: fontconfig%{?_isa}
-Requires: freeglut%{?_isa}
-Requires: freetype%{?_isa}
-Requires: GConf2%{?_isa}
-Requires: gdk-pixbuf2%{?_isa}
-Requires: glib2%{?_isa}
-Requires: glibc%{?_isa}
-Requires: gmp%{?_isa}
-Requires: gnutls%{?_isa}
-Requires: graphite2%{?_isa}
-Requires: gsm%{?_isa}
-Requires: gstreamer%{?_isa}
-Requires: gstreamer1%{?_isa}
-Requires: gstreamer-devel%{?_isa}
-Requires: gstreamer-plugins-base%{?_isa}
-Requires: gtk2%{?_isa}
-Requires: gtk2-engines%{?_isa}
-Requires: gtk3%{?_isa}
-Requires: gtk-murrine-engine%{?_isa}
-Requires: harfbuzz%{?_isa}
-Requires: heimdal-libs%{?_isa}
-Requires: jack-audio-connection-kit%{?_isa}
-Requires: json-c%{?_isa}
-Requires: keyutils-libs%{?_isa}
-Requires: krb5-libs%{?_isa}
-Requires: lcms2%{?_isa}
-Requires: libacl%{?_isa}
-Requires: libappindicator%{?_isa}
-Requires: libasyncns%{?_isa}
-Requires: libattr%{?_isa}
-Requires: libcanberra%{?_isa}
-Requires: libcanberra-gtk2%{?_isa}
-Requires: libcap%{?_isa}
-Requires: libcom_err%{?_isa}
-Requires: libcurl%{?_isa}
-Requires: libdbusmenu%{?_isa}
-Requires: libdbusmenu-gtk2%{?_isa}
-Requires: libdrm%{?_isa}
-Requires: libexif%{?_isa}
-Requires: libffi%{?_isa}
-Requires: libgcc%{?_isa}
-Requires: libgcrypt%{?_isa}
-Requires: libGLEW%{?_isa}
-Requires: libgomp%{?_isa}
-Requires: libgpg-error%{?_isa}
-Requires: libICE%{?_isa}
-Requires: libidn%{?_isa}
-Requires: libindicator%{?_isa}
-Requires: libjpeg-turbo%{?_isa}
-Requires: libnotify%{?_isa}
-Requires: libogg%{?_isa}
-Requires: libpng%{?_isa}
-Requires: libpng12%{?_isa}
-Requires: libsamplerate%{?_isa}
-Requires: libselinux%{?_isa}
-Requires: libSM%{?_isa}
-Requires: libsndfile%{?_isa}
-Requires: libstdc++%{?_isa}
-Requires: libtasn1%{?_isa}
-Requires: libtdb%{?_isa}
-Requires: libtheora%{?_isa}
-Requires: libtool-ltdl%{?_isa}
-Requires: libusbx%{?_isa}
-Requires: libuuid%{?_isa}
-Requires: libva%{?_isa}
-Requires: libvdpau%{?_isa}
-Requires: libvorbis%{?_isa}
-Requires: libvpx%{?_isa}
-Requires: libwayland-client%{?_isa}
-Requires: libwayland-server%{?_isa}
-Requires: libX11%{?_isa}
-Requires: libXau%{?_isa}
-Requires: libXaw%{?_isa}
-Requires: libxcb%{?_isa}
-Requires: libXcomposite%{?_isa}
-Requires: libXcursor%{?_isa}
-Requires: libXdamage%{?_isa}
-Requires: libXdmcp%{?_isa}
-Requires: libXext%{?_isa}
-Requires: libXfixes%{?_isa}
-Requires: libXft%{?_isa}
-Requires: libXi%{?_isa}
-Requires: libXinerama%{?_isa}
-Requires: libxml2%{?_isa}
-Requires: libXmu%{?_isa}
-Requires: libXpm%{?_isa}
-Requires: libXrandr%{?_isa}
-Requires: libXrender%{?_isa}
-Requires: libXScrnSaver%{?_isa}
-Requires: libxshmfence%{?_isa}
-Requires: libXt%{?_isa}
-Requires: libXtst%{?_isa}
-Requires: libXxf86vm%{?_isa}
-Requires: mesa-libEGL%{?_isa}
-Requires: mesa-libgbm%{?_isa}
-Requires: mesa-libGL%{?_isa}
-Requires: mesa-libglapi%{?_isa}
-Requires: mesa-libGLU%{?_isa}
-Requires: ncurses-libs%{?_isa}
-Requires: nettle%{?_isa}
-Requires: NetworkManager-glib%{?_isa}
-Requires: nspr%{?_isa}
-Requires: nss%{?_isa}
-Requires: nss-softokn%{?_isa}
-Requires: nss-softokn-freebl%{?_isa}
-Requires: nss-util%{?_isa}
-Requires: openal-soft%{?_isa}
-Requires: openldap%{?_isa}
-Requires: openssl-libs%{?_isa}
-Requires: orc%{?_isa}
-Requires: p11-kit%{?_isa}
-Requires: pango%{?_isa}
-Requires: pangox-compat%{?_isa}
-Requires: pciutils-libs%{?_isa}
-Requires: pcre%{?_isa}
-Requires: pixman%{?_isa}
-Requires: pulseaudio-libs%{?_isa}
-Requires: SDL%{?_isa}
-Requires: SDL2%{?_isa}
-Requires: SDL2_image%{?_isa}
-Requires: SDL2_mixer%{?_isa}
-Requires: SDL2_net%{?_isa}
-Requires: SDL2_ttf%{?_isa}
-Requires: SDL_image%{?_isa}
-Requires: SDL_mixer%{?_isa}
-Requires: SDL_ttf%{?_isa}
-Requires: speex%{?_isa}
-Requires: speexdsp%{?_isa}
-Requires: sqlite%{?_isa}
-Requires: systemd-libs%{?_isa}
-Requires: tbb%{?_isa}
-Requires: tcp_wrappers-libs%{?_isa}
-Requires: xz-libs%{?_isa}
-Requires: zlib%{?_isa}
-
-%if 0%{?fedora} >= 23
-Requires: libgudev%{?_isa}
-Requires: trousers-lib%{?_isa}
-%else
-Requires: libgudev1%{?_isa}
-Requires: trousers%{?_isa}
+%if 0%{?fedora}
+# Required for having a functioning menu on the tray icon on Fedora
+# https://github.com/ValveSoftware/steam-for-linux/issues/4795
+Requires: libdbusmenu-gtk3%{?_isa}
%endif
-%description noruntime
-The Steam client normally uses a set of libraries derived from Ubuntu (the Steam
-Runtime); and all titles on Steam are compiled against those libraries.
+Provides: steam-noruntime = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: steam-noruntime < %{?epoch:%{epoch}:}%{version}-%{release}
-This package takes care of installing all the requirements to use system
-libraries in place of the Steam Runtime and a profile environment file to enable
-it. Please note that this is not a supported Valve configuration and it may lead
-to unexpected results.
-%endif
+%description
+Installer for the Steam software distribution service.
+Steam is a software distribution service with an online store, automated
+installation, automatic updates, achievements, SteamCloud synchronized savegame
+and screenshot functionality, and many social features.
%prep
%setup -q -n %{name}
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-
-%if !0%{?rhel}
-# Steam no-runtime package
-%patch4 -p1
-%endif
sed -i 's/\r$//' %{name}.desktop
sed -i 's/\r$//' steam_install_agreement.txt
@@ -337,11 +137,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
install -D -m 644 -p %{SOURCE3} \
%{buildroot}%{_prefix}/lib/firewalld/services/steam.xml
-%if !0%{?rhel}
-# Steam no-runtime package
+# Environment files
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
install -pm 644 %{SOURCE1} %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d
-%endif
%if 0%{?fedora} >= 25
# Install AppData
@@ -383,14 +181,17 @@ fi
%{_libdir}/%{name}/
%{_mandir}/man6/%{name}.*
%{_prefix}/lib/firewalld/services/%{name}.xml
-%{_udevrulesdir}/*
-
-%if !0%{?rhel}
-%files noruntime
%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
-%endif
+%{_udevrulesdir}/*
%changelog
+* Fri Feb 10 2017 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.54-5
+- Remove noruntime subpackage, use default new mechanism that uses host
+ libraries as per client update of 19th January (5th January for beta):
+ http://store.steampowered.com/news/26953/
+- Add libdbusmenu-gtk3 library requirement on Fedora (luckily not RHEL/CentOS).
+- Remove patch for window button behaviour, use shell profile.
+
* Sun Jan 22 2017 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.54-4
- Fix Source URL for post kernel 4.9 udev rules.
- Reintroduce optional and not endorsed by Valve noruntime subpackage for using
7 years, 9 months
[steam/el7] - Remove noruntime subpackage, use default new mechanism that uses host libraries as per client upda
by Simone Caronni
commit 705e0fb4930cbe143f283e27212a5d0ef82e0387
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Fri Feb 10 19:08:28 2017 +0100
- Remove noruntime subpackage, use default new mechanism that uses host libraries as per client update of 19th January (5th January for beta): http://store.steampowered.com/news/26953/
- Add libdbusmenu-gtk3 library requirement on Fedora (luckily not RHEL/CentOS).
- Remove patch for window button behaviour, use shell profile.
steam-3210.patch | 13 ---
steam-disable-runtime.patch | 45 ---------
steam.csh | 12 ++-
steam.sh | 11 +-
steam.spec | 241 ++++----------------------------------------
5 files changed, 38 insertions(+), 284 deletions(-)
---
diff --git a/steam.csh b/steam.csh
index 76e2c24..35dfd6f 100644
--- a/steam.csh
+++ b/steam.csh
@@ -1,5 +1,9 @@
-# Disable Ubuntu 32 bit runtime
-if ( -x /usr/bin/steam ) then
- setenv STEAM_RUNTIME "0"
-endif
+# Improved interactions between the Steam runtime and host distribution
+# libraries, which should let Steam work out of the box with open-source
+# graphics drivers on modern distributions. If using an older distribution or
+# running into problems, set variable at 0 to revert to the previous behavior.
+# setenv STEAM_RUNTIME_PREFER_HOST_LIBRARIES 0
+# Unify close-to-tray behavior with other platforms. If using a distribution
+# that doesn't have proper compatible tray support set variable at 0.
+setenv STEAM_FRAME_FORCE_CLOSE 1
diff --git a/steam.sh b/steam.sh
index 4576810..3c1c645 100644
--- a/steam.sh
+++ b/steam.sh
@@ -1,2 +1,9 @@
-# Disable Ubuntu 32 bit runtime
-[ -x /usr/bin/steam ] && export STEAM_RUNTIME=0
+# Improved interactions between the Steam runtime and host distribution
+# libraries, which should let Steam work out of the box with open-source
+# graphics drivers on modern distributions. If using an older distribution or
+# running into problems, set variable at 0 to revert to the previous behavior.
+# STEAM_RUNTIME_PREFER_HOST_LIBRARIES=0
+
+# Unify close-to-tray behavior with other platforms. If using a distribution
+# that doesn't have proper compatible tray support set variable at 0.
+STEAM_FRAME_FORCE_CLOSE=1
diff --git a/steam.spec b/steam.spec
index e365dd7..28f9029 100644
--- a/steam.spec
+++ b/steam.spec
@@ -6,7 +6,7 @@
Name: steam
Version: 1.0.0.54
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Installer for the Steam software distribution service
# Redistribution and repackaging for Linux is allowed, see license file
License: Steam License Agreement
@@ -45,15 +45,6 @@ Patch1: %{name}-3273.patch
# https://steamcommunity.com/app/353370/discussions/0/490123197956024380/
Patch2: %{name}-controller-gamepad-emulation.patch
-# Make "X" window button close the program instead of minimizing like "_"
-Patch3: %{name}-3210.patch
-
-# Do not remove libstdc++ from runtime on systems where mesa is compiled with
-# a statically linked libstdc++ (Fedora 22+) and enable option to run without
-# Ubuntu runtime:
-# https://github.com/ValveSoftware/steam-for-linux/issues/3697
-Patch4: %{name}-disable-runtime.patch
-
BuildRequires: desktop-file-utils
BuildRequires: systemd
@@ -102,217 +93,26 @@ Requires: libva-intel-driver%{?_isa}
# Required for hardware decoding during In-Home Streaming (radeon/nouveau)
Requires: libvdpau%{?_isa}
-%description
-Installer for the Steam software distribution service.
-Steam is a software distribution service with an online store, automated
-installation, automatic updates, achievements, SteamCloud synchronized
-savegame and screenshot functionality, and many social features.
-
-%if !0%{?rhel}
-%package noruntime
-Summary: Use system libraries instead of the Steam Runtime
-Requires: steam = %{version}-%{release}
-Buildarch: noarch
-
-# After the Steam client has been downloaded once, run the following command and
-# then adjust the list of requirements to remove dependencies pulled in by other
-# packages.
-
-# cd ~/.local/share/Steam/ubuntu12_32/
-# for i in `ldd *.so | egrep -v "linux-gate.so|ld-linux.so" | awk '{print $1}'` `find steam-runtime/i386 -name "*.so*" -exec basename {} \;`; do
-# dnf repoquery -q --qf="Requires: %{name}" --whatprovides "$i"
-# done | sort | uniq | sed 's/$/%{?_isa}/g'
-
-# Then remove compiz and emerald.
-
-Requires: alsa-lib%{?_isa}
-Requires: alsa-plugins-arcamav%{?_isa}
-Requires: alsa-plugins-jack%{?_isa}
-Requires: alsa-plugins-oss%{?_isa}
-Requires: alsa-plugins-pulseaudio%{?_isa}
-Requires: alsa-plugins-samplerate%{?_isa}
-Requires: alsa-plugins-speex%{?_isa}
-Requires: alsa-plugins-upmix%{?_isa}
-Requires: alsa-plugins-usbstream%{?_isa}
-Requires: alsa-plugins-vdownmix%{?_isa}
-Requires: atk%{?_isa}
-Requires: avahi-libs%{?_isa}
-Requires: bzip2-libs%{?_isa}
-Requires: cairo%{?_isa}
-Requires: compat-libgcrypt%{?_isa}
-Requires: cups-libs%{?_isa}
-Requires: dbus-glib%{?_isa}
-Requires: dbus-libs%{?_isa}
-Requires: dconf%{?_isa}
-Requires: elfutils-libelf%{?_isa}
-Requires: elfutils-libs%{?_isa}
-Requires: expat%{?_isa}
-Requires: ffmpeg-libs%{?_isa}
-Requires: flac-libs%{?_isa}
-Requires: fontconfig%{?_isa}
-Requires: freeglut%{?_isa}
-Requires: freetype%{?_isa}
-Requires: GConf2%{?_isa}
-Requires: gdk-pixbuf2%{?_isa}
-Requires: glib2%{?_isa}
-Requires: glibc%{?_isa}
-Requires: gmp%{?_isa}
-Requires: gnutls%{?_isa}
-Requires: graphite2%{?_isa}
-Requires: gsm%{?_isa}
-Requires: gstreamer%{?_isa}
-Requires: gstreamer1%{?_isa}
-Requires: gstreamer-devel%{?_isa}
-Requires: gstreamer-plugins-base%{?_isa}
-Requires: gtk2%{?_isa}
-Requires: gtk2-engines%{?_isa}
-Requires: gtk3%{?_isa}
-Requires: gtk-murrine-engine%{?_isa}
-Requires: harfbuzz%{?_isa}
-Requires: heimdal-libs%{?_isa}
-Requires: jack-audio-connection-kit%{?_isa}
-Requires: json-c%{?_isa}
-Requires: keyutils-libs%{?_isa}
-Requires: krb5-libs%{?_isa}
-Requires: lcms2%{?_isa}
-Requires: libacl%{?_isa}
-Requires: libappindicator%{?_isa}
-Requires: libasyncns%{?_isa}
-Requires: libattr%{?_isa}
-Requires: libcanberra%{?_isa}
-Requires: libcanberra-gtk2%{?_isa}
-Requires: libcap%{?_isa}
-Requires: libcom_err%{?_isa}
-Requires: libcurl%{?_isa}
-Requires: libdbusmenu%{?_isa}
-Requires: libdbusmenu-gtk2%{?_isa}
-Requires: libdrm%{?_isa}
-Requires: libexif%{?_isa}
-Requires: libffi%{?_isa}
-Requires: libgcc%{?_isa}
-Requires: libgcrypt%{?_isa}
-Requires: libGLEW%{?_isa}
-Requires: libgomp%{?_isa}
-Requires: libgpg-error%{?_isa}
-Requires: libICE%{?_isa}
-Requires: libidn%{?_isa}
-Requires: libindicator%{?_isa}
-Requires: libjpeg-turbo%{?_isa}
-Requires: libnotify%{?_isa}
-Requires: libogg%{?_isa}
-Requires: libpng%{?_isa}
-Requires: libpng12%{?_isa}
-Requires: libsamplerate%{?_isa}
-Requires: libselinux%{?_isa}
-Requires: libSM%{?_isa}
-Requires: libsndfile%{?_isa}
-Requires: libstdc++%{?_isa}
-Requires: libtasn1%{?_isa}
-Requires: libtdb%{?_isa}
-Requires: libtheora%{?_isa}
-Requires: libtool-ltdl%{?_isa}
-Requires: libusbx%{?_isa}
-Requires: libuuid%{?_isa}
-Requires: libva%{?_isa}
-Requires: libvdpau%{?_isa}
-Requires: libvorbis%{?_isa}
-Requires: libvpx%{?_isa}
-Requires: libwayland-client%{?_isa}
-Requires: libwayland-server%{?_isa}
-Requires: libX11%{?_isa}
-Requires: libXau%{?_isa}
-Requires: libXaw%{?_isa}
-Requires: libxcb%{?_isa}
-Requires: libXcomposite%{?_isa}
-Requires: libXcursor%{?_isa}
-Requires: libXdamage%{?_isa}
-Requires: libXdmcp%{?_isa}
-Requires: libXext%{?_isa}
-Requires: libXfixes%{?_isa}
-Requires: libXft%{?_isa}
-Requires: libXi%{?_isa}
-Requires: libXinerama%{?_isa}
-Requires: libxml2%{?_isa}
-Requires: libXmu%{?_isa}
-Requires: libXpm%{?_isa}
-Requires: libXrandr%{?_isa}
-Requires: libXrender%{?_isa}
-Requires: libXScrnSaver%{?_isa}
-Requires: libxshmfence%{?_isa}
-Requires: libXt%{?_isa}
-Requires: libXtst%{?_isa}
-Requires: libXxf86vm%{?_isa}
-Requires: mesa-libEGL%{?_isa}
-Requires: mesa-libgbm%{?_isa}
-Requires: mesa-libGL%{?_isa}
-Requires: mesa-libglapi%{?_isa}
-Requires: mesa-libGLU%{?_isa}
-Requires: ncurses-libs%{?_isa}
-Requires: nettle%{?_isa}
-Requires: NetworkManager-glib%{?_isa}
-Requires: nspr%{?_isa}
-Requires: nss%{?_isa}
-Requires: nss-softokn%{?_isa}
-Requires: nss-softokn-freebl%{?_isa}
-Requires: nss-util%{?_isa}
-Requires: openal-soft%{?_isa}
-Requires: openldap%{?_isa}
-Requires: openssl-libs%{?_isa}
-Requires: orc%{?_isa}
-Requires: p11-kit%{?_isa}
-Requires: pango%{?_isa}
-Requires: pangox-compat%{?_isa}
-Requires: pciutils-libs%{?_isa}
-Requires: pcre%{?_isa}
-Requires: pixman%{?_isa}
-Requires: pulseaudio-libs%{?_isa}
-Requires: SDL%{?_isa}
-Requires: SDL2%{?_isa}
-Requires: SDL2_image%{?_isa}
-Requires: SDL2_mixer%{?_isa}
-Requires: SDL2_net%{?_isa}
-Requires: SDL2_ttf%{?_isa}
-Requires: SDL_image%{?_isa}
-Requires: SDL_mixer%{?_isa}
-Requires: SDL_ttf%{?_isa}
-Requires: speex%{?_isa}
-Requires: speexdsp%{?_isa}
-Requires: sqlite%{?_isa}
-Requires: systemd-libs%{?_isa}
-Requires: tbb%{?_isa}
-Requires: tcp_wrappers-libs%{?_isa}
-Requires: xz-libs%{?_isa}
-Requires: zlib%{?_isa}
-
-%if 0%{?fedora} >= 23
-Requires: libgudev%{?_isa}
-Requires: trousers-lib%{?_isa}
-%else
-Requires: libgudev1%{?_isa}
-Requires: trousers%{?_isa}
+%if 0%{?fedora}
+# Required for having a functioning menu on the tray icon on Fedora
+# https://github.com/ValveSoftware/steam-for-linux/issues/4795
+Requires: libdbusmenu-gtk3%{?_isa}
%endif
-%description noruntime
-The Steam client normally uses a set of libraries derived from Ubuntu (the Steam
-Runtime); and all titles on Steam are compiled against those libraries.
+Provides: steam-noruntime = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: steam-noruntime < %{?epoch:%{epoch}:}%{version}-%{release}
-This package takes care of installing all the requirements to use system
-libraries in place of the Steam Runtime and a profile environment file to enable
-it. Please note that this is not a supported Valve configuration and it may lead
-to unexpected results.
-%endif
+%description
+Installer for the Steam software distribution service.
+Steam is a software distribution service with an online store, automated
+installation, automatic updates, achievements, SteamCloud synchronized savegame
+and screenshot functionality, and many social features.
%prep
%setup -q -n %{name}
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-
-%if !0%{?rhel}
-# Steam no-runtime package
-%patch4 -p1
-%endif
sed -i 's/\r$//' %{name}.desktop
sed -i 's/\r$//' steam_install_agreement.txt
@@ -337,11 +137,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
install -D -m 644 -p %{SOURCE3} \
%{buildroot}%{_prefix}/lib/firewalld/services/steam.xml
-%if !0%{?rhel}
-# Steam no-runtime package
+# Environment files
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
install -pm 644 %{SOURCE1} %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d
-%endif
%if 0%{?fedora} >= 25
# Install AppData
@@ -383,14 +181,17 @@ fi
%{_libdir}/%{name}/
%{_mandir}/man6/%{name}.*
%{_prefix}/lib/firewalld/services/%{name}.xml
-%{_udevrulesdir}/*
-
-%if !0%{?rhel}
-%files noruntime
%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
-%endif
+%{_udevrulesdir}/*
%changelog
+* Fri Feb 10 2017 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.54-5
+- Remove noruntime subpackage, use default new mechanism that uses host
+ libraries as per client update of 19th January (5th January for beta):
+ http://store.steampowered.com/news/26953/
+- Add libdbusmenu-gtk3 library requirement on Fedora (luckily not RHEL/CentOS).
+- Remove patch for window button behaviour, use shell profile.
+
* Sun Jan 22 2017 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.54-4
- Fix Source URL for post kernel 4.9 udev rules.
- Reintroduce optional and not endorsed by Valve noruntime subpackage for using
7 years, 9 months
[xorg-x11-drv-nvidia] Bump cuda-drivers release to 100
by Nicolas Chauvet
commit 3e44442578c89b151a5200f8f7b43a7bcdcf2860
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Feb 10 11:50:49 2017 +0100
Bump cuda-drivers release to 100
xorg-x11-drv-nvidia.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index f33a23b..b9842cc 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -108,8 +108,8 @@ Requires: %{name}-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: %{name}-cuda%{?_isa} = %{?epoch}:%{version}-%{release}
#Don't put an epoch here
-Provides: cuda-drivers-devel = %{version}
-Provides: cuda-drivers-devel%{?_isa} = %{version}
+Provides: cuda-drivers-devel = %{version}-100
+Provides: cuda-drivers-devel%{?_isa} = %{version}-100
%description devel
This package provides the development files of the %{name} package,
@@ -125,8 +125,8 @@ Provides: nvidia-persistenced = %{version}-%{release}
Conflicts: xorg-x11-drv-nvidia-340xx-cuda
#Don't put an epoch here
-Provides: cuda-drivers = %{version}
-Provides: cuda-drivers%{?_isa} = %{version}
+Provides: cuda-drivers = %{version}-100
+Provides: cuda-drivers%{?_isa} = %{version}-100
%description cuda
This package provides the CUDA driver libraries.
7 years, 9 months