diff --git a/sources b/sources index 8440f4a..547a645 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ugene-1.29.0.tar.gz) = 7c4c1e93c6e614cf3e0f71fd82455587815b2c9ab03b0ca86533e97b3d3087c1f9ad8bfa94f73b6487abb5d1afc9578c943cf71f9bce139e5d7dea8568bcc78e +SHA512 (ugene-1.31.0.tar.gz) = d8cef19ee07fbe94758dbcf33e080a981cefadb1a600898f569daf95b8e1bc69e9b913bd5b80e366596ea1a2db1a981446bdc82989a636a18aa8aea2559c8897 diff --git a/ugene-1.29.0-qt510.patch b/ugene-1.29.0-qt510.patch deleted file mode 100644 index aff096a..0000000 --- a/ugene-1.29.0-qt510.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur ugene-1.29.0/src/plugins/external_tool_support/src/bowtie2/Bowtie2Settings.ui ugene-1.29.0-qt510/src/plugins/external_tool_support/src/bowtie2/Bowtie2Settings.ui ---- ugene-1.29.0/src/plugins/external_tool_support/src/bowtie2/Bowtie2Settings.ui 2017-12-28 08:12:07.000000000 +0100 -+++ ugene-1.29.0-qt510/src/plugins/external_tool_support/src/bowtie2/Bowtie2Settings.ui 2018-01-02 20:00:20.526488538 +0100 -@@ -254,9 +254,6 @@ - - Disallow gaps (--gbar) - -- -- -- - - - diff --git a/ugene-1.31.0.patch b/ugene-1.31.0.patch new file mode 100644 index 0000000..a478a52 --- /dev/null +++ b/ugene-1.31.0.patch @@ -0,0 +1,24 @@ +diff --git a/src/plugins/external_tool_support/src/trimmomatic/util/LengthSettingsWidget.cpp b/src/plugins/external_tool_support/src/trimmomatic/util/LengthSettingsWidget.cpp +index a2541b880..f806afef7 100644 +--- a/src/plugins/external_tool_support/src/trimmomatic/util/LengthSettingsWidget.cpp ++++ b/src/plugins/external_tool_support/src/trimmomatic/util/LengthSettingsWidget.cpp +@@ -20,6 +20,7 @@ + */ + + #include ++#include + + #include "LengthSettingsWidget.h" + #include "LineEditHighlighter.h" +diff --git a/src/plugins/external_tool_support/src/trimmomatic/util/QualitySettingsWidget.cpp b/src/plugins/external_tool_support/src/trimmomatic/util/QualitySettingsWidget.cpp +index 00ecfef09..bce841083 100644 +--- a/src/plugins/external_tool_support/src/trimmomatic/util/QualitySettingsWidget.cpp ++++ b/src/plugins/external_tool_support/src/trimmomatic/util/QualitySettingsWidget.cpp +@@ -19,6 +19,7 @@ + * MA 02110-1301, USA. + */ + ++#include + #include + + #include "QualitySettingsWidget.h" diff --git a/ugene.spec b/ugene.spec index 4596958..d109e87 100644 --- a/ugene.spec +++ b/ugene.spec @@ -1,20 +1,18 @@ Name: ugene Summary: Integrated bioinformatics toolkit -Version: 1.29.0 -Release: 6%{?dist} +Version: 1.31.0 +Release: 4%{?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 Group: Applications/Engineering -URL: http://ugene.unipro.ru -Source0: http://ugene.unipro.ru/downloads/%{name}-%{version}.tar.gz -# Fix FTBFS with Qt 5.10 -Patch0: ugene-1.29.0-qt510.patch +URL: http://ugene.net +Source0: http://ugene.net/downloads/%{name}-%{version}.tar.gz +Patch0: ugene-1.31.0.patch BuildRequires: desktop-file-utils BuildRequires: mesa-libGLU-devel -BuildRequires: procps-devel BuildRequires: qt5-qtbase-devel qt5-qtbase-private-devel BuildRequires: qt5-qtbase-mysql BuildRequires: qt5-qtmultimedia-devel @@ -69,7 +67,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %files %{!?_licensedir:%global license %%doc} -%license COPYRIGHT LICENSE.txt LICENSE.3rd_party.txt +%license LICENSE.txt LICENSE.3rd_party.txt %{_bindir}/* %{_libdir}/%{name}/ %{_datadir}/applications/%{name}.desktop @@ -80,38 +78,12 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_mandir}/man1/* %changelog -* Wed Feb 14 2018 Jan Grulich - 1.29.0-6 -- rebuild (qt5) +* Tue Jan 01 2019 Rex Dieter - 1.31.0-4 +- branch rebuild (qt5) -* Fri Feb 09 2018 Fedora Release Engineering - 1.29.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Sun Aug 26 2018 Rex Dieter - 1.31.0-3 +- (branch) rebuild for qt5 -* Thu Jan 18 2018 Igor Gnatenko - 1.29.0-4 -- Remove obsolete scriptlets - -* Tue Jan 02 2018 Kevin Kofler - 1.29.0-3 -- Fix FTBFS with Qt 5.10 - -* Mon Jan 01 2018 Rex Dieter - 1.29.0-2 -- rebuild (qt5) - -* Sun Dec 31 2017 Yuliya Algaer - 1.29.0-1 -- New upstream release. - -* Wed Dec 20 2017 Jan Grulich - 1.28.1-3 -- rebuild (qt5) - -* Mon Nov 27 2017 Rex Dieter - 1.28.1-2 -- rebuild (qt5) - -* Tue Nov 21 2017 Yuliya Algaer - 1.28.1-1 -- New upstream release. - -* Tue Oct 10 2017 Rex Dieter - 1.27.0-8 -- rebuild (qt5) - -* Mon Aug 28 2017 Yuliya Algaer - 1.27.0-7 +* Fri Aug 24 2018 Yuliya Algaer - 1.31.0-2 - New upstream release -* Thu Aug 03 2017 Fedora Release Engineering - 1.26.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild