diff --git a/.gitignore b/.gitignore index a1ea245..cb90385 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,2 @@ /clog -/scidavis-1.22.tar.gz -/scidavis-1.23.tar.gz -/scidavis-0ca8811.tar.gz -/scidavis-1.23.4.tar.gz +/scidavis-1.24.tar.gz diff --git a/scidavis-fix-sf360-plot-associations-button-does-nothing.patch b/scidavis-fix-sf360-plot-associations-button-does-nothing.patch deleted file mode 100644 index 384df83..0000000 --- a/scidavis-fix-sf360-plot-associations-button-does-nothing.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/libscidavis/src/CurvesDialog.cpp b/libscidavis/src/CurvesDialog.cpp -index ea80390..75fb229 100644 ---- a/libscidavis/src/CurvesDialog.cpp -+++ b/libscidavis/src/CurvesDialog.cpp -@@ -212,10 +212,15 @@ void CurvesDialog::showPlotAssociations() - curve = 0; - - ApplicationWindow *app = (ApplicationWindow *)this->parent(); -+#if QT_VERSION >= 0x050000 - close(); -+#endif - - if (app) - app->showPlotAssociations(curve); -+#if QT_VERSION < 0x050000 -+ close(); -+#endif - } - - void CurvesDialog::showFunctionDialog() -diff --git a/libscidavis/src/PlotDialog.cpp b/libscidavis/src/PlotDialog.cpp -index 4a53834..fafc953 100644 ---- a/libscidavis/src/PlotDialog.cpp -+++ b/libscidavis/src/PlotDialog.cpp -@@ -200,8 +200,13 @@ void PlotDialog::showPlotAssociations(QTreeWidgetItem *item, int) - } - else - { -+#if QT_VERSION >= 0x050000 - close(); -+#endif - app->showPlotAssociations(((CurveTreeItem *)item)->plotItemIndex()); -+#if QT_VERSION < 0x050000 -+ close(); -+#endif - } - } - -@@ -218,7 +223,9 @@ void PlotDialog::editCurve() - int index = item->plotItemIndex(); - int curveType = ((PlotCurve *)item->plotItem())->type(); - -+#if QT_VERSION >= 0x050000 - close(); -+#endif - - if (app) - { -@@ -227,6 +234,10 @@ void PlotDialog::editCurve() - else - app->showPlotAssociations(index); - } -+ -+#if QT_VERSION < 0x050000 -+ close(); -+#endif - } - - void PlotDialog::changePlotType(int new_curve_type) diff --git a/scidavis.spec b/scidavis.spec index 164ed90..9e60059 100644 --- a/scidavis.spec +++ b/scidavis.spec @@ -2,8 +2,8 @@ %global owner highperformancecoder Name: scidavis -Version: 1.23.4 -Release: 4%{?dist} +Version: 1.24 +Release: 1%{?dist} Summary: Application for Scientific Data Analysis and Visualization License: GPLv3+ @@ -12,7 +12,6 @@ URL: http://scidavis.sourceforge.net/ # Main upstream development repository (master, snapshots, minor versions not in sf) #Source0: https://github.com/%%{owner}/%%{name}/archive/master/%%{name}-master.tar.gz Source0: https://github.com/%{owner}/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: scidavis-fix-sf360-plot-associations-button-does-nothing.patch BuildRequires: gcc-c++ BuildRequires: python3 @@ -66,7 +65,6 @@ This module provides SciDAVis bindings to the Python3 programming language. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 # Development builds #%%setup -q -n %%{name}-master # Set the correct python paths @@ -136,6 +134,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %changelog +* Sat Mar 02 2019 Alexander Ploumistos - 1.24-1 +- Update to 1.24 + * Sat Feb 02 2019 Fedora Release Engineering - 1.23.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 6c756a9..61822ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scidavis-1.23.4.tar.gz) = d42b9711124ee758d48b0049ac329cef7bcc49e3bfa1ddc2f1b176e01f18af3b90b958f9c8a71ba8759c245ac4c19d86ab09833490c27810374bf09a70f8291c +SHA512 (scidavis-1.24.tar.gz) = 81b0d4658b4d6d6e5513b76795401e6e90d06198ae74ff7c50940a45e30f832b15a133ebde91e4bcb2b7e60a07fddd97540db8f71799c47bc90ba9a9185a2e8b