[fs-uae-arcade/f26] First import
by Andrea Musuruane
Summary of changes:
e79ae76... First import (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 11 months
[fs-uae-arcade/f27] First import
by Andrea Musuruane
Summary of changes:
e79ae76... First import (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 11 months
[fs-uae-arcade] First import
by Andrea Musuruane
commit e79ae768a296e919b33d7214dbe3ff36a69619df
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Dec 9 16:07:28 2017 +0100
First import
.gitignore | 1 +
fs-uae-arcade-2.8.3-remove_inbuilt_six.patch | 19 +++++
fs-uae-arcade.appdata.xml | 20 +++++
fs-uae-arcade.spec | 119 +++++++++++++++++++++++++++
sources | 1 +
5 files changed, 160 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..42afa43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/fs-uae-arcade-2.8.3.tar.gz
diff --git a/fs-uae-arcade-2.8.3-remove_inbuilt_six.patch b/fs-uae-arcade-2.8.3-remove_inbuilt_six.patch
new file mode 100644
index 0000000..1f1be9b
--- /dev/null
+++ b/fs-uae-arcade-2.8.3-remove_inbuilt_six.patch
@@ -0,0 +1,19 @@
+diff -durN fs-uae-arcade-2.8.3.orig/setup.py fs-uae-arcade-2.8.3/setup.py
+--- fs-uae-arcade-2.8.3.orig/setup.py 2017-01-08 20:48:58.000000000 +0100
++++ fs-uae-arcade-2.8.3/setup.py 2017-10-15 18:51:35.819270252 +0200
+@@ -33,7 +33,6 @@
+ "launcher": "../fs-uae-launcher",
+ "OpenGL": "../fs-uae-launcher",
+ "oyoyo": "../fs-uae-launcher",
+- "six": "../fs-uae-launcher",
+ }
+ packages = sorted(package_map.keys())
+ scripts = ["fs-uae-arcade"]
+@@ -60,7 +59,6 @@
+ res_dirs.append('fsui/res')
+ res_dirs.append('launcher/res')
+ res_dirs.append('oyoyo/res')
+-res_dirs.append('six/res')
+
+
+ def add_package(package_name, package_dir_name):
diff --git a/fs-uae-arcade.appdata.xml b/fs-uae-arcade.appdata.xml
new file mode 100644
index 0000000..47c50c0
--- /dev/null
+++ b/fs-uae-arcade.appdata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2017 Andrea Musuruane <musuruan(a)gmail.com -->
+<component type="desktop">
+ <id>abbaye.desktop</id>
+ <metadata_license>CC-BY-SA-3.0</metadata_license>
+ <project_license>GPL-2.0+ and MIT</project_license>
+ <name>FS-UAE Arcade</name>
+ <summary>Fullscreen game browser for FS-UAE</summary>
+ <description>
+ <p>
+ FS-UAE Arcade is a fullscreen Amiga game browser for FS-UAE.
+ </p>
+ </description>
+ <screenshots>
+ <screenshot type="default">
+ <image>https://fs-uae.net/images/fs-uae/front2.png</image>
+ </screenshot>
+ </screenshots>
+ <url type="homepage">http://fs-uae.net/</url>
+</component>
diff --git a/fs-uae-arcade.spec b/fs-uae-arcade.spec
new file mode 100644
index 0000000..51d70d1
--- /dev/null
+++ b/fs-uae-arcade.spec
@@ -0,0 +1,119 @@
+%global __python %{__python3}
+
+Name: fs-uae-arcade
+Version: 2.8.3
+Release: 3%{?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
+Source1: %{name}.appdata.xml
+# Remove six python library
+# Patch from fs-uae-arcade
+Patch0: %{name}-2.8.3-remove_inbuilt_six.patch
+
+BuildArch: noarch
+
+BuildRequires: python3-devel
+BuildRequires: gettext
+BuildRequires: libappstream-glib
+BuildRequires: desktop-file-utils
+Requires: hicolor-icon-theme
+Requires: python3-qt5
+Requires: python3-six
+Requires: liberation-sans-fonts
+Requires: fs-uae = %{version}
+
+# oyoyo is not in Fedora
+Provides: bundled(python3-oyoyo) = 0.0.0
+
+%description
+FS-UAE Arcade is a fullscreen Amiga game browser for FS-UAE.
+
+
+%prep
+%autosetup -p1
+
+# Remove bundled lib
+rm -rf six
+
+# Remove shebang from non executable scripts
+FILES="fstd/adffile.py
+ OpenGL/arrays/_buffers.py
+ OpenGL/arrays/buffers.py
+ arcade/res/update.py
+ fsgs/amiga/adf.py
+ fstd/adffile.py
+ launcher/apps/__init__.py"
+for pyfile in $FILES
+do
+ sed -i -e '/^#!/, 1d' $pyfile
+done
+
+
+%build
+# EMPTY SECTION
+
+
+%install
+%make_install prefix=%{_prefix}
+
+# Validate desktop file
+desktop-file-validate \
+ %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+# Install AppData file
+install -d %{buildroot}%{_datadir}/appdata
+install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
+
+# Symlink system font
+rm %{buildroot}%{_datadir}/%{name}/arcade/res/LiberationSans-Bold.ttf
+ln -s %{_datadir}/fonts/liberation/LiberationSans-Bold.ttf \
+ %{buildroot}%{_datadir}/%{name}/arcade/res/LiberationSans-Bold.ttf
+
+
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%postun
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%files
+%{_bindir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%exclude %{_pkgdocdir}
+%license COPYING
+
+
+%changelog
+* Sun Oct 15 2017 Andrea Musuruane <musuruan(a)gmail.com> - 2.8.3-3
+- Added a virtual provide to note oyoyo is bundled
+- Amended License tag
+- Added AppData file
+- Removed six python library
+- Unbundled font file
+
+* Sat Sep 16 2017 Andrea Musuruane <musuruan(a)gmail.com> - 2.8.3-2
+- Relaxed fs-uae requires
+
+* Sat Sep 09 2017 Andrea Musuruane <musuruan(a)gmail.com> - 2.8.3-1
+- Updated to new upstream version
+
+* Sun Apr 03 2016 Andrea Musuruane <musuruan(a)gmail.com> - 2.6.2-1
+- First release
+
diff --git a/sources b/sources
index e69de29..ce43e5e 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+b507dd1bf8e9e8c443f71900965059e2 fs-uae-arcade-2.8.3.tar.gz
6 years, 11 months
[shotcut/f26] Rebuild
by Martin Gansser
commit 9f1a0d92c3d398502401755b72d32e5fb4388b55
Author: martinkg <martinkg(a)fedoraproject.org>
Date: Sat Dec 9 16:05:31 2017 +0100
Rebuild
shotcut-noupdatecheck.patch | 28 ----------------------------
1 file changed, 28 deletions(-)
---
diff --git a/shotcut-noupdatecheck.patch b/shotcut-noupdatecheck.patch
index e5ae26c..f4e34ad 100644
--- a/shotcut-noupdatecheck.patch
+++ b/shotcut-noupdatecheck.patch
@@ -1,29 +1,13 @@
Index: src/mainwindow.cpp
===================================================================
-<<<<<<< HEAD
---- src/mainwindow.cpp.orig 2017-11-04 16:11:25.163538614 +0100
-+++ src/mainwindow.cpp 2017-11-04 16:17:17.798846928 +0100
-@@ -2547,9 +2547,9 @@
-=======
--- src/mainwindow.cpp.orig 2017-12-08 13:38:56.944162254 +0100
+++ src/mainwindow.cpp 2017-12-08 13:42:07.385176045 +0100
@@ -2548,9 +2548,9 @@
->>>>>>> master
void MainWindow::showUpgradePrompt()
{
- QAction* action = new QAction(tr("Click here to check for a new version of Shotcut."), 0);
- connect(action, SIGNAL(triggered(bool)), SLOT(on_actionUpgrade_triggered()));
-<<<<<<< HEAD
-- showStatusMessage(action, 30 /* seconds */);
-+ //QAction* action = new QAction(tr("Click here to check for a new version of Shotcut."), 0);
-+ //connect(action, SIGNAL(triggered(bool)), SLOT(on_actionUpgrade_triggered()));
-+ //showStatusMessage(action, 30 /* seconds */);
- }
-
- void MainWindow::on_actionRealtime_triggered(bool checked)
-@@ -2908,7 +2908,7 @@
-=======
- showStatusMessage(action, 15 /* seconds */);
+ //QAction* action = new QAction(tr("Click here to check for a new version of Shotcut."), 0);
+ //connect(action, SIGNAL(triggered(bool)), SLOT(on_actionUpgrade_triggered()));
@@ -32,7 +16,6 @@ Index: src/mainwindow.cpp
void MainWindow::on_actionRealtime_triggered(bool checked)
@@ -2909,7 +2909,6 @@
->>>>>>> master
void MainWindow::on_actionUpgrade_triggered()
{
showStatusMessage("Checking for upgrade...");
@@ -40,31 +23,20 @@ Index: src/mainwindow.cpp
}
void MainWindow::on_actionOpenXML_triggered()
-<<<<<<< HEAD
-@@ -3040,7 +3040,8 @@
-=======
@@ -3041,7 +3040,7 @@
->>>>>>> master
m_upgradeUrl = json.object().value("url").toString();
showStatusMessage(action, 10 /* seconds */);
} else {
- showStatusMessage(tr("You are running the latest version of Shotcut."));
+ showStatusMessage(tr("Use dnf for updates."));
-+
}
reply->deleteLater();
return;
Index: src/src.pro
===================================================================
-<<<<<<< HEAD
---- src/src.pro.orig 2017-11-04 16:22:22.359946204 +0100
-+++ src/src.pro 2017-11-04 16:25:41.796318201 +0100
-@@ -326,7 +326,7 @@
-=======
--- src/src.pro.orig 2017-12-08 13:42:45.581178811 +0100
+++ src/src.pro 2017-12-08 13:44:10.984184995 +0100
@@ -329,7 +329,7 @@
->>>>>>> master
LIBS += -lCuteLogger -lmvcp -lpthread
isEmpty(SHOTCUT_VERSION) {
6 years, 11 months
[shotcut/f26] Rebuild
by Martin Gansser
commit 36f30fffc65a9f210c7426f64df2057db689e7a5
Author: martinkg <martinkg(a)fedoraproject.org>
Date: Sat Dec 9 15:43:48 2017 +0100
Rebuild
sources | 4 ----
1 file changed, 4 deletions(-)
---
diff --git a/sources b/sources
index 1de741a..8625384 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-9cb3b6a9a534dd7d616698748b75cac8 shotcut-17.11.tar.gz
-=======
f2d1b4bacdee13bb6b21ee9d38c2e7fc shotcut-17.12.tar.gz
->>>>>>> master
6 years, 11 months
[shotcut/f26: 2/2] Merge branch 'master' into f26
by Martin Gansser
commit 6de647f7a8a220e387280f6627ac6c53d778fcb3
Merge: 8390aa7 b0b5377
Author: martinkg <martinkg(a)fedoraproject.org>
Date: Sat Dec 9 11:52:40 2017 +0100
Merge branch 'master' into f26
shotcut.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
6 years, 11 months
[shotcut/f27] Rebuild
by Martin Gansser
Summary of changes:
b0b5377... Rebuild (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 11 months
[shotcut] Rebuild
by Martin Gansser
commit b0b537723fec4e3ea7d853f82279b359d4efdd6a
Author: martinkg <martinkg(a)fedoraproject.org>
Date: Sat Dec 9 11:42:59 2017 +0100
Rebuild
shotcut.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/shotcut.spec b/shotcut.spec
index f25d1cf..0393d3f 100644
--- a/shotcut.spec
+++ b/shotcut.spec
@@ -4,7 +4,7 @@
Name: shotcut
Version: 17.12
-Release: 1%{dist}
+Release: 2%{dist}
Summary: A free, open source, cross-platform video editor
# The entire source code is GPLv3+ except mvcp/ which is LGPLv2+
License: GPLv3+ and LGPLv2+
@@ -191,6 +191,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a
%doc doc
%changelog
+* Sat Dec 09 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 17.12-2
+- Rebuild
+
* Fri Dec 08 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 17.12-1
- Update to 17.12
6 years, 11 months
