From 4d19e2af3891292cb41f5341e371cd2c338c6149db14cac3bdc729a0ec107e21 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Wed, 25 Nov 2015 18:32:19 +0000 Subject: [PATCH 1/8] start with 5.5 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=72 --- kinfocenter-5.4.3.tar.xz | 3 --- kinfocenter-5.4.95.tar.xz | 3 +++ kinfocenter5.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 kinfocenter-5.4.3.tar.xz create mode 100644 kinfocenter-5.4.95.tar.xz diff --git a/kinfocenter-5.4.3.tar.xz b/kinfocenter-5.4.3.tar.xz deleted file mode 100644 index 8b05633..0000000 --- a/kinfocenter-5.4.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:475bf963a3b0bc5c6c267889ad96f2bf8666f051e3dbeb47b21e3ab4630bdeec -size 1131908 diff --git a/kinfocenter-5.4.95.tar.xz b/kinfocenter-5.4.95.tar.xz new file mode 100644 index 0000000..d2aefbc --- /dev/null +++ b/kinfocenter-5.4.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bf2fe2f3aeaf2a00a03b18d056620e0afb94cecf105288af168c28f3b9ae7f7 +size 1142520 diff --git a/kinfocenter5.spec b/kinfocenter5.spec index 7f00883..f0a8b52 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: kinfocenter5 -Version: 5.4.3 +Version: 5.4.95 Release: 0 Summary: Utility that provides information about a computer system License: GPL-2.0+ From 3648b32e5df88b620c6293469ceedfd04bc473b8a8bb02150c157d2d9a7ff522 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 27 Nov 2015 06:40:29 +0000 Subject: [PATCH 2/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=73 --- plasma-session-name.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plasma-session-name.patch b/plasma-session-name.patch index 011f807..4dfb488 100644 --- a/plasma-session-name.patch +++ b/plasma-session-name.patch @@ -6,8 +6,8 @@ index 9e9dc9c..7a34520 100644 QString Module::plasmaVersion() const { const QStringList &filePaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, -- "xsessions/plasma.desktop"); -+ "xsessions/plasma5.desktop"); +- QStringLiteral("xsessions/plasma.desktop")); ++ QStringLiteral("xsessions/plasma5.desktop")); if (filePaths.length() < 1) { return QString(); From 7dccb7ef953c3828d4e7f93bdb39fe9862918444e67f0a473b304b802d4cc5df Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 28 Nov 2015 20:00:52 +0000 Subject: [PATCH 3/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=74 --- kinfocenter-fix-cmdline-parsing.patch | 58 --------------------------- kinfocenter5.spec | 7 ---- 2 files changed, 65 deletions(-) delete mode 100644 kinfocenter-fix-cmdline-parsing.patch diff --git a/kinfocenter-fix-cmdline-parsing.patch b/kinfocenter-fix-cmdline-parsing.patch deleted file mode 100644 index d20d938..0000000 --- a/kinfocenter-fix-cmdline-parsing.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: Antonio Larrosa -Date: Fri, 23 Oct 2015 12:57:44 +0000 -Subject: Fix kinfocenter crash when run with --version -X-Git-Url: http://quickgit.kde.org/?p=kinfocenter.git&a=commitdiff&h=fe16e35904587266f37114ac682916e449677054 ---- -Fix kinfocenter crash when run with --version - -Fix the order in which kinfocenter is initialized to first do all -commandline parsing and only then create windows. In other case -running "kinfocenter --version" crashes when unloading dynamic libraries -that shouldn't have been loaded at all. ---- - - ---- a/main.cpp -+++ b/main.cpp -@@ -37,14 +37,7 @@ - { - QApplication::setApplicationDisplayName(i18n("KDE Info Center")); - QApplication::setOrganizationDomain("kde.org"); -- display = new KInfoCenter(); -- display->show(); - -- KDBusService* service = new KDBusService(KDBusService::Unique, this); --} -- --int main(int argc, char *argv[]) --{ - KLocalizedString::setApplicationDomain("kinfocenter"); - - KAboutData aboutData( QStringLiteral("kinfocenter"), i18n("KDE Info Center"), -@@ -60,14 +53,23 @@ - aboutData.addAuthor(i18n("Waldo Bastian"), QString(), QStringLiteral("bastian@kde.org")); - aboutData.addAuthor(i18n("Nicolas Ternisien"), QString(), QStringLiteral("nicolas.ternisien@gmail.com")); - KAboutData::setApplicationData(aboutData); -- KicApp Kic(argc, argv); - - QCommandLineParser parser; - parser.addHelpOption(); - parser.addVersionOption(); - aboutData.setupCommandLine(&parser); -- parser.process(Kic); -+ parser.process(*this); - aboutData.processCommandLine(&parser); -+ -+ display = new KInfoCenter(); -+ display->show(); -+ -+ KDBusService* service = new KDBusService(KDBusService::Unique, this); -+} -+ -+int main(int argc, char *argv[]) -+{ -+ KicApp Kic(argc, argv); - - return Kic.exec(); - } - diff --git a/kinfocenter5.spec b/kinfocenter5.spec index f0a8b52..3f405de 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -28,8 +28,6 @@ Source: kinfocenter-%{version}.tar.xz Source99: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE plasma-session-name.patch Patch0: plasma-session-name.patch -# PATCH-FIX-UPSTREAM kinfocenter-fix-cmdline-parsing.patch -- Fixes crash when run with --version -Patch1: kinfocenter-fix-cmdline-parsing.patch BuildRequires: extra-cmake-modules BuildRequires: kcmutils-devel BuildRequires: kcompletion-devel @@ -73,7 +71,6 @@ KDE Utility that provides information about a computer system. %prep %setup -q -n kinfocenter-%{version} %patch0 -p1 -%patch1 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 @@ -82,10 +79,6 @@ KDE Utility that provides information about a computer system. %install %kf5_makeinstall -C build -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - %files %defattr(-,root,root) %doc COPYING* From c7c668e2c1b5e6ba8f39bb609d94c798f5a5978dbcd3d438b5c2b65f01f17c83 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 29 Nov 2015 18:08:43 +0000 Subject: [PATCH 4/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=75 --- kinfocenter5.spec | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/kinfocenter5.spec b/kinfocenter5.spec index 3f405de..8fb3c56 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -28,26 +28,34 @@ Source: kinfocenter-%{version}.tar.xz Source99: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE plasma-session-name.patch Patch0: plasma-session-name.patch -BuildRequires: extra-cmake-modules -BuildRequires: kcmutils-devel -BuildRequires: kcompletion-devel -BuildRequires: kconfig-devel -BuildRequires: kdeclarative-devel -BuildRequires: kdelibs4support-devel -BuildRequires: kdoctools-devel +BuildRequires: extra-cmake-modules >= 1.2.0 BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel -BuildRequires: kio-devel -BuildRequires: kpackage-devel -BuildRequires: kxmlgui-devel BuildRequires: libraw1394-devel BuildRequires: pciutils-devel -BuildRequires: plasma-framework-devel -BuildRequires: solid-devel BuildRequires: update-desktop-files BuildRequires: xz -BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Gui) >= 5.4.0 +BuildRequires: cmake(KF5Completion) >= 5.9.0 +BuildRequires: cmake(KF5Config) >= 5.9.0 +BuildRequires: cmake(KF5ConfigWidgets) >= 5.9.0 +BuildRequires: cmake(KF5CoreAddons) >= 5.9.0 +BuildRequires: cmake(KF5DBusAddons) >= 5.9.0 +BuildRequires: cmake(KF5Declarative) >= 5.9.0 +BuildRequires: cmake(KF5DocTools) >= 5.9.0 +BuildRequires: cmake(KF5I18n) >= 5.9.0 +BuildRequires: cmake(KF5IconThemes) >= 5.9.0 +BuildRequires: cmake(KF5KCMUtils) >= 5.9.0 +BuildRequires: cmake(KF5KDELibs4Support) >= 5.9.0 +BuildRequires: cmake(KF5KIO) >= 5.9.0 +BuildRequires: cmake(KF5Package) >= 5.9.0 +BuildRequires: cmake(KF5Service) >= 5.9.0 +BuildRequires: cmake(KF5Solid) >= 5.9.0 +BuildRequires: cmake(KF5Solid) >= 5.9.0 +BuildRequires: cmake(KF5Wayland) >= %{version} +BuildRequires: cmake(KF5WidgetsAddons) >= 5.9.0 +BuildRequires: cmake(KF5XmlGui) >= 5.9.0 +BuildRequires: cmake(Qt5Core) >= 5.4.0 +BuildRequires: cmake(Qt5Gui) >= 5.4.0 +BuildRequires: cmake(Qt5Widgets) >= 5.4.0 BuildRequires: pkgconfig(egl) %ifarch %arm aarch64 BuildRequires: pkgconfig(glesv2) @@ -55,9 +63,7 @@ BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(gl) %endif BuildRequires: pkgconfig(glu) -%if 0%{?suse_version} > 1310 -BuildRequires: kwayland-devel >= 5.0.95 -%endif +BuildRequires: pkgconfig(x11) Conflicts: kdebase4-workspace < 5.3.0 %if %{with lang} Recommends: %{name}-lang From 711c9a60e4d3c708686744af23267cf7a6d01c2f582a5d51822e8c93d6cdd2cd Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Thu, 3 Dec 2015 15:03:09 +0000 Subject: [PATCH 5/8] start with 5.5 finak OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=76 --- kinfocenter-5.4.95.tar.xz | 3 --- kinfocenter-5.5.0.tar.xz | 3 +++ kinfocenter5.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 kinfocenter-5.4.95.tar.xz create mode 100644 kinfocenter-5.5.0.tar.xz diff --git a/kinfocenter-5.4.95.tar.xz b/kinfocenter-5.4.95.tar.xz deleted file mode 100644 index d2aefbc..0000000 --- a/kinfocenter-5.4.95.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4bf2fe2f3aeaf2a00a03b18d056620e0afb94cecf105288af168c28f3b9ae7f7 -size 1142520 diff --git a/kinfocenter-5.5.0.tar.xz b/kinfocenter-5.5.0.tar.xz new file mode 100644 index 0000000..bfa54f5 --- /dev/null +++ b/kinfocenter-5.5.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e2b4446afc53985a21f5b387692a395bf1a17f42fa75e9e77c002f138a229f7 +size 1143256 diff --git a/kinfocenter5.spec b/kinfocenter5.spec index 8fb3c56..e42be78 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: kinfocenter5 -Version: 5.4.95 +Version: 5.5.0 Release: 0 Summary: Utility that provides information about a computer system License: GPL-2.0+ From dbde4311bc9fb8ff6388f29e6b6501aa6501d1585646326266518358383a5320 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 12 Dec 2015 17:31:34 +0000 Subject: [PATCH 6/8] changelogs OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=77 --- kinfocenter5.changes | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/kinfocenter5.changes b/kinfocenter5.changes index a4c48bd..43ef4c2 100644 --- a/kinfocenter5.changes +++ b/kinfocenter5.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Dec 12 17:31:32 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.5.0: + * For more details please see: + https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork +- Move to cmake(...) BuildRequires where possible + ------------------------------------------------------------------- Sun Nov 8 18:35:52 UTC 2015 - hrvoje.senjan@gmail.com From d779ab424c6459a894aaad456b4325e160f039566370463e19e2db4af52419ef Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 12 Dec 2015 19:44:37 +0000 Subject: [PATCH 7/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=78 --- kinfocenter5.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/kinfocenter5.changes b/kinfocenter5.changes index 43ef4c2..3d9ed26 100644 --- a/kinfocenter5.changes +++ b/kinfocenter5.changes @@ -5,6 +5,7 @@ Sat Dec 12 17:31:32 UTC 2015 - hrvoje.senjan@gmail.com * For more details please see: https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork - Move to cmake(...) BuildRequires where possible +- Drop upstreamed kinfocenter-fix-cmdline-parsing.patch ------------------------------------------------------------------- Sun Nov 8 18:35:52 UTC 2015 - hrvoje.senjan@gmail.com From aebac659809f5badd50fd6a22c491e28b31622d20de84cfa2e7aaafd0209acb1 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Tue, 15 Dec 2015 18:00:03 +0000 Subject: [PATCH 8/8] 5.5.1 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=79 --- kinfocenter-5.5.0.tar.xz | 3 --- kinfocenter-5.5.1.tar.xz | 3 +++ kinfocenter5.changes | 8 ++++++++ kinfocenter5.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 kinfocenter-5.5.0.tar.xz create mode 100644 kinfocenter-5.5.1.tar.xz diff --git a/kinfocenter-5.5.0.tar.xz b/kinfocenter-5.5.0.tar.xz deleted file mode 100644 index bfa54f5..0000000 --- a/kinfocenter-5.5.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7e2b4446afc53985a21f5b387692a395bf1a17f42fa75e9e77c002f138a229f7 -size 1143256 diff --git a/kinfocenter-5.5.1.tar.xz b/kinfocenter-5.5.1.tar.xz new file mode 100644 index 0000000..002c31d --- /dev/null +++ b/kinfocenter-5.5.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80b86a8316c24b3e725935bc6c53c884f81c1729013d35024ff4e2a034463f2c +size 1143244 diff --git a/kinfocenter5.changes b/kinfocenter5.changes index 3d9ed26..aac8a3a 100644 --- a/kinfocenter5.changes +++ b/kinfocenter5.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Dec 15 17:49:51 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.5.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.1.php + ------------------------------------------------------------------- Sat Dec 12 17:31:32 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kinfocenter5.spec b/kinfocenter5.spec index e42be78..fd434cb 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: kinfocenter5 -Version: 5.5.0 +Version: 5.5.1 Release: 0 Summary: Utility that provides information about a computer system License: GPL-2.0+