[rpmfusion-nonfree-release/f31] Switch to branch layout
by Leigh Scott
commit c3d67ecf9a93c728c9d79b1c0b8e9ea16a29f980
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Aug 18 21:56:24 2019 +0100
Switch to branch layout
rpmfusion-nonfree-rawhide.repo | 2 +-
rpmfusion-nonfree-release.spec | 7 +++++--
rpmfusion-nonfree-updates-testing.repo | 2 +-
rpmfusion-nonfree.repo | 4 ++--
4 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/rpmfusion-nonfree-rawhide.repo b/rpmfusion-nonfree-rawhide.repo
index 391cb3e..adb2f06 100644
--- a/rpmfusion-nonfree-rawhide.repo
+++ b/rpmfusion-nonfree-rawhide.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora Rawhide - Nonfree
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/development/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-rawhi...
-enabled=1
+enabled=0
enabled_metadata=1
type=rpm-md
gpgcheck=0
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index e9725a8..b4fbeb8 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -1,10 +1,10 @@
#global repo free
%global repo nonfree
-%global israwhide 1
+#global israwhide 1
Name: rpmfusion-%{repo}-release
Version: 31
-Release: 0.2
+Release: 0.3
Summary: RPM Fusion (%{repo}) Repository Configuration
License: BSD
@@ -106,6 +106,9 @@ ln -s $(basename %{SOURCE32}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-tainted.repo
%changelog
+* Sun Aug 18 2019 Leigh Scott <leigh123linux(a)gmail.com> - 31-0.3
+- Switch to branch layout
+
* Tue Apr 09 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 31-0.2
- Remove f29 key
- Add f32 key
diff --git a/rpmfusion-nonfree-updates-testing.repo b/rpmfusion-nonfree-updates-testing.repo
index 90ba1c0..36e4d55 100644
--- a/rpmfusion-nonfree-updates-testing.repo
+++ b/rpmfusion-nonfree-updates-testing.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updat...
-enabled=0
+enabled=1
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
diff --git a/rpmfusion-nonfree.repo b/rpmfusion-nonfree.repo
index 5f73f00..239b8fb 100644
--- a/rpmfusion-nonfree.repo
+++ b/rpmfusion-nonfree.repo
@@ -2,8 +2,8 @@
name=RPM Fusion for Fedora $releasever - Nonfree
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$rele...
-enabled=0
-metadata_expire=14d
+enabled=1
+#metadata_expire=14d
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
5 years, 3 months
[rpmfusion-free-release/f31] Switch to branch layout
by Leigh Scott
commit 3c0e2e668a8d927fa28f4ffde7bbd0f4da796798
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Aug 18 21:41:24 2019 +0100
Switch to branch layout
rpmfusion-free-rawhide.repo | 2 +-
rpmfusion-free-release.spec | 7 +++++--
rpmfusion-free-updates-testing.repo | 2 +-
rpmfusion-free.repo | 4 ++--
4 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/rpmfusion-free-rawhide.repo b/rpmfusion-free-rawhide.repo
index 5946aab..5a02334 100644
--- a/rpmfusion-free-rawhide.repo
+++ b/rpmfusion-free-rawhide.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora Rawhide - Free
#baseurl=http://download1.rpmfusion.org/free/fedora/development/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-rawhide&...
-enabled=1
+enabled=0
enabled_metadata=1
type=rpm-md
gpgcheck=0
diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec
index 8dccdbe..29503c5 100644
--- a/rpmfusion-free-release.spec
+++ b/rpmfusion-free-release.spec
@@ -1,10 +1,10 @@
%global repo free
#global repo nonfree
-%global israwhide 1
+#global israwhide 1
Name: rpmfusion-%{repo}-release
Version: 31
-Release: 0.2
+Release: 0.3
Summary: RPM Fusion (%{repo}) Repository Configuration
License: BSD
@@ -106,6 +106,9 @@ ln -s $(basename %{SOURCE32}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-tainted.repo
%changelog
+* Sun Aug 18 2019 Leigh Scott <leigh123linux(a)gmail.com> - 31-0.3
+- Switch to branch layout
+
* Mon Apr 08 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 31-0.2
- Remove f29 key
- Add f32 key
diff --git a/rpmfusion-free-updates-testing.repo b/rpmfusion-free-updates-testing.repo
index 9c39b34..54112fd 100644
--- a/rpmfusion-free-updates-testing.repo
+++ b/rpmfusion-free-updates-testing.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora $releasever - Free - Test Updates
#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-...
-enabled=0
+enabled=1
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
diff --git a/rpmfusion-free.repo b/rpmfusion-free.repo
index 21ed42a..4f1611f 100644
--- a/rpmfusion-free.repo
+++ b/rpmfusion-free.repo
@@ -2,8 +2,8 @@
name=RPM Fusion for Fedora $releasever - Free
#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$release...
-enabled=0
-metadata_expire=14d
+enabled=1
+#metadata_expire=14d
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
5 years, 3 months
[rpmfusion-free-release/f30] Fixup rpmfusion-free-fedora-32 key
by Nicolas Chauvet
commit 7646b50cc38b0835b32d9f65013a8b02c99d0dbf
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Aug 18 10:31:48 2019 +0200
Fixup rpmfusion-free-fedora-32 key
RPM-GPG-KEY-rpmfusion-free-fedora-32-primary | 50 ++++++++++++++--------------
1 file changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/RPM-GPG-KEY-rpmfusion-free-fedora-32-primary b/RPM-GPG-KEY-rpmfusion-free-fedora-32-primary
index 1f78b89..0f90be6 100644
--- a/RPM-GPG-KEY-rpmfusion-free-fedora-32-primary
+++ b/RPM-GPG-KEY-rpmfusion-free-fedora-32-primary
@@ -1,29 +1,29 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-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
+mQINBFyps4IBEADNQys3kVRoIzE+tbfUSjneQWYYDuONJP3i9tuJjKC6NJJCDBxB
+NqxRdZm2XQjF4NThJHB+wOY6/M7XRzUVPE1LtoEaA/FXj12jogt7TN5aDT4VDyRV
+nBKlsW4tW/FcxPS9R7lCLsnTfX16yr59vwA6KpLR3FsbDUJyFLRX33GMxZVtVAv4
+181AeBA2WdTlebR8Cb0o0QowDyWkXRP97iV+qSiwhlOmCjl5LpQY1UZZ37VhoY+Y
+1TkFT8fnYKe5FO8Q5b6hFcaIESvGQ0rOAQC1GoHksG19BoQm80TzkHpFXdPmhvJT
++Q3J1xFID7WVwMtturtoTzW+MPcXcbeOquz5PbEAB3LocdYASkDcCpdLxNsVIWbe
+wVyXwTM8+/3kX+Pknc4PWdauOiap9w6og6x0ki1cVbYFo6X4mtfv5leIPkhfWqGn
+ZRwLNzCr/ilRuqerdkwvf0G/GebnzoSc9Sqsd552CHuXbB51OK0zP3ZnkG3y8i0R
+ls3J4PZY8IHxa1T4NQ4n0h4VrZ3TJhWQMvl1eI3aeTG4yM98jm3n+TQi73Z+PxjK
++8iAa1jTjAPew1qzJxStJXy6LfNyqwtaSOYI/MWCD9F4PDvxmXhLQu/UU7F2JPJ2
+4VApuAeMUDnb2aSNyCb894sJG126BwfHHjMKGAJadJInBMg9swlrx/R+AQARAQAB
+tFNSUE0gRnVzaW9uIGZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgzMikgPHJw
bWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCRQQTAQgALxYh
-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
-=NNM4
+BHvamO9ZMFCjSxaXq6DunYMQC82SBQJcqbOCAhsDBAsJCAcDFQgKAh4BAheAAAoJ
+EKDunYMQC82SfX0QAJJKGRFKuLX3tPHoUWutb85mXiClC1b8sLXnAGf3yZEXMZMi
+yIg6HEFfjpEYGLjjZDXR7vF2NzXpdzNV9+WNt8oafpdmeFRKAl2NFED7wZXsS/Bg
+KlxysH07GFEEcJ0hmeNP9fYLUZd/bpmRI/opKArKACmiJjKZGRVh7PoXJqUbeJIS
+fSnSxesCQzf5BbF//tdvmjgGinowuu6e5cB3fkrJBgw1HlZmkh88IHED3Ww/49ll
+dsI/e4tQZK0BydlqCWxguM/soIbfA0y/kpMb3aMRkN0pTKi7TcJcb9WWv/X96wSb
+hq1LyLzh7UYDULEnC8o/Lygc8DQ9WG+NoNI7cMvXeax80qNlPS2xuCwVddXK7EBk
+TgHpfG4b6/la5vH4Un3UuD03q+dq2iQn7FSFJ8iaBODg5JJQOqBLkg2dlPPv8hZK
+nb3Mf7Zu0rhyBm5DSfGkSGYv8JgRGsobek+pdP7bV2RPEmEuJycz7vV6kdS1BUvW
+f3wwFYe7MGXD9ITUcCq3a2TabsesqwqNzHizUbNWprrg8nQQRuEupas2+BDyGIL6
+34hsfZcS8e/N7Eis+lEBEKMo7Fn36VZZXHHe7bkKPpIsxvHjNmFgvdQVAOJRR+iQ
+SvzIApckQfmMKIzPJ4Mju9RmjWOQKA/PFc1RynIhemRfYCfVvCuMVSHxsqsF
+=hrxJ
-----END PGP PUBLIC KEY BLOCK-----
5 years, 3 months
[rpmfusion-free-release] Fixup rpmfusion-free-fedora-32 key
by Nicolas Chauvet
commit 374c972bef8f141a260101f3988d8d066dc3873a
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sun Aug 18 10:31:48 2019 +0200
Fixup rpmfusion-free-fedora-32 key
RPM-GPG-KEY-rpmfusion-free-fedora-32-primary | 50 ++++++++++++++--------------
1 file changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/RPM-GPG-KEY-rpmfusion-free-fedora-32-primary b/RPM-GPG-KEY-rpmfusion-free-fedora-32-primary
index 1f78b89..0f90be6 100644
--- a/RPM-GPG-KEY-rpmfusion-free-fedora-32-primary
+++ b/RPM-GPG-KEY-rpmfusion-free-fedora-32-primary
@@ -1,29 +1,29 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-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
+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
-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
-=NNM4
+BHvamO9ZMFCjSxaXq6DunYMQC82SBQJcqbOCAhsDBAsJCAcDFQgKAh4BAheAAAoJ
+EKDunYMQC82SfX0QAJJKGRFKuLX3tPHoUWutb85mXiClC1b8sLXnAGf3yZEXMZMi
+yIg6HEFfjpEYGLjjZDXR7vF2NzXpdzNV9+WNt8oafpdmeFRKAl2NFED7wZXsS/Bg
+KlxysH07GFEEcJ0hmeNP9fYLUZd/bpmRI/opKArKACmiJjKZGRVh7PoXJqUbeJIS
+fSnSxesCQzf5BbF//tdvmjgGinowuu6e5cB3fkrJBgw1HlZmkh88IHED3Ww/49ll
+dsI/e4tQZK0BydlqCWxguM/soIbfA0y/kpMb3aMRkN0pTKi7TcJcb9WWv/X96wSb
+hq1LyLzh7UYDULEnC8o/Lygc8DQ9WG+NoNI7cMvXeax80qNlPS2xuCwVddXK7EBk
+TgHpfG4b6/la5vH4Un3UuD03q+dq2iQn7FSFJ8iaBODg5JJQOqBLkg2dlPPv8hZK
+nb3Mf7Zu0rhyBm5DSfGkSGYv8JgRGsobek+pdP7bV2RPEmEuJycz7vV6kdS1BUvW
+f3wwFYe7MGXD9ITUcCq3a2TabsesqwqNzHizUbNWprrg8nQQRuEupas2+BDyGIL6
+34hsfZcS8e/N7Eis+lEBEKMo7Fn36VZZXHHe7bkKPpIsxvHjNmFgvdQVAOJRR+iQ
+SvzIApckQfmMKIzPJ4Mju9RmjWOQKA/PFc1RynIhemRfYCfVvCuMVSHxsqsF
+=hrxJ
-----END PGP PUBLIC KEY BLOCK-----
5 years, 3 months
[fs-uae-arcade] Updated to new upstream release
by Andrea Musuruane
commit 010d7edc8fc9bebea6e76606fbc26decee6b8d8b
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Aug 17 17:43:41 2019 +0200
Updated to new upstream release
.gitignore | 1 +
fs-uae-arcade-2.8.3-remove_inbuilt_six.patch | 19 -----------
fs-uae-arcade.spec | 51 +++++++++++-----------------
sources | 2 +-
4 files changed, 21 insertions(+), 52 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 42afa43..5bb7c19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/fs-uae-arcade-2.8.3.tar.gz
+/fs-uae-arcade-3.0.0.tar.gz
diff --git a/fs-uae-arcade.spec b/fs-uae-arcade.spec
index ebaa013..6581abd 100644
--- a/fs-uae-arcade.spec
+++ b/fs-uae-arcade.spec
@@ -1,18 +1,15 @@
%global __python %{__python3}
Name: fs-uae-arcade
-Version: 2.8.3
-Release: 10%{?dist}
+Version: 3.0.0
+Release: 1%{?dist}
Summary: Fullscreen game browser for FS-UAE
# The entire source code is GPLv2+ except oyoyo which is MIT
License: GPLv2+ and MIT
URL: http://fs-uae.net/
-Source0: http://fs-uae.net/fs-uae/stable/%{version}/%{name}-%{version}.tar.gz
+Source0: http://fs-uae.net/stable/%{version}/%{name}-%{version}.tar.gz
Source1: %{name}.appdata.xml
-# Remove six python library
-# Patch from fs-uae-arcade
-Patch0: %{name}-2.8.3-remove_inbuilt_six.patch
BuildArch: noarch
@@ -22,7 +19,8 @@ BuildRequires: libappstream-glib
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
Requires: python3-qt5
-Requires: python3-six
+Requires: python3-requests
+Requires: python3-pyopengl
Requires: liberation-sans-fonts
Requires: fs-uae = %{version}
@@ -34,32 +32,18 @@ FS-UAE Arcade is a fullscreen Amiga game browser for FS-UAE.
%prep
-%autosetup -p1
+%autosetup
-# In Python 3.7 async is a keyword, and so we can't have a module named async
-# https://github.com/mcfletch/pyopengl/issues/14
-# https://github.com/FrodeSolheim/fs-uae-arcade/issues/16
-# https://src.fedoraproject.org/rpms/python-pyopengl/c/fcae096bceb00a479903...
-mv OpenGL/GL/SGIX/async.py \
- OpenGL/GL/SGIX/async_.py
-
-mv OpenGL/raw/GL/SGIX/async.py \
- OpenGL/raw/GL/SGIX/async_.py
-
-sed -i -e 's/from OpenGL.raw.GL.SGIX.async/from OpenGL.raw.GL.SGIX.async_/g' \
- OpenGL/GL/SGIX/async_.py
-
-# Remove bundled lib
-rm -rf six
+# Remove bundled OpenGL library
+rm -rf OpenGL
+sed -i -r "/OpenGL/d" setup.py
# Remove shebang from non executable scripts
-FILES="fstd/adffile.py
- OpenGL/arrays/_buffers.py
- OpenGL/arrays/buffers.py
- arcade/res/update.py
+FILES="arcade/res/update.py
fsgs/amiga/adf.py
fstd/adffile.py
- launcher/apps/__init__.py"
+ launcher/apps/__init__.py
+ oyoyo/examplebot.py"
for pyfile in $FILES
do
sed -i -e '/^#!/, 1d' $pyfile
@@ -78,9 +62,9 @@ desktop-file-validate \
%{buildroot}%{_datadir}/applications/%{name}.desktop
# Install AppData file
-install -d %{buildroot}%{_datadir}/metainfo
-install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
+install -d %{buildroot}%{_metainfodir}
+install -p -m 644 %{SOURCE1} %{buildroot}%{_metainfodir}
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
# Symlink system font
rm %{buildroot}%{_datadir}/%{name}/arcade/res/LiberationSans-Bold.ttf
@@ -91,7 +75,7 @@ ln -s %{_datadir}/fonts/liberation/LiberationSans-Bold.ttf \
%files
%{_bindir}/%{name}
%{_datadir}/%{name}
-%{_datadir}/metainfo/%{name}.appdata.xml
+%{_metainfodir}/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%exclude %{_pkgdocdir}
@@ -99,6 +83,9 @@ ln -s %{_datadir}/fonts/liberation/LiberationSans-Bold.ttf \
%changelog
+* Tue Aug 13 2019 Andrea Musuruane <musuruan(a)gmail.com> - 3.0.0-1
+- Updated to new upstream release
+
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.8.3-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index ce43e5e..88b633f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b507dd1bf8e9e8c443f71900965059e2 fs-uae-arcade-2.8.3.tar.gz
+6e313fb8f83b97c253fb0c3ee9d1017e fs-uae-arcade-3.0.0.tar.gz
5 years, 3 months