diff --git a/0001-Remove-nested-list-from-metainfo-release.patch b/0001-Remove-nested-list-from-metainfo-release.patch new file mode 100644 index 0000000..530538c --- /dev/null +++ b/0001-Remove-nested-list-from-metainfo-release.patch @@ -0,0 +1,31 @@ +From b1520a5935669ad54b650afd2ff95ddef318ebcc Mon Sep 17 00:00:00 2001 +From: Federico Bruni +Date: Thu, 30 Apr 2020 23:17:23 +0200 +Subject: [PATCH] Remove nested list from metainfo release + +--- + linux/org.frescobaldi.Frescobaldi.metainfo.xml.in | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/linux/org.frescobaldi.Frescobaldi.metainfo.xml.in b/linux/org.frescobaldi.Frescobaldi.metainfo.xml.in +index 069d84c2..ae5385f3 100644 +--- a/linux/org.frescobaldi.Frescobaldi.metainfo.xml.in ++++ b/linux/org.frescobaldi.Frescobaldi.metainfo.xml.in +@@ -75,13 +75,7 @@ +
  • Fixed the "Two Pages (first page right)" mode
  • +
  • Fixed pinch gesture zooming in Music View on Mac OS X
  • +
  • Fixed printing the music score on Mac OS X
  • +-
  • Fixed cursor nagivation keyboard shortcuts on Mac OS X; new shortcuts:
  • +- ++
  • Fixed cursor navigation keyboard shortcuts on Mac OS X. New shortcuts: ctrl+tab for next document, ctrl+shift+tab for previous document, cmd+left for start of line, cmd+right for end of line
  • +
  • Fixed the display of filenames in document tabs on Mac OS X
  • +
  • Fixed the global menu with no windows open on Mac OS X
  • +
  • Fixed the error with convert-ly on in the Mac app bundle
  • +-- +2.26.2 + diff --git a/frescobaldi.spec b/frescobaldi.spec index 9a1bf8b..0df1f94 100644 --- a/frescobaldi.spec +++ b/frescobaldi.spec @@ -2,7 +2,7 @@ Name: frescobaldi Version: 3.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Edit LilyPond sheet music with ease! # hyphenator.py is LGPLv2+ @@ -11,12 +11,14 @@ 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-3.1.2-setup.patch +Patch1: 0001-Remove-nested-list-from-metainfo-release.patch BuildArch: noarch ExclusiveArch: %{qt5_qtwebengine_arches} BuildRequires: desktop-file-utils BuildRequires: python3-devel BuildRequires: gettext +BuildRequires: libappstream-glib Requires: alsa-utils Requires: lilypond Requires: python3-poppler-qt5 @@ -53,11 +55,13 @@ yet lightweight and easy to use. It features: find -name "*.py" -exec sed -i -e 's|#! python||' {} \; %patch0 -p0 +%patch1 -p1 %build python3 ./setup.py build #cd %{name}_app/po #make +make -C linux/ %install python3 ./setup.py install --skip-build --root $RPM_BUILD_ROOT @@ -71,16 +75,27 @@ desktop-file-install \ --delete-original \ linux/org.frescobaldi.Frescobaldi.desktop +mkdir -p %{buildroot}%{_metainfodir} +install -m 0644 \ + linux/org.frescobaldi.Frescobaldi.metainfo.xml \ + %{buildroot}%{_metainfodir}/org.frescobaldi.Frescobaldi.metainfo.xml +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml + %files -%doc ChangeLog COPYING README* THANKS TODO +%license COPYING +%doc ChangeLog README* THANKS TODO %{_bindir}/%{name} %{python3_sitelib}/%{name}_app %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %{_datadir}/applications/org.frescobaldi.Frescobaldi.desktop %{_datadir}/icons/hicolor/scalable/apps/org.frescobaldi.Frescobaldi.svg %{_mandir}/man1/* +%{_metainfodir}/*.metainfo.xml %changelog +* Wed Apr 29 2020 Gwyn Ciesla - 3.1.2-2 +- Add appdata file, with patch. + * Mon Apr 13 2020 Gwyn Ciesla - 3.1.2-1 - 3.1.2