[gtetrinet] Update gtetrinet.spec and his patches
by Sérgio M. Basto
commit 301a91c3cb59b37b0e9fefa10cbeecf049d9f7fe
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Mar 1 07:02:22 2020 +0000
Update gtetrinet.spec and his patches
.gitignore | 1 +
gtetrinet-intl.patch | 12 ------------
gtetrinet.spec | 20 +++++++++++---------
sources | 5 +++--
4 files changed, 15 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b0768db..25e9a43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
gtetrinet-0.7.11.tar.bz2
mmr-sounds-1.0.tar.gz
/gtetrinet-GTETRINET_0_7_11.tar.gz
+/GTETRINET_0_7_11...12cec675f4354d585ef754813b79695db30a8b1e.diff
diff --git a/gtetrinet.spec b/gtetrinet.spec
index c005813..1f711b7 100644
--- a/gtetrinet.spec
+++ b/gtetrinet.spec
@@ -1,27 +1,27 @@
Summary: GNOME version of a tetris game playable on the net
Name: gtetrinet
Version: 0.7.11
-Release: 16%{?dist}
+Release: 17%{?dist}
License: GPLv2+
Group: Amusements/Games
URL: http://gtetrinet.sourceforge.net/
-Source0: https://github.com/GNOME/gtetrinet/archive/GTETRINET_0_7_11/gtetrinet-GTE...
+Source0: https://github.com/stump/gtetrinet/archive/GTETRINET_0_7_11/gtetrinet-GTE...
Source1: tetrinet.txt
Source2: http://www.mavit.pwp.blueyonder.co.uk/mmr-sounds-1.0.tar.gz
-Patch1: GTETRINET_0_7_11...master.diff
-#Patch2: master...stump:master.diff
-Patch2: master...stump:12cec675f4354d585ef754813b79695db30a8b1e.diff
-Patch3: gtetrinet-intl.patch
+# Fork of user stump, but removed last 3 commits, they break translations in menus.
+Patch2: https://github.com/stump/gtetrinet/compare/GTETRINET_0_7_11...12cec675f43...
BuildRequires: gtk2-devel >= 2.18.0
BuildRequires: glib2-devel >= 2.32.0
BuildRequires: libgnome-devel >= 2.0.0
BuildRequires: libgnomeui-devel >= 2.0.0
-#BuildRequires: esound-devel
+BuildRequires: esound-devel
BuildRequires: libcanberra-devel
BuildRequires: autoconf automake libtool gettext-devel intltool
BuildRequires: perl(XML::Parser)
+Recommends: tetrinetx
+
%description
GTetrinet is a client program for the popular Tetrinet game, a multiplayer
tetris game that is played over the internet. (If you don't know what Tetrinet
@@ -33,8 +33,7 @@ is, check out tetrinet.org)
%build
mkdir m4
-autoreconf -i
-intltoolize
+./autogen.sh
%configure --disable-dependency-tracking --enable-ipv6
%make_build
@@ -60,6 +59,9 @@ intltoolize
%changelog
+* Sun Mar 01 2020 Sérgio Basto <sergio(a)serjux.com> - 0.7.11-17
+- Update gtetrinet.spec and his patches
+
* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.7.11-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources
index f44f793..e5bf40a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-14a7a442111b874e5025ad20442b0d8c gtetrinet-GTETRINET_0_7_11.tar.gz
-796278e896758c43bbd0402219753a73 mmr-sounds-1.0.tar.gz
+SHA512 (gtetrinet-GTETRINET_0_7_11.tar.gz) = 863e5aee97f15e91b3fac350ebae881bc0688c334c3d7695f340f5f8a4f0a1ed6b8c43ee29a798a131d80ca8d799c5a700f42ae484a3d635ef8ae1bf354c2672
+SHA512 (mmr-sounds-1.0.tar.gz) = 5065aa60d8296e346a152625d1556095b99ccae21c5d6891c754e10ea90d5a1e1796474b7a8cb0003f3a3ff7e454cce9b5aa28a841d9e5490e39758a5753ecf9
+SHA512 (GTETRINET_0_7_11...12cec675f4354d585ef754813b79695db30a8b1e.diff) = 8f2d76bc8cfc8367d87a6d88a1f534b66e3a543b775188fb7ccd3a73b2801911fe9ce1a7d863c6ef47ba25a1d61927ee891cb94e94187032c44b6f4136a2d577
4 years, 1 month
[smplayer] Add appdata file, copied from https://github.com/sanjayankur31/rpmfusion-appdata
by Sérgio M. Basto
commit 3808f9f80081cb4ce98d0d05be5a0c194d5bb7ab
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Mar 1 06:02:21 2020 +0000
Add appdata file, copied from
https://github.com/sanjayankur31/rpmfusion-appdata
smplayer.appdata.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
smplayer.spec | 9 ++++++++-
update_smplayer.sh | 2 --
3 files changed, 56 insertions(+), 3 deletions(-)
---
diff --git a/smplayer.appdata.xml b/smplayer.appdata.xml
new file mode 100644
index 0000000..2fb9859
--- /dev/null
+++ b/smplayer.appdata.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2015 Ankur Sinha <ankursinha AT fedoraproject DOT org> -->
+
+<!-- HOUSEKEEPING, REMOVE THIS COMMENT WHEN THIS GOES UPSTREAM
+BugReportURL: rhbz-#
+SentUpstream: yyyy-mm-dd
+-->
+
+<application>
+ <id type="desktop">rpmfusion-smplayer.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <summary>A graphical frontend for mpv and mplayer</summary>
+ <description>
+ <p>
+ SMPlayer is a free media player for Windows and Linux with built-in
+ codecs that can play virtually all video and audio formats. It doesn't
+ need any external codecs. Just install SMPlayer and you'll be able to
+ play all formats without the hassle to find and install codec packs.
+ </p>
+
+ <p>
+ One of the most interesting features of SMPlayer: it remembers the
+ settings of all files you play. So you start to watch a movie but you
+ have to leave... don't worry, when you open that movie again it will be
+ resumed at the same point you left it, and with the same settings:
+ audio track, subtitles, volume...
+ </p>
+
+ <p>
+ SMPlayer is a graphical user interface (GUI) for the award-winning
+ MPlayer, which is capable of playing almost all known video and audio
+ formats. But apart from providing access for the most common and useful
+ options of MPlayer, SMPlayer adds other interesting features like the
+ possibility to play Youtube videos or download subtitles.
+ </p>
+ </description>
+ <url type="homepage">http://smplayer.sourceforge.net/linux/</url>
+ <screenshots>
+ <screenshot type="default">http://smplayer.sourceforge.net/images/screenshots/mainwindow.png</screenshot>
+ <screenshot type="default">http://smplayer.sourceforge.net/images/screenshots/thumbnail_generator_en...</screenshot>
+ <screenshot type="default">http://smplayer.sourceforge.net/images/screenshots/find_subtitles.png</screenshot>
+ <screenshot type="default">http://smplayer.sourceforge.net/images/screenshots/smplayer_skin_modern3.png</screenshot>
+ </screenshots>
+ <!-- FIXME: change this to an upstream email address for spec updates
+ <updatecontact>someone_who_cares(a)upstream_project.org</updatecontact>
+ -->
+</application>
+
diff --git a/smplayer.spec b/smplayer.spec
index 41fc7cc..c484fd1 100644
--- a/smplayer.spec
+++ b/smplayer.spec
@@ -2,12 +2,13 @@ Name: smplayer
Version: 19.10.2
%global smplayer_themes_ver 18.6.0
%global smplayer_skins_ver 15.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A graphical frontend for mplayer and mpv
License: GPLv2+
URL: https://www.smplayer.info/
Source0: https://downloads.sourceforge.net/smplayer/smplayer-%{version}.tar.bz2
+Source2: %{name}.appdata.xml
Source3: https://downloads.sourceforge.net/smplayer/smplayer-themes-%{smplayer_the...
Source4: https://downloads.sourceforge.net/smplayer/smplayer-skins-%{smplayer_skin...
# Fix regression in Thunar (TODO: re-check in upcoming versions!)
@@ -127,6 +128,7 @@ pushd smplayer-skins-%{smplayer_skins_ver}
mv README.txt README-skins.txt
mv Changelog Changelog-skins.txt
popd
+install -m 0644 -D %{SOURCE2} %{buildroot}%{_metainfodir}/%{name}.appdata.xml
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
@@ -158,6 +160,7 @@ fi
%exclude %{_datadir}/smplayer/themes/
%{_mandir}/man1/%{name}.1.*
%{_docdir}/%{name}
+%{_metainfodir}/%{name}.appdata.xml
%files themes
%doc smplayer-themes-%{smplayer_themes_ver}/README.txt
@@ -168,6 +171,10 @@ fi
%{_datadir}/smplayer/themes/
%changelog
+* Sun Mar 01 2020 Sérgio Basto <sergio(a)serjux.com> - 19.10.2-3
+- Add appdata file, copied from
+ https://github.com/sanjayankur31/rpmfusion-appdata
+
* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 19.10.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/update_smplayer.sh b/update_smplayer.sh
index db54bbd..0915108 100755
--- a/update_smplayer.sh
+++ b/update_smplayer.sh
@@ -44,7 +44,5 @@ git checkout f31 && git merge master && git push && rfpkg build --nowait; git ch
echo Press enter to continue; read dummy;
git checkout f30 && git merge master && git push && rfpkg build --nowait; git checkout master
echo Press enter to continue; read dummy;
-git checkout f29 && git merge master && git push && rfpkg build --nowait; git checkout master
-echo Press enter to continue; read dummy;
git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master
fi
4 years, 1 month
[dvdstyler] Miss to delete one line
by Sérgio M. Basto
commit c42a062c0a1433b0bb24a669180a86b48f6e47ab
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Mar 1 05:11:30 2020 +0000
Miss to delete one line
dvdstyler.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/dvdstyler.spec b/dvdstyler.spec
index 379acde..5276eae 100644
--- a/dvdstyler.spec
+++ b/dvdstyler.spec
@@ -39,7 +39,6 @@ Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.
%endif
Source2: %{name}.appdata.xml
-Patch1: dvdstyler-wxwin.m4.patch
# build
BuildRequires: automake
BuildRequires: autoconf
4 years, 1 month
[dvdstyler] Add appdata file, copied from https://github.com/sanjayankur31/rpmfusion-appdata Some cleanups, dr
by Sérgio M. Basto
commit 0b39e9e7ea996e9cdd8df6e742bbac6328969921
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Mar 1 05:01:27 2020 +0000
Add appdata file, copied from
https://github.com/sanjayankur31/rpmfusion-appdata
Some cleanups, drop patch1, it was just for compat-wxGTK3-gtk2
dvdstyler-wxwin.m4.patch | 27 ----------------------
dvdstyler.appdata.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++
dvdstyler.spec | 24 +++++++++++---------
ffmpeg35_buildfix.patch | 12 ----------
4 files changed, 71 insertions(+), 50 deletions(-)
---
diff --git a/dvdstyler.appdata.xml b/dvdstyler.appdata.xml
new file mode 100644
index 0000000..0de03d6
--- /dev/null
+++ b/dvdstyler.appdata.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2015 Ankur Sinha <ankursinha(a)fedoraproject.org> -->
+
+<!-- HOUSEKEEPING, REMOVE THIS COMMENT WHEN THIS GOES UPSTREAM
+BugReportURL: rhbz-#
+SentUpstream: yyyy-mm-dd
+-->
+
+<application>
+ <id type="desktop">dvdstyler.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <summary>Cross-platform DVD authoring application</summary>
+ <description>
+ <p>
+ DVDStyler is a cross-platform free DVD authoring application for the
+ creation of professional-looking DVDs. It allows not only burning of
+ video files on DVD that can be played practically on any standalone DVD
+ player, but also creation of individually designed DVD menus. It is
+ Open Source Software and is completely free.
+
+
+ </p>
+ <p>
+ Features
+ Tip: DVDStyler is PC software, not self-hosted web software, so a web hosting plan is not required.
+ </p>
+ <ul>
+
+ <li>Create and burn DVD video with interactive menus</li>
+ <li>Design your own DVD menu or select one from the list of ready to use menu templates</li>
+ <li>Create photo slideshow</li>
+ <li>Add multiple subtitle and audio tracks</li>
+ <li>Support of AVI, MOV, MP4, MPEG, OGG, WMV and other file formats</li>
+ <li>Support of MPEG-2, MPEG-4, DivX, Xvid, MP2, MP3, AC-3 and other audio and video formats</li>
+ <li>Support of multi-core processor</li>
+ <li>Use MPEG and VOB files without reencoding, see FAQ</li>
+ <li>Put files with different audio/video format on one DVD (support of titleset)</li>
+ <li>User-friendly interface with support of drag & drop</li>
+ <li>Flexible menu creation on the basis of scalable vector graphic</li>
+ <li>Import of image file for background</li>
+ <li>Place buttons, text, images and other graphic objects anywhere on the menu screen</li>
+ <li>Change the font/color and other parameters of buttons and graphic objects</li>
+ <li>Scale any button or graphic object</li>
+ <li>Copy any menu object or whole menu</li>
+ <li>Customize navigation using DVD scripting</li>
+
+ </ul>
+ </description>
+ <url type="homepage">http://www.dvdstyler.de/</url>
+ <screenshots>
+ <screenshot type="default">http://www.dvdstyler.org/images/screenshots/ffm.jpg</screenshot>
+ <screenshot type="default">http://www.dvdstyler.org/images/screenshots/blue.jpg</screenshot>
+ <screenshot type="default">http://www.dvdstyler.org/images/screenshots/filebrowser.jpg</screenshot>
+ <screenshot type="default">http://www.dvdstyler.org/images/screenshots/travel.jpg</screenshot>
+ </screenshots>
+ <updatecontact>alex AT thuering.biz</updatecontact>
+</application>
+
diff --git a/dvdstyler.spec b/dvdstyler.spec
index b7c5862..379acde 100644
--- a/dvdstyler.spec
+++ b/dvdstyler.spec
@@ -14,9 +14,9 @@ Name: dvdstyler
Epoch: 2
Version: 3.1.2
%if 0%{?usesnapshot}
-Release: 9.beta4%{?snapshottag}%{?dist}
+Release: 10.beta4%{?snapshottag}%{?dist}
%else
-Release: 3%{?dist}
+Release: 4%{?dist}
%endif
Summary: Cross-platform DVD authoring application
License: GPLv2+
@@ -37,11 +37,12 @@ Source0: %{name}-%{shortcommit0}.tar.bz2
%else
Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2
%endif
+Source2: %{name}.appdata.xml
Patch1: dvdstyler-wxwin.m4.patch
-Patch2: ffmpeg35_buildfix.patch
# build
-BuildRequires: automake autoconf
+BuildRequires: automake
+BuildRequires: autoconf
BuildRequires: gcc-c++
BuildRequires: gettext
BuildRequires: byacc
@@ -51,7 +52,6 @@ BuildRequires: wxGTK3-devel >= 3.0
BuildRequires: wxsvg-devel >= %{wxsvg_ver}
BuildRequires: ffmpeg-devel
BuildRequires: ffmpeg
-#BuildRequires: libgnomeui-devel
# mpeg
BuildRequires: dvdauthor
# iso/burn
@@ -88,8 +88,6 @@ create navigational DVD menus similar to those found on most commercial DVDs.
%else
%setup -q -n DVDStyler-%{version}
%endif
-%patch1 -p1
-#%patch2 -p1
#{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h
# fixes E: script-without-shebang
@@ -103,12 +101,8 @@ rm -f aclocal.m4 Makefile.in
./autogen.sh
#sed -i 's/WX_CONFIG_CHECK.\[3.0\]/WX_CONFIG_CHECK([3.0.0]/' configure.ac
#autoreconf -i
-#sed -i 's/min_wx_version=3.0/min_wx_version=3.0.0/' configure
%configure \
--disable-dependency-tracking \
-# %if (0%{?fedora} && 0%{?fedora} < 28)
-# --with-wx-config=/usr/bin/wx-config-3.0-gtk2 \
-# %endif
# docs folder is not smp_mflags safe
make -C docs
@@ -128,6 +122,8 @@ desktop-file-install \
%find_lang %{name}
+install -P -m 0644 -D %{SOURCE2} %{buildroot}%{_metainfodir}/%{name}.appdata.xml
+
%files -f %{name}.lang
%{_docdir}/%{name}
@@ -137,8 +133,14 @@ desktop-file-install \
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_mandir}/*/*.gz
+%{_metainfodir}/%{name}.appdata.xml
%changelog
+* Sun Mar 01 2020 Sérgio Basto <sergio(a)serjux.com> - 2:3.1.2-4
+- Add appdata file, copied from
+ https://github.com/sanjayankur31/rpmfusion-appdata
+- Some cleanups, drop patch1, it was just for compat-wxGTK3-gtk2
+
* Sat Feb 22 2020 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 2:3.1.2-3
- Rebuild for ffmpeg-4.3 git
4 years, 1 month
