diff --git a/.gitignore b/.gitignore index 51e58b7..02f566f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/kcalc-16.04.0.tar.xz +/kcalc-16.04.1.tar.xz diff --git a/kcalc-15.12.3-qt56.patch b/kcalc-15.12.3-qt56.patch deleted file mode 100644 index b8fe0da..0000000 --- a/kcalc-15.12.3-qt56.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kcalc-15.12.3/kcalc.cpp.qt56 kcalc-15.12.3/kcalc.cpp ---- kcalc-15.12.3/kcalc.cpp.qt56 2016-03-09 17:12:50.000000000 -0600 -+++ kcalc-15.12.3/kcalc.cpp 2016-03-16 08:18:05.635713639 -0500 -@@ -123,7 +123,7 @@ KCalculator::KCalculator(QWidget *parent - - updateGeometry(); - -- setFixedSize(minimumSize()); -+ if ( ! minimumSize().isEmpty() ) setFixedSize(minimumSize()); - - updateDisplay(UPDATE_FROM_CORE); - diff --git a/kcalc.spec b/kcalc.spec index 43e3fdd..c83b255 100644 --- a/kcalc.spec +++ b/kcalc.spec @@ -1,6 +1,6 @@ Name: kcalc Summary: Scientific Calculator -Version: 16.04.0 +Version: 16.04.1 Release: 1%{?dist} License: GPLv2+ @@ -17,10 +17,6 @@ Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-% ## upstreamable patches # fix arithmetic fault in mod, factorial Patch100: kcalc-4.9.90-misc.patch -# hack/workaround for Qt-5.6 issue where minimumSize() returns (0,0) -# http://bugzilla.redhat.com/1315835 -# http://bugs.kde.org/360105 -Patch101: kcalc-15.12.3-qt56.patch BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules @@ -104,6 +100,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.d %changelog +* Sun May 08 2016 Rex Dieter - 16.04.1-1 +- 16.04.1 + * Tue Apr 26 2016 Rex Dieter - 16.04.0-1 - 16.04.0 diff --git a/sources b/sources index cab7ca9..254ec85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2365e89219a31491e8aaf739cdaed991 kcalc-16.04.0.tar.xz +9200ffe5d8fb71627cbba99de0542741 kcalc-16.04.1.tar.xz