diff --git a/.gitignore b/.gitignore index b1eba7e..51b962f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ frescobaldi-1.0.3.tar.gz /frescobaldi-3.0.0.tar.gz /frescobaldi-3.1.tar.gz /frescobaldi-3.1.1.tar.gz +/frescobaldi-3.1.2.tar.gz diff --git a/frescobaldi-2.0.10-ascii.patch b/frescobaldi-2.0.10-ascii.patch deleted file mode 100644 index 293aac4..0000000 --- a/frescobaldi-2.0.10-ascii.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- frescobaldi_app/bugreport.py~ 2013-10-03 08:10:03.000000000 -0500 -+++ frescobaldi_app/bugreport.py 2013-10-03 08:32:05.006558995 -0500 -@@ -51,7 +51,7 @@ - try: - import platform - python_version = platform.python_version() -- osname = platform.platform() -+ osname = platform.platform().decode('utf-8') - except (ImportError, NameError): - python_version = "unknown" - osname = "unknown" diff --git a/frescobaldi-2.18-setup.patch b/frescobaldi-2.18-setup.patch deleted file mode 100644 index bd789ff..0000000 --- a/frescobaldi-2.18-setup.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- setup.py~ 2015-06-16 08:26:06.000000000 -0500 -+++ setup.py 2015-06-16 08:28:26.505978057 -0500 -@@ -45,19 +45,11 @@ - } - } - --if sys.platform.startswith('win'): -- scripts.append('windows/frescobaldi-wininst.py') -- options['bdist_wininst'] = { -- 'install_script': 'windows/frescobaldi-wininst.py', -- 'bitmap': 'windows/frescobaldi-wininst.bmp', -- } -- data_files = [] --else: -- data_files = [ -- ('share/icons/hicolor/scalable/apps', ['frescobaldi_app/icons/frescobaldi.svg']), -- ('share/applications', ['frescobaldi.desktop']), -- ('share/man/man1', ['frescobaldi.1']), -- ] -+data_files = [ -+ ('share/icons/hicolor/scalable/apps', ['frescobaldi_app/icons/frescobaldi.svg']), -+ ('share/applications', ['frescobaldi.desktop']), -+ ('share/man/man1', ['frescobaldi.1']), -+] - - setup_extra_args = {} - if USE_SETUPTOOLS: diff --git a/frescobaldi-3.1.2-setup.patch b/frescobaldi-3.1.2-setup.patch new file mode 100644 index 0000000..4f2cc0c --- /dev/null +++ b/frescobaldi-3.1.2-setup.patch @@ -0,0 +1,28 @@ +--- setup.py~ 2020-04-13 08:51:25.000000000 -0500 ++++ setup.py 2020-04-13 09:04:29.336673550 -0500 +@@ -46,20 +46,11 @@ + } + } + +-if sys.platform.startswith('win'): +- scripts.append('windows/frescobaldi-wininst.py') +- options['bdist_wininst'] = { +- 'install_script': 'windows/frescobaldi-wininst.py', +- 'bitmap': 'windows/frescobaldi-wininst.bmp', +- } +- data_files = [] +-else: +- data_files = [ +- ('share/icons/hicolor/scalable/apps', ['frescobaldi_app/icons/org.frescobaldi.Frescobaldi.svg']), +- ('share/applications', ['linux/org.frescobaldi.Frescobaldi.desktop']), +- ('share/metainfo', ['linux/org.frescobaldi.Frescobaldi.metainfo.xml']), +- ('share/man/man1', ['frescobaldi.1']), +- ] ++data_files = [ ++ ('share/icons/hicolor/scalable/apps', ['frescobaldi_app/icons/org.frescobaldi.Frescobaldi.svg']), ++ ('share/applications', ['linux/org.frescobaldi.Frescobaldi.desktop']), ++ ('share/man/man1', ['frescobaldi.1']), ++] + + setup_extra_args = {} + if USE_SETUPTOOLS: diff --git a/frescobaldi.spec b/frescobaldi.spec index f4c2e14..9a1bf8b 100644 --- a/frescobaldi.spec +++ b/frescobaldi.spec @@ -1,8 +1,8 @@ %{!?qt5_qtwebengine_arches:%global qt5_qtwebengine_arches %{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el} Name: frescobaldi -Version: 3.1.1 -Release: 4%{?dist} +Version: 3.1.2 +Release: 1%{?dist} Summary: Edit LilyPond sheet music with ease! # hyphenator.py is LGPLv2+ @@ -10,7 +10,7 @@ Summary: Edit LilyPond sheet music with ease! License: GPLv2+ and LGPLv2+ URL: http://www.frescobaldi.org/ Source0: https://github.com/wbsoft/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz -Patch0: frescobaldi-2.18-setup.patch +Patch0: frescobaldi-3.1.2-setup.patch BuildArch: noarch ExclusiveArch: %{qt5_qtwebengine_arches} @@ -69,18 +69,21 @@ desktop-file-install \ --add-category=AudioVideo \ --add-category=X-Notation \ --delete-original \ - %{name}.desktop + linux/org.frescobaldi.Frescobaldi.desktop %files %doc ChangeLog COPYING README* THANKS TODO %{_bindir}/%{name} %{python3_sitelib}/%{name}_app %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info -%{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%{_datadir}/applications/org.frescobaldi.Frescobaldi.desktop +%{_datadir}/icons/hicolor/scalable/apps/org.frescobaldi.Frescobaldi.svg %{_mandir}/man1/* %changelog +* Mon Apr 13 2020 Gwyn Ciesla - 3.1.2-1 +- 3.1.2 + * Tue Jan 28 2020 Fedora Release Engineering - 3.1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index c0bcbcf..9a834b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (frescobaldi-3.1.1.tar.gz) = b4f65bdbcb5ed1c9837b84f9721b166dbac3d5ed12d03521d91d9f4660ff61af951209071ceae07158da3ad9f7c7152924a4f5ce87deedc8d90decf4b4efa86d +SHA512 (frescobaldi-3.1.2.tar.gz) = 6aa7665331ac10de0232be5b8a84a095bd1b22133f49a55eabac7a7fb5b895fe74d5e6f5c70a579f502862322e1dc21ec0d1316259c9c9fa49b969cde17ec4de