From 2af78fd5ed1246a6a13ae6355de1a989e640ce54 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Dec 30 2019 15:03:55 +0000 Subject: 3.1 --- diff --git a/.gitignore b/.gitignore index 1d5a7ab..d5c536f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ frescobaldi-1.0.3.tar.gz /frescobaldi-2.19.0.tar.gz /frescobaldi-2.20.0.tar.gz /frescobaldi-3.0.0.tar.gz +/frescobaldi-3.1.tar.gz diff --git a/e5c133c958c1a2d811b0fee85b36652b6e8a4866.patch b/e5c133c958c1a2d811b0fee85b36652b6e8a4866.patch deleted file mode 100644 index 0042ae3..0000000 --- a/e5c133c958c1a2d811b0fee85b36652b6e8a4866.patch +++ /dev/null @@ -1,24 +0,0 @@ -From e5c133c958c1a2d811b0fee85b36652b6e8a4866 Mon Sep 17 00:00:00 2001 -From: Wilbert Berendsen -Date: Wed, 18 Sep 2019 21:43:11 +0200 -Subject: [PATCH] fix #1180; remove unneeded sip.setapi calls - ---- - frescobaldi_app/main.py | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/frescobaldi_app/main.py b/frescobaldi_app/main.py -index f2e657fb7..0507d45eb 100644 ---- a/frescobaldi_app/main.py -+++ b/frescobaldi_app/main.py -@@ -22,10 +22,6 @@ - """ - - --import sip --sip.setapi("QString", 2) --sip.setapi("QVariant", 2) -- - import os - import re - import sys diff --git a/frescobaldi.spec b/frescobaldi.spec index ee3a153..6f54975 100644 --- a/frescobaldi.spec +++ b/frescobaldi.spec @@ -1,6 +1,6 @@ Name: frescobaldi -Version: 3.0.0 -Release: 14%{?dist} +Version: 3.1 +Release: 1%{?dist} Summary: Edit LilyPond sheet music with ease! # hyphenator.py is LGPLv2+ @@ -9,7 +9,6 @@ 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 -Patch1: e5c133c958c1a2d811b0fee85b36652b6e8a4866.patch BuildArch: noarch BuildRequires: desktop-file-utils @@ -50,12 +49,11 @@ 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 +#cd %{name}_app/po +#make %install python3 ./setup.py install --skip-build --root $RPM_BUILD_ROOT @@ -79,6 +77,9 @@ desktop-file-install \ %{_mandir}/man1/* %changelog +* Mon Dec 30 2019 Gwyn Ciesla - 3.1-1 +- 3.1 + * Wed Sep 18 2019 Gwyn Ciesla - 3.0.0-14 - Drop sip. diff --git a/sources b/sources index 34df5e8..f21bb47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (frescobaldi-3.0.0.tar.gz) = 05687c1fd40bbb764e369a61fd45b4e6ba69760710231165c84c922526b3166142d6cb5a75cd4fefec0439e16f9daa945c326ee7b9057adeb03ebad67f859752 +SHA512 (frescobaldi-3.1.tar.gz) = 2171fb326f65bba1ca5095de7cf882e7a4a0ce12ea1ae24d8a67724d06a691d2147be1c14bbd85f00b43c63b93aa5d5944dff430ff385dda4dee2ce8900f1439