[steam/el7: 3/3] Merge branch 'master' into el7
by Simone Caronni
commit b6e3d1250af95821130a0ac697476f11c7ae2422
Merge: a962f36 838f0cb
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Sat Sep 24 10:18:37 2016 +0200
Merge branch 'master' into el7
steam.appdata.xml | 38 ++++++++++++++++++++++++++++++++++++++
steam.spec | 24 +++++++++++++++++++++---
2 files changed, 59 insertions(+), 3 deletions(-)
---
8 years, 2 months
[steam/el7: 2/3] Do not run update-desktop-database on Fedora 25+, add AppStream metadata
by Simone Caronni
commit 838f0cb912ef5838981170e33837ab751d44179f
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Sat Sep 24 10:18:21 2016 +0200
Do not run update-desktop-database on Fedora 25+, add AppStream metadata
steam.appdata.xml | 38 ++++++++++++++++++++++++++++++++++++++
steam.spec | 24 +++++++++++++++++++++---
2 files changed, 59 insertions(+), 3 deletions(-)
---
diff --git a/steam.appdata.xml b/steam.appdata.xml
new file mode 100644
index 0000000..ee47ebe
--- /dev/null
+++ b/steam.appdata.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+ <id>steam.desktop</id>
+ <name>Steam</name>
+ <summary>Installer for the Steam client</summary>
+ <description>
+ <p>
+ Steam is a digital distribution platform developed by Valve Corporation offering digital rights management (DRM), multiplayer gaming and social networking services. Steam provides the user with installation and automatic updating of games on multiple computers, and community features such as friends lists and groups, cloud saving, and in-game voice and chat functionality.
+ </p>
+ <p>The software provides a freely available application programming interface (API) called Steamworks, which developers can use to integrate many of Steam's functions into their products, including networking, matchmaking, in-game achievements, micro-transactions, and support for user-created content through Steam Workshop.
+ </p>
+ </description>
+ <translation/>
+ <url type="homepage">http://http://store.steampowered.com/</url>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>LicenseRef-proprietary:Steam</project_license>
+ <developer_name>Valve Corporation</developer_name>
+ <keywords>
+ <keyword>Gaming</keyword>
+ <keyword>Valve</keyword>
+ <keyword>Streaming</keyword>
+ </keywords>
+ <update_contact>negativo17(a)gmail.com</update_contact>
+ <screenshots>
+ <screenshot type="default">
+ <caption>The main Steam library window</caption>
+ <image type="source" width="1280" height="720">http://negativo17.org/appstream/steam-0.png</image>
+ </screenshot>
+ <screenshot>
+ <caption>Steam Store interface</caption>
+ <image type="source" width="1280" height="720">http://negativo17.org/appstream/steam-1.png</image>
+ </screenshot>
+ <screenshot>
+ <caption>Steam community</caption>
+ <image type="source" width="1280" height="720">http://negativo17.org/appstream/steam-2.png</image>
+ </screenshot>
+ </screenshots>
+</component>
diff --git a/steam.spec b/steam.spec
index bf9355c..02a53da 100644
--- a/steam.spec
+++ b/steam.spec
@@ -6,7 +6,7 @@
Name: steam
Version: 1.0.0.52
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Installer for the Steam software distribution service
# Redistribution and repackaging for Linux is allowed, see license file
License: Steam License Agreement
@@ -15,6 +15,7 @@ ExclusiveArch: i686
Source0: http://repo.steampowered.com/steam/pool/%{name}/s/%{name}/%{name}_%{versi...
Source3: %{name}.xml
+Source4: %{name}.appdata.xml
# Workaround for input devices seen as joysticks (linux kernel bug) and
# viceversa for the Steam controller:
@@ -121,13 +122,23 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
install -D -m 644 -p %{SOURCE3} \
%{buildroot}%{_prefix}/lib/firewalld/services/steam.xml
+%if 0%{?fedora} >= 25
+# Install AppData
+mkdir -p %{buildroot}%{_datadir}/appdata
+install -p -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/appdata/
+%endif
+
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-%{_bindir}/update-desktop-database &> /dev/null || :
+%if 0%{?fedora} == 24 || 0%{?fedora} == 23 || 0%{?rhel} == 7
+/usr/bin/update-desktop-database &> /dev/null || :
+%endif
%firewalld_reload
%postun
-%{_bindir}/update-desktop-database &> /dev/null || :
+%if 0%{?fedora} == 24 || 0%{?fedora} == 23 || 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 || :
@@ -141,6 +152,9 @@ fi
%license COPYING steam_install_agreement.txt
%doc README debian/changelog README.Fedora
%{_bindir}/%{name}
+%if 0%{?fedora} >= 25
+%{_datadir}/appdata/%{name}.appdata.xml
+%endif
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/pixmaps/%{name}.png
@@ -151,6 +165,10 @@ fi
%{_udevrulesdir}/*
%changelog
+* Sat Sep 24 2016 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.52-3
+- Do not run update-desktop-database on Fedora 25+.
+- Add AppStream metadata.
+
* Sat Aug 13 2016 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.52-2
- Make Steam Controller usable as a gamepad (#4062).
- Update UDev rule for keyboards detected as joysticks.
8 years, 2 months
[steam/el7] (3 commits) ...Merge branch 'master' into el7
by Simone Caronni
Summary of changes:
aff85bf... Add sources to .gitignore file (*)
838f0cb... Do not run update-desktop-database on Fedora 25+, add AppSt
b6e3d12... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent
8 years, 2 months
[x264] Update to 0.148-20160924-86b7198 version
by Sérgio M. Basto
commit 36ac6ae0d5cb72b37ba60a8dc69eae3b147e0935
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Sep 24 04:31:21 2016 +0100
Update to 0.148-20160924-86b7198 version
- Change versioning of the package in order to have better information, now the
package version include date plus git short commit, as result we may reset the
release count.
.gitignore | 1 +
sources | 2 +-
x264.spec | 16 +++++++++++-----
3 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a40918d..227b5de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
x264-0.144-20150225-c8a773e.tar.bz2
x264-0.148-20160118-5c65704.tar.bz2
/x264-0.148-20160614-a5e06b9.tar.bz2
+/x264-0.148-20160924-86b7198.tar.bz2
diff --git a/sources b/sources
index ebb5a07..46ab657 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-504515ba14fed322ad89cf39f05e78ee x264-0.148-20160614-a5e06b9.tar.bz2
+5d3470475b238807a57d22d39c58277c x264-0.148-20160924-86b7198.tar.bz2
diff --git a/x264.spec b/x264.spec
index 3f60dfa..0a5ac90 100644
--- a/x264.spec
+++ b/x264.spec
@@ -1,7 +1,7 @@
-# globals for x264-0.148-20160614-a5e06b9.tar.bz2
+# globals for x264-0.148-20160924-86b7198.tar.bz2
%global api 148
-%global gitdate 20160614
-%global gitversion a5e06b9
+%global gitdate 20160924
+%global gitversion 86b7198
%global snapshot %{gitdate}-%{gitversion}
%global gver .%{gitdate}git%{gitversion}
%global branch stable
@@ -29,8 +29,8 @@
Summary: H264/AVC video streams encoder
Name: x264
-Version: 0.%{api}
-Release: 11%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Version: 0.%{api}%{?gver}
+Release: 1%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -200,6 +200,12 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%endif
%changelog
+* Sat Sep 24 2016 Sérgio Basto <sergio(a)serjux.com> - 0.148.20160924git86b7198-1
+- Update to 0.148-20160924-86b7198 version
+- Change versioning of the package in order to have better information, now the
+ package version include date plus git short commit, as result we may reset the
+ release count.
+
* Fri Aug 26 2016 Dominik Mierzejewski <rpm(a)greysector.net> - 0.148-11.20160614gita5e06b9
- rework asm treatment on i686 and ppc64
- fix adding the 10b suffix to the library name
8 years, 2 months
[amule] Update changelog.
by Sérgio M. Basto
commit b54ba55896849a98560582daa909aae6d69e263b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Sep 23 07:29:01 2016 +0100
Update changelog.
amule.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/amule.spec b/amule.spec
index cae9c27..00f5f95 100644
--- a/amule.spec
+++ b/amule.spec
@@ -171,6 +171,7 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/INSTALL
* Fri May 06 2016 Sérgio Basto <sergio(a)serjux.com> - 2.3.2-0.1.20160506git88aa023
- Update to amule to pre 0.3.2
- Use new location of sources.
+- Move BR:wxGTK-devel to wxGTK3-devel
- Drop patch aMule-2.3.1-gcc47 is upstreamed.
- Man files and others are fixed, they are converted to UTF-8.
8 years, 2 months