diff --git a/.gitignore b/.gitignore index 9e1f319..7288c2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /clog /scidavis-1.22.tar.gz +/scidavis-1.23.tar.gz diff --git a/scidavis-fix_manpage_path.patch b/scidavis-fix_manpage_path.patch deleted file mode 100644 index 31616ca..0000000 --- a/scidavis-fix_manpage_path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/scidavis/scidavis.pro b/scidavis/scidavis.pro ---- a/scidavis/scidavis.pro 2017-10-23 02:39:23.000000000 +0300 -+++ b/scidavis/scidavis.pro 2017-10-24 03:28:41.328047975 +0300 -@@ -58,7 +58,7 @@ - mime_package.path = "$$INSTALLBASE/share/mime/packages" - - man_page.files = scidavis.1 -- man_page.path = "$$INSTALLBASE/share/man/man1/scidavis.1" -+ man_page.path = "$$INSTALLBASE/share/man/man1" - - #deprecated - mime_link.files = x-sciprj.desktop diff --git a/scidavis-fix_paste_behavior.patch b/scidavis-fix_paste_behavior.patch deleted file mode 100644 index 82b3237..0000000 --- a/scidavis-fix_paste_behavior.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff -Naur a/libscidavis/src/future/table/future_Table.cpp b/libscidavis/src/future/table/future_Table.cpp ---- a/libscidavis/src/future/table/future_Table.cpp 2017-10-23 01:39:23.000000000 +0200 -+++ b/libscidavis/src/future/table/future_Table.cpp 2018-03-10 11:49:59.684254602 +0100 -@@ -473,23 +473,46 @@ - - rows = last_row - first_row + 1; - cols = last_col - first_col + 1; -- for(int r=0; rformulaModeActive()) || (d_view->hasMultiSelection())) - { -- for(int c=0; cisCellSelected(first_row + r, first_col + c) && (c < cell_texts.at(r).count()) ) -+ for(int c=0; ccolumn(first_col + c); -- if (d_view->formulaModeActive()) -+ if(d_view->isCellSelected(first_row + r, first_col + c) && (c < cell_texts.at(r).count()) ) - { -+ Column * col_ptr = d_table_private->column(first_col + c); - col_ptr->setFormula(first_row + r, cell_texts.at(r).at(c)); - col_ptr->setInvalid(first_row + r, false); - } -- else -- col_ptr->asStringColumn()->setTextAt(first_row+r, cell_texts.at(r).at(c)); - } - } - } -+ else -+ { -+ QList< QStringList > cols_texts; -+ // transpose clipboard data to use replaceTexts -+ for (int c=0; ccolumn(first_col + c); -+ col_ptr->asStringColumn()->replaceTexts(first_row, cols_texts.at(c).mid(0,rows)); -+ } -+ } -+ - recalculateSelectedCells(); - } - endMacro(); -diff -Naur a/libscidavis/src/future/table/TableView.cpp b/libscidavis/src/future/table/TableView.cpp ---- a/libscidavis/src/future/table/TableView.cpp 2017-10-23 01:39:23.000000000 +0200 -+++ b/libscidavis/src/future/table/TableView.cpp 2018-03-10 11:50:13.296680742 +0100 -@@ -799,6 +799,28 @@ - return result; - } - -+bool TableView::hasMultiSelection() -+{ -+ QModelIndexList indexes = d_view_widget->selectionModel()->selectedIndexes(); -+ if (indexes.size() < 2) -+ return false; -+ -+ QModelIndex index; -+ int minrow = indexes.at(0).row(); -+ int maxrow = minrow; -+ int mincol = indexes.at(0).column(); -+ int maxcol = mincol; -+ foreach (index, indexes) -+ { -+ minrow = std::min(minrow, index.row()); -+ maxrow = std::max(maxrow, index.row()); -+ mincol = std::min(mincol, index.column()); -+ maxcol = std::max(maxcol, index.column()); -+ } -+ int spanned = (maxrow-minrow+1)*(maxcol-mincol+1); -+ return (spanned > d_view_widget->selectionModel()->selectedIndexes().size()); -+} -+ - bool TableView::isCellSelected(int row, int col) - { - if(row < 0 || col < 0 || row >= d_table->rowCount() || col >= d_table->columnCount()) return false; -diff -Naur a/libscidavis/src/future/table/TableView.h b/libscidavis/src/future/table/TableView.h ---- a/libscidavis/src/future/table/TableView.h 2017-10-23 01:39:23.000000000 +0200 -+++ b/libscidavis/src/future/table/TableView.h 2018-03-10 11:50:06.590426742 +0100 -@@ -164,6 +164,8 @@ - int lastSelectedRow(bool full = false); - //! Get the complete set of selected rows. - IntervalAttribute selectedRows(bool full = false); -+ //! Return whether multiple regions are selected -+ bool hasMultiSelection(); - //! Return whether a cell is selected - bool isCellSelected(int row, int col); - //! Select/Deselect a cell diff --git a/scidavis.spec b/scidavis.spec index 934adce..d18ee8d 100644 --- a/scidavis.spec +++ b/scidavis.spec @@ -1,8 +1,8 @@ %global pluginversion 1.0.0 Name: scidavis -Version: 1.22 -Release: 6%{?dist} +Version: 1.23 +Release: 1%{?dist} Summary: Application for Scientific Data Analysis and Visualization License: GPLv3+ @@ -10,12 +10,8 @@ URL: http://scidavis.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # enable after liborigin-3.0.0 release #Patch0: fedora-rpm-with-system-liborigin3.patch -# remove nextrelease +# remove when Python stuff are updated upstream Patch1: scidavis-set_python_path.patch -# remove nextrelease -Patch2: scidavis-fix_manpage_path.patch -# remove nextrelease -Patch3: scidavis-fix_paste_behavior.patch BuildRequires: gcc-c++ BuildRequires: desktop-file-utils @@ -67,13 +63,9 @@ This module provides SciDAVis bindings to the Python2 programming language. %prep %setup -q -n %{name}-%{version} # enable after liborigin-3.0.0 release -#%patch0 -p1 +#%%patch0 -p1 #rm -rf 3rdparty/liborigin %patch1 -p0 -# remove nextrelease -%patch2 -p1 -# remove when merged upstream -%patch3 -p1 %build @@ -87,7 +79,7 @@ This module provides SciDAVis bindings to the Python2 programming language. %install make INSTALL_ROOT="%{buildroot}" install -install -pm 644 CHANGES %{buildroot}%{_docdir}/%{name}/ +install -pm 644 ChangeLog.md %{buildroot}%{_docdir}/%{name}/ mkdir -p %{buildroot}%{_datadir}/{%{name}/translations,applications,mime/packages,appdata} cp -p %{name}/translations/*.qm %{buildroot}%{_datadir}/%{name}/translations/ @@ -132,6 +124,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %changelog +* Mon Jun 04 2018 Alexander Ploumistos - 1.23-1 +- Update to 1.23 +- Remove unneeded patches + * Sat Mar 10 2018 Alexander Ploumistos - 1.22-6 - Restore upstream intended paste behavior diff --git a/sources b/sources index 82726a2..b81308f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scidavis-1.22.tar.gz) = 07d94b2f8a05f28d2d461ee6109397a648bfcdcd479fca886771ad04ef8e21bfb1703891077c67a0a4a4dca5b1c31bc7029e33ebd982425a41efce42fa3319b6 +SHA512 (scidavis-1.23.tar.gz) = b221ce0892e4291d8efd944b3f5632f20863c311189f6eadee878d902b7e0a784ef429362c52f353f78f8c523792e10b4db5d9d14a379b2a6b13219bb25a6e09