From 77359e92091454d39983ffcbfec9adc3dd436bac7db03364fad77e791c40aaf2 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sat, 24 Nov 2018 23:45:01 +0000 Subject: [PATCH 1/5] KDE Applications 18.12.0 Beta (last try; fix any other issue post acceptance) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kmplot?expand=0&rev=78 --- kmplot-18.08.3.tar.xz | 3 --- kmplot-18.11.80.tar.xz | 3 +++ kmplot.changes | 15 +++++++++++++++ kmplot.spec | 27 ++++++++++++--------------- 4 files changed, 30 insertions(+), 18 deletions(-) delete mode 100644 kmplot-18.08.3.tar.xz create mode 100644 kmplot-18.11.80.tar.xz diff --git a/kmplot-18.08.3.tar.xz b/kmplot-18.08.3.tar.xz deleted file mode 100644 index ee485eb..0000000 --- a/kmplot-18.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5cb949e35396d0096849ce80daf6bf6db8c1af3aaad0262f5b32b640a2cf532f -size 3028732 diff --git a/kmplot-18.11.80.tar.xz b/kmplot-18.11.80.tar.xz new file mode 100644 index 0000000..7328ae0 --- /dev/null +++ b/kmplot-18.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a212b27646bade061c538d4d5eba474fb185d7875a25925f83824405a0398e9e +size 3060968 diff --git a/kmplot.changes b/kmplot.changes index eef7bdc..6c32075 100644 --- a/kmplot.changes +++ b/kmplot.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Nov 20 06:22:34 UTC 2018 - Luca Beltrame + +- Run spec-cleaner + +------------------------------------------------------------------- +Tue Nov 20 05:57:09 UTC 2018 - lbeltrame@kde.org + +- Update to 18.11.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.11.80.php +- Changes since 18.08.3: + * Too many changes to list here + ------------------------------------------------------------------- Thu Nov 08 20:43:40 UTC 2018 - lbeltrame@kde.org diff --git a/kmplot.spec b/kmplot.spec index 5a0d334..fccc7a0 100644 --- a/kmplot.spec +++ b/kmplot.spec @@ -1,7 +1,7 @@ # # spec file for package kmplot # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,22 +12,21 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%bcond_without lang - -Name: kmplot -Version: 18.08.3 -Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%bcond_without lang +Name: kmplot +Version: 18.11.80 +Release: 0 Summary: Mathematical Function Plotter -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Scientific/Math -Url: http://edu.kde.org +URL: http://edu.kde.org Source0: %{name}-%{version}.tar.xz BuildRequires: extra-cmake-modules BuildRequires: kconfig-devel @@ -47,7 +46,6 @@ Provides: %{name}5 = %{version} %if %{with lang} Recommends: %{name}-lang %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Mathematical function plotter for KDE. @@ -70,12 +68,11 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %kf5_makeinstall -C build %if %{with lang} %find_lang %{name} --with-man --all-name - %kf5_find_htmldocs + %{kf5_find_htmldocs} %endif %files -%defattr(-,root,root) -%doc COPYING* +%license COPYING* %dir %{_kf5_appstreamdir} %dir %{_kf5_configkcfgdir} %doc %lang(en) %{_kf5_htmldir}/en/kmplot @@ -88,11 +85,11 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %{_kf5_kxmlguidir}/kmplot/ %{_kf5_plugindir}/kmplotpart.so %{_kf5_servicesdir}/kmplot_part.desktop -%{_mandir}/*/kmplot.1%{ext_man} +%{_mandir}/*/kmplot.1%{?ext_man} %if %{with lang} %files lang -f %{name}.lang -%doc COPYING* +%license COPYING* %endif %changelog From 84c82cb194dbb8cae8d2ce77c442d722f79381a6351e69e3b555399b2ba2df7b Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sun, 25 Nov 2018 08:57:05 +0000 Subject: [PATCH 2/5] Accepting request 651556 from home:wolfi323:branches:home:luca_b:kapps1812beta - Use gcc7 to build on Leap 42.3, the default 4.8 is too old OBS-URL: https://build.opensuse.org/request/show/651556 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kmplot?expand=0&rev=79 --- kmplot.changes | 5 +++++ kmplot.spec | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/kmplot.changes b/kmplot.changes index 6c32075..72e5d55 100644 --- a/kmplot.changes +++ b/kmplot.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 22 17:40:46 UTC 2018 - wbauer@tmo.at + +- Use gcc7 to build on Leap 42.3, the default 4.8 is too old + ------------------------------------------------------------------- Tue Nov 20 06:22:34 UTC 2018 - Luca Beltrame diff --git a/kmplot.spec b/kmplot.spec index fccc7a0..e96a10b 100644 --- a/kmplot.spec +++ b/kmplot.spec @@ -43,21 +43,26 @@ BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Widgets) Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} -%if %{with lang} Recommends: %{name}-lang +%if 0%{?suse_version} < 1500 +# the default gcc 4.8 is too old +BuildRequires: gcc7-c++ %endif %description Mathematical function plotter for KDE. -%if %{with lang} %lang_package -%endif %prep %setup -q %build +%if 0%{?suse_version} < 1500 +# the default gcc 4.8 is too old +export CC=gcc-7 +export CXX=g++-7 +%endif %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif From c0fd84ce3fb98a042ded36bce0f4bbba9b882bd381f3cd38067acfba0720c3ed Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Tue, 4 Dec 2018 16:22:48 +0000 Subject: [PATCH 3/5] KDE Applications 18.12.0 RC (knights is already in K:A) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kmplot?expand=0&rev=80 --- kmplot-18.11.80.tar.xz | 3 --- kmplot-18.11.90.tar.xz | 3 +++ kmplot.changes | 12 ++++++++++++ kmplot.spec | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) delete mode 100644 kmplot-18.11.80.tar.xz create mode 100644 kmplot-18.11.90.tar.xz diff --git a/kmplot-18.11.80.tar.xz b/kmplot-18.11.80.tar.xz deleted file mode 100644 index 7328ae0..0000000 --- a/kmplot-18.11.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a212b27646bade061c538d4d5eba474fb185d7875a25925f83824405a0398e9e -size 3060968 diff --git a/kmplot-18.11.90.tar.xz b/kmplot-18.11.90.tar.xz new file mode 100644 index 0000000..bc76b17 --- /dev/null +++ b/kmplot-18.11.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc008a19a4fa44446de73c0d36880bfc7563037a1ecee0762e61c30244eea58a +size 3060748 diff --git a/kmplot.changes b/kmplot.changes index 72e5d55..4197fe7 100644 --- a/kmplot.changes +++ b/kmplot.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Dec 03 20:56:04 UTC 2018 - lbeltrame@kde.org + +- Update to 18.11.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12-rc.php +- Changes since 18.11.80: + * Do not show '+' for positive numbers (kde#262690) + * Fix plot names for derivatives and integral (kde#284811) + * Do not delete parent widgets (kde#320394) + ------------------------------------------------------------------- Thu Nov 22 17:40:46 UTC 2018 - wbauer@tmo.at diff --git a/kmplot.spec b/kmplot.spec index e96a10b..880f11b 100644 --- a/kmplot.spec +++ b/kmplot.spec @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kmplot -Version: 18.11.80 +Version: 18.11.90 Release: 0 Summary: Mathematical Function Plotter License: GPL-2.0-or-later From fd4ffcdf9f55a808d0da0922afe7a436a9670b21e7c70c4749d9974b66bbe0a5 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 14 Dec 2018 16:51:01 +0000 Subject: [PATCH 4/5] KDE Applications 18.12.0 (not yet built) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kmplot?expand=0&rev=81 --- kmplot-18.11.90.tar.xz | 3 --- kmplot-18.12.0.tar.xz | 3 +++ kmplot.changes | 10 ++++++++++ kmplot.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 kmplot-18.11.90.tar.xz create mode 100644 kmplot-18.12.0.tar.xz diff --git a/kmplot-18.11.90.tar.xz b/kmplot-18.11.90.tar.xz deleted file mode 100644 index bc76b17..0000000 --- a/kmplot-18.11.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc008a19a4fa44446de73c0d36880bfc7563037a1ecee0762e61c30244eea58a -size 3060748 diff --git a/kmplot-18.12.0.tar.xz b/kmplot-18.12.0.tar.xz new file mode 100644 index 0000000..241144d --- /dev/null +++ b/kmplot-18.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20fe92249d338487a266a99a3ee563f48800c57266c17ced4fca72c871c6c7d6 +size 3060852 diff --git a/kmplot.changes b/kmplot.changes index 4197fe7..bfdeb91 100644 --- a/kmplot.changes +++ b/kmplot.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Dec 14 06:09:14 UTC 2018 - lbeltrame@kde.org + +- Update to 18.12.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12.0.php +- Changes since 18.11.90: + * No code changes since 18.11.90 + ------------------------------------------------------------------- Mon Dec 03 20:56:04 UTC 2018 - lbeltrame@kde.org diff --git a/kmplot.spec b/kmplot.spec index 880f11b..b835d20 100644 --- a/kmplot.spec +++ b/kmplot.spec @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kmplot -Version: 18.11.90 +Version: 18.12.0 Release: 0 Summary: Mathematical Function Plotter License: GPL-2.0-or-later From 4a92010e89862c8ce942acd22bc080b34e61e1c488a9dae975977b9ee189b43c Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 14 Dec 2018 22:26:03 +0000 Subject: [PATCH 5/5] Fix wrong beta and rc release announcement URLs OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kmplot?expand=0&rev=82 --- kmplot.changes | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kmplot.changes b/kmplot.changes index bfdeb91..ee7198c 100644 --- a/kmplot.changes +++ b/kmplot.changes @@ -36,7 +36,7 @@ Tue Nov 20 05:57:09 UTC 2018 - lbeltrame@kde.org - Update to 18.11.80 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-18.11.80.php + * https://www.kde.org/announcements/announce-applications-18.12-beta.php - Changes since 18.08.3: * Too many changes to list here @@ -86,7 +86,7 @@ Thu Jul 26 13:00:49 UTC 2018 - lbeltrame@kde.org - Update to 18.07.80 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-18.07.80.php + * https://www.kde.org/announcements/announce-applications-18.08-beta.php - Changes since 18.04.3: * None @@ -136,7 +136,7 @@ Fri Apr 06 07:09:44 CEST 2018 - lbeltrame@kde.org - Update to 18.03.90 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-18.03.90.php + * https://www.kde.org/announcements/announce-applications-18.04-rc.php - Changes since 17.12.3: * None @@ -245,7 +245,7 @@ Sat Aug 5 18:18:17 UTC 2017 - christophe@krop.fr - Update to KDE Applications 17.07.90 * KDE Applications 17.07.90 - * https://www.kde.org/announcements/announce-applications-17.07.90.php + * https://www.kde.org/announcements/announce-applications-17.08-rc.php ------------------------------------------------------------------- @@ -304,7 +304,7 @@ Sat Mar 25 23:10:35 CET 2017 - lbeltrame@kde.org - Update to 17.03.80 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-17.03.80.php + * https://www.kde.org/announcements/announce-applications-17.04-beta.php - Changes since 16.12.3: * Fix terminology: "by KDE", not "for KDE" @@ -397,7 +397,7 @@ Mon Aug 8 15:14:54 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 16.07.90 * KDE Applications 16.07.90 (16.08-RC) - * https://www.kde.org/announcements/announce-applications-16.07.90.php + * https://www.kde.org/announcements/announce-applications-16.08-rc.php ------------------------------------------------------------------- @@ -518,7 +518,7 @@ Fri Aug 7 06:56:49 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.07.90 * KDE Applications 15.08.0 RC1 - * https://www.kde.org/announcements/announce-applications-15.07.90.php + * https://www.kde.org/announcements/announce-applications-15.08-rc.php -------------------------------------------------------------------