jgrulich pushed to plasma-pk-updates (master). "Update to 0.2"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 7 10:35:48 UTC 2015
>From 293d8c9467f6124d8a2bc33a53eb0ef520aa9b45 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich at redhat.com>
Date: Tue, 7 Apr 2015 12:35:18 +0200
Subject: Update to 0.2
diff --git a/.gitignore b/.gitignore
index 5363eaa..523bcea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/plasma-pk-updates-0.1.tar.gz
+/plasma-pk-updates-0.2.tar.gz
diff --git a/0001-allow-installing-untrusted-packages-too.patch b/0001-allow-installing-untrusted-packages-too.patch
deleted file mode 100644
index ca0982a..0000000
--- a/0001-allow-installing-untrusted-packages-too.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 377f4793b86728c163b3f4f26ded5b6b05063be8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= <lukas at kde.org>
-Date: Mon, 16 Mar 2015 16:37:17 +0100
-Subject: [PATCH] allow installing untrusted packages too
-
-user will have to confirm the installation with a polkit dialog
-also add a TODO for importing GPG keys
----
- src/declarative/pkupdates.cpp | 11 ++++++++++-
- src/declarative/pkupdates.h | 2 ++
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/src/declarative/pkupdates.cpp b/src/declarative/pkupdates.cpp
-index 4aa7375..aa7f56e 100644
---- a/src/declarative/pkupdates.cpp
-+++ b/src/declarative/pkupdates.cpp
-@@ -252,6 +252,7 @@ void PkUpdates::installUpdates(const QStringList &packageIds)
- connect(m_installTrans, &PackageKit::Transaction::errorCode, this, &PkUpdates::onErrorCode);
- connect(m_installTrans, &PackageKit::Transaction::package, this, &PkUpdates::onPackageUpdating);
- connect(m_installTrans, &PackageKit::Transaction::requireRestart, this, &PkUpdates::onRequireRestart);
-+ connect(m_installTrans, &PackageKit::Transaction::repoSignatureRequired, this, &PkUpdates::onRepoSignatureRequired);
- }
-
- void PkUpdates::onChanged()
-@@ -388,6 +389,14 @@ void PkUpdates::onUpdateDetail(const QString &packageID, const QStringList &upda
- emit updateDetail(packageID, updateText, bugzillaUrls);
- }
-
-+void PkUpdates::onRepoSignatureRequired(const QString &packageID, const QString &repoName, const QString &keyUrl, const QString &keyUserid,
-+ const QString &keyId, const QString &keyFingerprint, const QString &keyTimestamp,
-+ PackageKit::Transaction::SigType type)
-+{
-+ // TODO provide a way to confirm and import GPG keys
-+ qDebug() << "Repo sig required" << packageID;
-+}
-+
- void PkUpdates::setStatusMessage(const QString &message)
- {
- m_statusMessage = message;
-diff --git a/src/declarative/pkupdates.h b/src/declarative/pkupdates.h
-index cde311c..81066aa 100644
---- a/src/declarative/pkupdates.h
-+++ b/src/declarative/pkupdates.h
-@@ -208,6 +208,8 @@ private slots:
- const QStringList &bugzillaUrls, const QStringList &cveUrls, PackageKit::Transaction::Restart restart,
- const QString &updateText, const QString &changelog, PackageKit::Transaction::UpdateState state,
- const QDateTime &issued, const QDateTime &updated);
-+ void onRepoSignatureRequired(const QString & packageID, const QString & repoName, const QString & keyUrl, const QString & keyUserid,
-+ const QString & keyId, const QString & keyFingerprint, const QString & keyTimestamp, PackageKit::Transaction::SigType type);
-
- private:
- void setStatusMessage(const QString &message);
---
-2.1.0
-
diff --git a/0002-micro-optimization.patch b/0002-micro-optimization.patch
deleted file mode 100644
index d797c93..0000000
--- a/0002-micro-optimization.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/src/declarative/pkupdates.cpp b/src/declarative/pkupdates.cpp
-index 2e3a18d..46d8fad 100644
---- a/src/declarative/pkupdates.cpp
-+++ b/src/declarative/pkupdates.cpp
-@@ -181,7 +181,7 @@ void PkUpdates::getUpdateDetails(const QString &pkgID)
-
- QString PkUpdates::timestamp() const
- {
-- qint64 lastCheck = QDateTime::currentMSecsSinceEpoch() - lastRefreshTimestamp();
-+ const qint64 lastCheck = QDateTime::currentMSecsSinceEpoch() - lastRefreshTimestamp();
-
- if (lastCheck != -1)
- return i18n("Last updated: %1 ago", KFormat().formatSpelloutDuration(lastCheck));
-@@ -206,6 +206,7 @@ void PkUpdates::checkUpdates(bool force)
- connect(m_cacheTrans, &PackageKit::Transaction::finished, this, &PkUpdates::onFinished);
- connect(m_cacheTrans, &PackageKit::Transaction::errorCode, this, &PkUpdates::onErrorCode);
- connect(m_cacheTrans, &PackageKit::Transaction::requireRestart, this, &PkUpdates::onRequireRestart);
-+ connect(m_cacheTrans, &PackageKit::Transaction::repoSignatureRequired, this, &PkUpdates::onRepoSignatureRequired);
- }
-
- qint64 PkUpdates::lastRefreshTimestamp() const
-@@ -238,6 +239,7 @@ void PkUpdates::getUpdates()
- connect(m_updatesTrans, &PackageKit::Transaction::errorCode, this, &PkUpdates::onErrorCode);
- connect(m_updatesTrans, &PackageKit::Transaction::package, this, &PkUpdates::onPackage);
- connect(m_updatesTrans, &PackageKit::Transaction::requireRestart, this, &PkUpdates::onRequireRestart);
-+ connect(m_updatesTrans, &PackageKit::Transaction::repoSignatureRequired, this, &PkUpdates::onRepoSignatureRequired);
- }
-
- void PkUpdates::installUpdates(const QStringList &packageIds)
---
-2.1.0
-
diff --git a/plasma-pk-updates.spec b/plasma-pk-updates.spec
index 67f2b69..ec3b1ad 100644
--- a/plasma-pk-updates.spec
+++ b/plasma-pk-updates.spec
@@ -1,6 +1,6 @@
Name: plasma-pk-updates
-Version: 0.1
-Release: 4%{?dist}
+Version: 0.2
+Release: 1%{?dist}
Summary: Plasma applet for system updates using PackageKit
License: GPLv2+
@@ -11,8 +11,6 @@ Source0: https://github.com/caybro/plasma-pk-updates/archive/v%{version}.
Source1: 01-fedora-org.kde.plasma.pkupdates.js
# Upstream patches
-Patch00: 0001-allow-installing-untrusted-packages-too.patch
-Patch01: 0002-micro-optimization.patch
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtdeclarative-devel
@@ -37,9 +35,6 @@ Requires: kf5-filesystem
%prep
%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .allow-installing-untrusted-packages-too
-%patch1 -p1 -b .micro-optimization
-
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
@@ -61,6 +56,9 @@ install -m644 -p -D %{SOURCE1} %{buildroot}%{_datadir}/plasma/shells/org.kde.pla
%{_datadir}/plasma/shells/org.kde.plasma.desktop/updates/01-fedora-org.kde.plasma.pkupdates.js
%changelog
+* Tue Apr 07 2015 Jan Grulich <jgrulich at redhat.com> 0.2-1
+- update to 0.2
+
* Mon Mar 30 2015 Rex Dieter <rdieter at fedoraproject.org> 0.1-4
- enable org.kde.plasma.pkupdates by default, except not liveimage (#1206760)
diff --git a/sources b/sources
index 4c71aa2..fbdec8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f502a7c243f7a2e74437f7083036261 plasma-pk-updates-0.1.tar.gz
+c4464eb01dd55ccb3c158a62f88c4636 plasma-pk-updates-0.2.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/plasma-pk-updates.git/commit/?h=master&id=293d8c9467f6124d8a2bc33a53eb0ef520aa9b45
More information about the scm-commits
mailing list