From a2e9c11c7ab4c241a57ba812b56e99a8209717c2 Mon Sep 17 00:00:00 2001 From: Yuliya Algaer Date: Sat, 5 Oct 2019 23:25:39 +0700 Subject: [PATCH 1/3] Update to 33.0 --- .gitignore | 1 + sources | 2 +- ugene.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e49cefa..865ec36 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /ugene-1.*.tar.gz +/ugene-33.0.tar.gz diff --git a/sources b/sources index bb75018..5622a2a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ugene-1.31.1.tar.gz) = dc4cea8a90432de9b58c4b9e1cfbb01c8e1d65c83889df56323385b2639ab1d248cad13b63a7f6c8d91ba2c12f091580f0893f6af1d32392a043fd25cf6c4954 +SHA512 (ugene-33.0.tar.gz) = 5e02a1845d7626c1287002a25bfa1551234fc94312963aef2981bdfe70af1959d5b1c4289af0138dfa9ba44846454ba2d4d9cd96f029bac1ab262ed2bc583d87 diff --git a/ugene.spec b/ugene.spec index 5aad0c8..a7dea40 100644 --- a/ugene.spec +++ b/ugene.spec @@ -1,14 +1,14 @@ Name: ugene Summary: Integrated bioinformatics toolkit -Version: 1.31.1 -Release: 7%{?dist} +Version: 33.0 +Release: 1%{?dist} #The entire source code is GPLv2+ except: #file src/libs_3rdparty/qtbindings_core/src/qtscriptconcurrent.h which is GPLv2 #files in src/plugins_3rdparty/script_debuger/src/qtscriptdebug/ which are GPLv2 License: GPLv2+ and GPLv2 URL: http://ugene.net Source0: http://ugene.net/downloads/%{name}-%{version}.tar.gz -Patch0: ugene-1.31.0.patch +#Patch0: ugene-1.31.0.patch BuildRequires: desktop-file-utils BuildRequires: mesa-libGLU-devel @@ -80,6 +80,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_mandir}/man1/* %changelog +* Sat Oct 05 2019 Yuliya Algaer - 33.0-1 +- new release + * Wed Sep 25 2019 Jan Grulich - 1.31.1-7 - rebuild (qt5) - workaround FTBFS using -fpermissive (#1736931) From 402341bb9107bd271954818a43380c3930b18ccd Mon Sep 17 00:00:00 2001 From: Yuliya Algaer Date: Sat, 5 Oct 2019 23:31:09 +0700 Subject: [PATCH 2/3] Update to 33.0 --- ugene.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ugene.spec b/ugene.spec index a7dea40..4792119 100644 --- a/ugene.spec +++ b/ugene.spec @@ -22,6 +22,9 @@ BuildRequires: qt5-qttools-devel BuildRequires: qt5-qtwebchannel-devel BuildRequires: qt5-qtwebkit-devel BuildRequires: qt5-qtxmlpatterns-devel +BuildRequires: qt5-qtwebengine-devel +BuildRequires: qt5-qtwebsockets-devel +BuildRequires: qt5-qtwebchannel-devel BuildRequires: zlib-devel BuildConflicts: qt-devel From fbbe52294f4a95eaae183fb9ccd536cbd884af1c Mon Sep 17 00:00:00 2001 From: Yuliya Algaer Date: Sat, 5 Oct 2019 23:37:20 +0700 Subject: [PATCH 3/3] Update to 33.0 --- ugene.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ugene.spec b/ugene.spec index 4792119..af15f69 100644 --- a/ugene.spec +++ b/ugene.spec @@ -1,7 +1,7 @@ Name: ugene Summary: Integrated bioinformatics toolkit Version: 33.0 -Release: 1%{?dist} +Release: 2%{?dist} #The entire source code is GPLv2+ except: #file src/libs_3rdparty/qtbindings_core/src/qtscriptconcurrent.h which is GPLv2 #files in src/plugins_3rdparty/script_debuger/src/qtscriptdebug/ which are GPLv2 @@ -45,7 +45,7 @@ is a designer for custom bioinformatics workflows. %prep %setup -q -%patch0 -p1 -b .qt510 +#%patch0 -p1 -b .qt510 %build # workaround FTBFS (https://bugzilla.redhat.com/show_bug.cgi?id=1736931) @@ -83,7 +83,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_mandir}/man1/* %changelog -* Sat Oct 05 2019 Yuliya Algaer - 33.0-1 +* Sat Oct 05 2019 Yuliya Algaer - 33.0-2 - new release * Wed Sep 25 2019 Jan Grulich - 1.31.1-7