tdawson pushed to kf5-kxmlgui (epel8-playground). "pull in
reviewed/upstream session management fixes (kde#346768)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-07-31 22:31:47 UTC
From 918729072d51d3558630240d90342463cb37ec02 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter(a)math.unl.edu>
Date: May 11 2015 20:45:11 +0000
Subject: pull in reviewed/upstream session management fixes (kde#346768)
---
diff --git a/0001-Add-session-management-for-KMainWindow.patch b/0001-Add-session-management-for-KMainWindow.patch
new file mode 100644
index 0000000..d1de8e6
--- /dev/null
+++ b/0001-Add-session-management-for-KMainWindow.patch
@@ -0,0 +1,56 @@
+From c36189b575bef885aeb005f3f1c472ec8e48aacf Mon Sep 17 00:00:00 2001
+From: Stefan Becker <chemobejk(a)gmail.com>
+Date: Sat, 9 May 2015 17:17:25 +0300
+Subject: [PATCH] Add session management for KMainWindow
+
+- replace the KConfig object in KConfigGui with a new one using the
+ session id and key from the QSessionManager object
+- make sure that the data is stored after the application has update it
+- if the KConfig object is represented by a local file then add a
+ discard command to the session manager object
+
+BUG: 346768
+REVIEW: 123706
+---
+ src/kmainwindow.cpp | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/src/kmainwindow.cpp b/src/kmainwindow.cpp
+index 15eecb7..7c86841 100644
+--- a/src/kmainwindow.cpp
++++ b/src/kmainwindow.cpp
+@@ -127,8 +127,10 @@ KMWSessionManager::~KMWSessionManager()
+ {
+ }
+
+-bool KMWSessionManager::saveState(QSessionManager &)
++bool KMWSessionManager::saveState(QSessionManager &sm)
+ {
++ KConfigGui::setSessionConfig(sm.sessionId(), sm.sessionKey());
++
+ KConfig *config = KConfigGui::sessionConfig();
+ if (KMainWindow::memberList().count()) {
+ // According to Jochen Wilhelmy <digisnap(a)cs.tu-berlin.de>, this
+@@ -144,6 +146,19 @@ bool KMWSessionManager::saveState(QSessionManager &)
+
+ KConfigGroup group(config, "Number");
+ group.writeEntry("NumberOfWindows", n);
++
++ // store new status to disk
++ config->sync();
++
++ // generate discard command for new file
++ QString localFilePath = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/') + config->name();
++ if (QFile::exists(localFilePath)) {
++ QStringList discard;
++ discard << QLatin1String("rm");
++ discard << localFilePath;
++ sm.setDiscardCommand(discard);
++ }
++
+ return true;
+ }
+
+--
+2.4.0
+
diff --git a/Forward-QSessionManager-to-KConfigGui.patch b/Forward-QSessionManager-to-KConfigGui.patch
deleted file mode 100644
index f19d8a2..0000000
--- a/Forward-QSessionManager-to-KConfigGui.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From bf8b2f52392c97bc6acf1a5b5aedb735b9380655 Mon Sep 17 00:00:00 2001
-From: Stefan Becker <chemobejk(a)gmail.com>
-Date: Sat, 9 May 2015 17:17:25 +0300
-Subject: [PATCH] Forward QSessionManager to KConfigGui
-
-Get a KConfig object that corresponds to the QSessionManager object that
-is passed in with the saveStateRequest signal.
-
-To make sure that the data is stored to disk we have to call sync() on
-the object after the application has updated it. As the session manager
-always emits a saveStateRequest after starting the application we need
-to skip the sync() for the first request.
-
-BUG: 346768
----
- src/kmainwindow.cpp | 14 ++++++++++++--
- src/kmainwindow_p.h | 3 +++
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/src/kmainwindow.cpp b/src/kmainwindow.cpp
-index 15eecb7..95b01fd 100644
---- a/src/kmainwindow.cpp
-+++ b/src/kmainwindow.cpp
-@@ -119,6 +119,7 @@ bool DockResizeListener::eventFilter(QObject *watched, QEvent *event)
-
- KMWSessionManager::KMWSessionManager()
- {
-+ initial = true;
- connect(qApp, SIGNAL(saveStateRequest(QSessionManager&)),
- this, SLOT(saveState(QSessionManager&)));
- }
-@@ -127,9 +128,10 @@ KMWSessionManager::~KMWSessionManager()
- {
- }
-
--bool KMWSessionManager::saveState(QSessionManager &)
-+bool KMWSessionManager::saveState(QSessionManager &sm)
- {
-- KConfig *config = KConfigGui::sessionConfig();
-+ KConfig *config = KConfigGui::sessionConfig(sm);
-+
- if (KMainWindow::memberList().count()) {
- // According to Jochen Wilhelmy <digisnap(a)cs.tu-berlin.de>, this
- // hook is useful for better document orientation
-@@ -144,6 +146,14 @@ bool KMWSessionManager::saveState(QSessionManager &)
-
- KConfigGroup group(config, "Number");
- group.writeEntry("NumberOfWindows", n);
-+
-+ // The session manager emits a saveStateRequest after application start.
-+ // Skip storing data collected from this initial request.
-+ if (!initial) {
-+ config->sync();
-+ }
-+ initial = false;
-+
- return true;
- }
-
-diff --git a/src/kmainwindow_p.h b/src/kmainwindow_p.h
-index 8204ce1..2c90bf4 100644
---- a/src/kmainwindow_p.h
-+++ b/src/kmainwindow_p.h
-@@ -80,6 +80,9 @@ public:
- KMWSessionManager();
- ~KMWSessionManager();
-
-+private:
-+ bool initial;
-+
- private Q_SLOTS:
- bool saveState(QSessionManager &);
- };
---
-2.4.0
-
diff --git a/kf5-kxmlgui.spec b/kf5-kxmlgui.spec
index 2728946..4178733 100644
--- a/kf5-kxmlgui.spec
+++ b/kf5-kxmlgui.spec
@@ -2,7 +2,7 @@
Name: kf5-%{framework}
Version: 5.10.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: KDE Frameworks 5 Tier 3 solution for user-configurable main windows
License: GPLv2+ and LGPLv2+
@@ -17,9 +17,8 @@ URL: http://www.kde.org
%endif
Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%...
-## upstreamable patches
-# Candidate session management fixes
-# https://bugs.kde.org/show_bug.cgi?id=346768
+## upstream patches
+Patch1: 0001-Add-session-management-for-KMainWindow.patch
BuildRequires: libX11-devel
@@ -100,6 +99,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
+* Mon May 11 2015 Rex Dieter <rdieter(a)fedoraproject.org> 5.10.0-2
+- pull in reviewed/upstream session management fixes (kde#346768)
+
* Mon May 11 2015 Daniel Vrátil <dvratil(a)redhat.com> - 5.10.0-1
- KDE Frameworks 5.10.0
https://src.fedoraproject.org/rpms/kf5-kxmlgui/c/918729072d51d3558630240d...
2Â years, 9Â months
tdawson pushed to kf5-kxmlgui (epel8-playground). "Candidate session
management fixes (kde#346768)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-07-31 22:31:47 UTC
From 169bf2eea94c7b34fef4b4a60eb5081c7d9baef0 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter(a)math.unl.edu>
Date: May 09 2015 17:11:43 +0000
Subject: Candidate session management fixes (kde#346768)
---
diff --git a/Forward-QSessionManager-to-KConfigGui.patch b/Forward-QSessionManager-to-KConfigGui.patch
new file mode 100644
index 0000000..f19d8a2
--- /dev/null
+++ b/Forward-QSessionManager-to-KConfigGui.patch
@@ -0,0 +1,76 @@
+From bf8b2f52392c97bc6acf1a5b5aedb735b9380655 Mon Sep 17 00:00:00 2001
+From: Stefan Becker <chemobejk(a)gmail.com>
+Date: Sat, 9 May 2015 17:17:25 +0300
+Subject: [PATCH] Forward QSessionManager to KConfigGui
+
+Get a KConfig object that corresponds to the QSessionManager object that
+is passed in with the saveStateRequest signal.
+
+To make sure that the data is stored to disk we have to call sync() on
+the object after the application has updated it. As the session manager
+always emits a saveStateRequest after starting the application we need
+to skip the sync() for the first request.
+
+BUG: 346768
+---
+ src/kmainwindow.cpp | 14 ++++++++++++--
+ src/kmainwindow_p.h | 3 +++
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/src/kmainwindow.cpp b/src/kmainwindow.cpp
+index 15eecb7..95b01fd 100644
+--- a/src/kmainwindow.cpp
++++ b/src/kmainwindow.cpp
+@@ -119,6 +119,7 @@ bool DockResizeListener::eventFilter(QObject *watched, QEvent *event)
+
+ KMWSessionManager::KMWSessionManager()
+ {
++ initial = true;
+ connect(qApp, SIGNAL(saveStateRequest(QSessionManager&)),
+ this, SLOT(saveState(QSessionManager&)));
+ }
+@@ -127,9 +128,10 @@ KMWSessionManager::~KMWSessionManager()
+ {
+ }
+
+-bool KMWSessionManager::saveState(QSessionManager &)
++bool KMWSessionManager::saveState(QSessionManager &sm)
+ {
+- KConfig *config = KConfigGui::sessionConfig();
++ KConfig *config = KConfigGui::sessionConfig(sm);
++
+ if (KMainWindow::memberList().count()) {
+ // According to Jochen Wilhelmy <digisnap(a)cs.tu-berlin.de>, this
+ // hook is useful for better document orientation
+@@ -144,6 +146,14 @@ bool KMWSessionManager::saveState(QSessionManager &)
+
+ KConfigGroup group(config, "Number");
+ group.writeEntry("NumberOfWindows", n);
++
++ // The session manager emits a saveStateRequest after application start.
++ // Skip storing data collected from this initial request.
++ if (!initial) {
++ config->sync();
++ }
++ initial = false;
++
+ return true;
+ }
+
+diff --git a/src/kmainwindow_p.h b/src/kmainwindow_p.h
+index 8204ce1..2c90bf4 100644
+--- a/src/kmainwindow_p.h
++++ b/src/kmainwindow_p.h
+@@ -80,6 +80,9 @@ public:
+ KMWSessionManager();
+ ~KMWSessionManager();
+
++private:
++ bool initial;
++
+ private Q_SLOTS:
+ bool saveState(QSessionManager &);
+ };
+--
+2.4.0
+
diff --git a/kf5-kxmlgui.spec b/kf5-kxmlgui.spec
index 2295f52..cfce0dc 100644
--- a/kf5-kxmlgui.spec
+++ b/kf5-kxmlgui.spec
@@ -2,7 +2,7 @@
Name: kf5-%{framework}
Version: 5.9.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: KDE Frameworks 5 Tier 3 solution for user-configurable main windows
License: GPLv2+ and LGPLv2+
@@ -17,6 +17,11 @@ URL: http://www.kde.org
%endif
Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%...
+## upstreamable patches
+# Candidate session management fixes
+# https://bugs.kde.org/show_bug.cgi?id=346768
+Patch50: Forward-QSessionManager-to-KConfigGui.patch
+
BuildRequires: libX11-devel
BuildRequires: kf5-rpm-macros
@@ -24,7 +29,9 @@ BuildRequires: extra-cmake-modules
BuildRequires: qt5-qtbase-devel
BuildRequires: kf5-kitemviews-devel
-BuildRequires: kf5-kconfig-devel
+# session mangement patch needs new api
+BuildRequires: kf5-kconfig-devel >= 5.9.0-3
+Requires: kf5-kconfig-core%{?_isa} >= 5.9.0-3
BuildRequires: kf5-kglobalaccel-devel
BuildRequires: kf5-kconfigwidgets-devel
BuildRequires: kf5-ki18n-devel
@@ -58,16 +65,18 @@ developing applications that use %{name}.
%prep
-%setup -q -n %{framework}-%{version}
+%autosetup -n %{framework}-%{version} -p1
+
%build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
pushd %{_target_platform}
%{cmake_kf5} ..
popd
make %{?_smp_mflags} -C %{_target_platform}
+
%install
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%find_lang kxmlgui5_qt --with-qt --all-name
@@ -92,6 +101,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
+* Sat May 09 2015 Rex Dieter <rdieter(a)fedoraproject.org> 5.9.0-3
+- Candidate session management fixes (kde#346768)
+
* Sat May 02 2015 Kalev Lember <kalevlember(a)gmail.com> - 5.9.0-2
- Rebuilt for GCC 5 C++11 ABI change
https://src.fedoraproject.org/rpms/kf5-kxmlgui/c/169bf2eea94c7b34fef4b4a6...
2Â years, 9Â months
tdawson pushed to kf5-kxmlgui (epel8-playground). "Rebuilt for GCC 5
C++11 ABI change"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-07-31 22:31:47 UTC
From b99a0994bcf0eb1e2f068e1276be557e4eab2d85 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember(a)gmail.com>
Date: May 02 2015 12:49:46 +0000
Subject: Rebuilt for GCC 5 C++11 ABI change
---
diff --git a/kf5-kxmlgui.spec b/kf5-kxmlgui.spec
index 6788cae..2295f52 100644
--- a/kf5-kxmlgui.spec
+++ b/kf5-kxmlgui.spec
@@ -2,7 +2,7 @@
Name: kf5-%{framework}
Version: 5.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: KDE Frameworks 5 Tier 3 solution for user-configurable main windows
License: GPLv2+ and LGPLv2+
@@ -92,6 +92,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
+* Sat May 02 2015 Kalev Lember <kalevlember(a)gmail.com> - 5.9.0-2
+- Rebuilt for GCC 5 C++11 ABI change
+
* Tue Apr 07 2015 Daniel Vrátil <dvratil(a)redhat.com> - 5.9.0-1
- KDE Frameworks 5.9.0
https://src.fedoraproject.org/rpms/kf5-kxmlgui/c/b99a0994bcf0eb1e2f068e12...
2Â years, 9Â months
tdawson pushed to kf5-kxmlgui (epel8-playground). "KDE Frameworks
5.9.0"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-07-31 22:31:47 UTC
From 4aff89f74b496dca8b28e60a91eb7045f5847ada Mon Sep 17 00:00:00 2001
From: Dan Vrátil <dvratil(a)redhat.com>
Date: Apr 07 2015 12:46:02 +0000
Subject: KDE Frameworks 5.9.0
---
diff --git a/.gitignore b/.gitignore
index c41396e..66805bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/kxmlgui-5.6.0.tar.xz
/kxmlgui-5.7.0.tar.xz
/kxmlgui-5.8.0.tar.xz
+/kxmlgui-5.9.0.tar.xz
diff --git a/kf5-kxmlgui.spec b/kf5-kxmlgui.spec
index 1f38e32..6788cae 100644
--- a/kf5-kxmlgui.spec
+++ b/kf5-kxmlgui.spec
@@ -1,7 +1,7 @@
%global framework kxmlgui
Name: kf5-%{framework}
-Version: 5.8.0
+Version: 5.9.0
Release: 1%{?dist}
Summary: KDE Frameworks 5 Tier 3 solution for user-configurable main windows
@@ -92,6 +92,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
+* Tue Apr 07 2015 Daniel Vrátil <dvratil(a)redhat.com> - 5.9.0-1
+- KDE Frameworks 5.9.0
+
* Mon Mar 16 2015 Daniel Vrátil <dvratil(a)redhat.com> - 5.8.0-1
- KDE Frameworks 5.8.0
diff --git a/sources b/sources
index 88507e4..f4db72f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b9525359ea0ff6bc8736599b608986da kxmlgui-5.8.0.tar.xz
+3a6e85b9f2914f48f7020477119e4960 kxmlgui-5.9.0.tar.xz
https://src.fedoraproject.org/rpms/kf5-kxmlgui/c/4aff89f74b496dca8b28e60a...
2Â years, 9Â months
tdawson pushed to kf5-kxmlgui (epel8-playground). "KDE Frameworks
5.10.0"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-07-31 22:31:47 UTC
From 768c8b59a4f2cf2a54b02bab47c2e34a4a0ee35a Mon Sep 17 00:00:00 2001
From: Dan Vrátil <dvratil(a)redhat.com>
Date: May 11 2015 09:14:29 +0000
Subject: KDE Frameworks 5.10.0
---
diff --git a/.gitignore b/.gitignore
index 66805bc..0992183 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/kxmlgui-5.7.0.tar.xz
/kxmlgui-5.8.0.tar.xz
/kxmlgui-5.9.0.tar.xz
+/kxmlgui-5.10.0.tar.xz
diff --git a/kf5-kxmlgui.spec b/kf5-kxmlgui.spec
index cfce0dc..2728946 100644
--- a/kf5-kxmlgui.spec
+++ b/kf5-kxmlgui.spec
@@ -1,8 +1,8 @@
%global framework kxmlgui
Name: kf5-%{framework}
-Version: 5.9.0
-Release: 3%{?dist}
+Version: 5.10.0
+Release: 1%{?dist}
Summary: KDE Frameworks 5 Tier 3 solution for user-configurable main windows
License: GPLv2+ and LGPLv2+
@@ -20,7 +20,6 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra
## upstreamable patches
# Candidate session management fixes
# https://bugs.kde.org/show_bug.cgi?id=346768
-Patch50: Forward-QSessionManager-to-KConfigGui.patch
BuildRequires: libX11-devel
@@ -101,6 +100,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
+* Mon May 11 2015 Daniel Vrátil <dvratil(a)redhat.com> - 5.10.0-1
+- KDE Frameworks 5.10.0
+
* Sat May 09 2015 Rex Dieter <rdieter(a)fedoraproject.org> 5.9.0-3
- Candidate session management fixes (kde#346768)
diff --git a/sources b/sources
index f4db72f..f9774f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3a6e85b9f2914f48f7020477119e4960 kxmlgui-5.9.0.tar.xz
+35b8161e519fc6a2a466330a9f24c05f kxmlgui-5.10.0.tar.xz
https://src.fedoraproject.org/rpms/kf5-kxmlgui/c/768c8b59a4f2cf2a54b02bab...
2Â years, 9Â months
tdawson pushed to kf5-kxmlgui (epel8-playground). "KDE Frameworks
5.8.0"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-07-31 22:31:47 UTC
From 3cd5ee23300ba92075f8d83230ca8fc0cf0afd79 Mon Sep 17 00:00:00 2001
From: Dan Vrátil <dvratil(a)redhat.com>
Date: Mar 16 2015 12:06:58 +0000
Subject: KDE Frameworks 5.8.0
---
diff --git a/.gitignore b/.gitignore
index c8ddca8..c41396e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/kxmlgui-5.5.0.tar.xz
/kxmlgui-5.6.0.tar.xz
/kxmlgui-5.7.0.tar.xz
+/kxmlgui-5.8.0.tar.xz
diff --git a/kf5-kxmlgui.spec b/kf5-kxmlgui.spec
index b50f25d..1f38e32 100644
--- a/kf5-kxmlgui.spec
+++ b/kf5-kxmlgui.spec
@@ -1,8 +1,8 @@
%global framework kxmlgui
Name: kf5-%{framework}
-Version: 5.7.0
-Release: 2%{?dist}
+Version: 5.8.0
+Release: 1%{?dist}
Summary: KDE Frameworks 5 Tier 3 solution for user-configurable main windows
License: GPLv2+ and LGPLv2+
@@ -92,6 +92,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
+* Mon Mar 16 2015 Daniel Vrátil <dvratil(a)redhat.com> - 5.8.0-1
+- KDE Frameworks 5.8.0
+
* Fri Feb 27 2015 Daniel Vrátil <dvratil(a)redhat.com> - 5.7.0-2
- Rebuild (GCC 5)
diff --git a/sources b/sources
index 8cd8820..88507e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8bcf5f6aabff251d3e722216c1ecfff2 kxmlgui-5.7.0.tar.xz
+b9525359ea0ff6bc8736599b608986da kxmlgui-5.8.0.tar.xz
https://src.fedoraproject.org/rpms/kf5-kxmlgui/c/3cd5ee23300ba92075f8d832...
2Â years, 9Â months
tdawson pushed to kf5-kxmlgui (epel8-playground). "Rebuild (GCC 5)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-07-31 22:31:47 UTC
From 54dd01fb449b6fbca1551420cbfec3d262487a56 Mon Sep 17 00:00:00 2001
From: Dan Vrátil <dvratil(a)redhat.com>
Date: Feb 27 2015 17:12:17 +0000
Subject: Rebuild (GCC 5)
---
diff --git a/kf5-kxmlgui.spec b/kf5-kxmlgui.spec
index b01dee0..b50f25d 100644
--- a/kf5-kxmlgui.spec
+++ b/kf5-kxmlgui.spec
@@ -2,7 +2,7 @@
Name: kf5-%{framework}
Version: 5.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: KDE Frameworks 5 Tier 3 solution for user-configurable main windows
License: GPLv2+ and LGPLv2+
@@ -92,6 +92,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
+* Fri Feb 27 2015 Daniel Vrátil <dvratil(a)redhat.com> - 5.7.0-2
+- Rebuild (GCC 5)
+
* Mon Feb 16 2015 Daniel Vrátil <dvratil(a)redhat.com> - 5.7.0-1
- KDE Frameworks 5.7.0
https://src.fedoraproject.org/rpms/kf5-kxmlgui/c/54dd01fb449b6fbca1551420...
2Â years, 9Â months
tdawson pushed to kf5-kxmlgui (epel8-playground). "KDE Frameworks
5.7.0"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-07-31 22:31:47 UTC
From 3cbbd1c1a089512011dda06237280ac847459064 Mon Sep 17 00:00:00 2001
From: Dan Vrátil <dvratil(a)redhat.com>
Date: Feb 16 2015 12:13:04 +0000
Subject: KDE Frameworks 5.7.0
---
diff --git a/.gitignore b/.gitignore
index d83ecc0..c8ddca8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/kxmlgui-5.4.0.tar.xz
/kxmlgui-5.5.0.tar.xz
/kxmlgui-5.6.0.tar.xz
+/kxmlgui-5.7.0.tar.xz
diff --git a/kf5-kxmlgui.spec b/kf5-kxmlgui.spec
index adf1fe1..b01dee0 100644
--- a/kf5-kxmlgui.spec
+++ b/kf5-kxmlgui.spec
@@ -1,12 +1,12 @@
%global framework kxmlgui
Name: kf5-%{framework}
-Version: 5.6.0
-Release: 2%{?dist}
+Version: 5.7.0
+Release: 1%{?dist}
Summary: KDE Frameworks 5 Tier 3 solution for user-configurable main windows
License: GPLv2+ and LGPLv2+
-URL: https://projects.kde.org/projects/frameworks/kxmlgui
+URL: http://www.kde.org
%global versiondir %(echo %{version} | cut -d. -f1-2)
%global revision %(echo %{version} | cut -d. -f3)
@@ -22,7 +22,6 @@ BuildRequires: libX11-devel
BuildRequires: kf5-rpm-macros
BuildRequires: extra-cmake-modules
BuildRequires: qt5-qtbase-devel
-BuildRequires: qt5-qtx11extras-devel
BuildRequires: kf5-kitemviews-devel
BuildRequires: kf5-kconfig-devel
@@ -43,15 +42,14 @@ KDE Frameworks 5 Tier 3 solution for user-configurable main windows.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: kf5-kitemviews-devel
Requires: kf5-kconfig-devel
-Requires: kf5-kglobalaccel-devel
Requires: kf5-kconfigwidgets-devel
-Requires: kf5-ki18n-devel
+Requires: kf5-kglobalaccel-devel
Requires: kf5-kiconthemes-devel
+Requires: kf5-kitemviews-devel
Requires: kf5-ktextwidgets-devel
-Requires: kf5-kwidgetsaddons-devel
Requires: kf5-kwindowsystem-devel
+Requires: qt5-qtbase-devel
Requires: kf5-attica-devel
%description devel
@@ -74,35 +72,31 @@ make %{?_smp_mflags} -C %{_target_platform}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%find_lang kxmlgui5_qt --with-qt --all-name
-# create/own /usr/share/kxmlgui5 too
-mkdir -p %{buildroot}%{_kf5_datadir}/kxmlgui5
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files -f kxmlgui5_qt.lang
%doc COPYING COPYING.LIB README.md
-%dir %{_kf5_sysconfdir}/xdg/ui/
%config %{_kf5_sysconfdir}/xdg/ui/ui_standards.rc
%{_kf5_libdir}/libKF5XmlGui.so.*
%{_kf5_libexecdir}/ksendbugmail
%{_kf5_datadir}/kf5/kxmlgui/
-%dir %{_kf5_datadir}/kxmlgui5/
%files devel
%{_kf5_includedir}/kxmlgui_version.h
-%{_kf5_includedir}/KXmlGui/
+%{_kf5_includedir}/KXmlGui
%{_kf5_libdir}/libKF5XmlGui.so
-%{_kf5_libdir}/cmake/KF5XmlGui/
+%{_kf5_libdir}/cmake/KF5XmlGui
%{_kf5_archdatadir}/mkspecs/modules/qt_KXmlGui.pri
%changelog
-* Sat Jan 31 2015 Rex Dieter <rdieter(a)fedoraproject.org> - 5.6.0-2
-- own /usr/share/kxmlgui5/, /etc/xdg/ui/
-- use 'make install/fast'
-- better URL:
+* Mon Feb 16 2015 Daniel Vrátil <dvratil(a)redhat.com> - 5.7.0-1
+- KDE Frameworks 5.7.0
+
+* Mon Feb 09 2015 Daniel Vrátil <dvratil(a)redhat.com> - 5.7.0-1
+- KDE Frameworks 5.7.0
* Thu Jan 08 2015 Daniel Vrátil <dvratil(a)redhat.com> - 5.6.0-1
- KDE Frameworks 5.6.0
diff --git a/sources b/sources
index 25c3085..8cd8820 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ffd6c94f15bddeb830c903d0882fb676 kxmlgui-5.6.0.tar.xz
+8bcf5f6aabff251d3e722216c1ecfff2 kxmlgui-5.7.0.tar.xz
https://src.fedoraproject.org/rpms/kf5-kxmlgui/c/3cbbd1c1a089512011dda062...
2Â years, 9Â months
tdawson pushed to kf5-kxmlgui (epel8-playground). "5.6.0-2 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-07-31 22:31:47 UTC
From 8ee7bb47d8925c46cd285af05abf4ac31ad9022b Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter(a)math.unl.edu>
Date: Jan 31 2015 18:09:27 +0000
Subject: 5.6.0-2
- own /usr/share/kxmlgui5/, /etc/xdg/ui/
- use 'make install/fast'
- better URL:
---
diff --git a/kf5-kxmlgui.spec b/kf5-kxmlgui.spec
index ba9391f..9a1d2de 100644
--- a/kf5-kxmlgui.spec
+++ b/kf5-kxmlgui.spec
@@ -2,11 +2,11 @@
Name: kf5-%{framework}
Version: 5.6.0
-Release: 1%{?dist}
+Release: 2v%{?dist}
Summary: KDE Frameworks 5 Tier 3 solution for user-configurable main windows
License: GPLv2+ and LGPLv2+
-URL: http://www.kde.org
+URL: https://projects.kde.org/projects/frameworks/kxmlgui
%global versiondir %(echo %{version} | cut -d. -f1-2)
%global revision %(echo %{version} | cut -d. -f3)
@@ -71,29 +71,39 @@ popd
make %{?_smp_mflags} -C %{_target_platform}
%install
-%make_install -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%find_lang kxmlgui5_qt --with-qt --all-name
+# create/own /usr/share/kxmlgui5 too
+mkdir -p %{buildroot}%{_kf5_datadir}/kxmlgui5
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files -f kxmlgui5_qt.lang
%doc COPYING COPYING.LIB README.md
+%dir %{_kf5_sysconfdir}/xdg/ui/
%config %{_kf5_sysconfdir}/xdg/ui/ui_standards.rc
%{_kf5_libdir}/libKF5XmlGui.so.*
%{_kf5_libexecdir}/ksendbugmail
%{_kf5_datadir}/kf5/kxmlgui/
+%dir %{_kf5_datadir}/kxmlgui5/
%files devel
%{_kf5_includedir}/kxmlgui_version.h
-%{_kf5_includedir}/KXmlGui
+%{_kf5_includedir}/KXmlGui/
%{_kf5_libdir}/libKF5XmlGui.so
-%{_kf5_libdir}/cmake/KF5XmlGui
+%{_kf5_libdir}/cmake/KF5XmlGui/
%{_kf5_archdatadir}/mkspecs/modules/qt_KXmlGui.pri
%changelog
+* Sat Jan 31 2015 Rex Dieter <rdieter(a)fedoraproject.org> - 5.6.0-2
+- own /usr/share/kxmlgui5/, /etc/xdg/ui/
+- use 'make install/fast'
+- better URL:
+
* Thu Jan 08 2015 Daniel Vrátil <dvratil(a)redhat.com> - 5.6.0-1
- KDE Frameworks 5.6.0
https://src.fedoraproject.org/rpms/kf5-kxmlgui/c/8ee7bb47d8925c46cd285af0...
2Â years, 9Â months