[plasma-pk-updates] Backport minor fixes from upstream

Jan Grulich jgrulich at fedoraproject.org
Mon Mar 23 15:46:44 UTC 2015


commit c35352ab78f39819f259b2118da156694792f6a5
Author: Jan Grulich <jgrulich at redhat.com>
Date:   Mon Mar 23 16:46:38 2015 +0100

    Backport minor fixes from upstream

 0001-allow-installing-untrusted-packages-too.patch | 9 ---------
 plasma-pk-updates.spec                             | 7 ++++++-
 2 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/0001-allow-installing-untrusted-packages-too.patch b/0001-allow-installing-untrusted-packages-too.patch
index 2c79793..ca0982a 100644
--- a/0001-allow-installing-untrusted-packages-too.patch
+++ b/0001-allow-installing-untrusted-packages-too.patch
@@ -14,15 +14,6 @@ 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
-@@ -244,7 +244,7 @@ void PkUpdates::installUpdates(const QStringList &packageIds)
- {
-     qDebug() << "Installing updates" << packageIds;
- 
--    m_installTrans = PackageKit::Daemon::updatePackages(packageIds);
-+    m_installTrans = PackageKit::Daemon::updatePackages(packageIds, PackageKit::Transaction::TransactionFlagNone);
-     setActivity(InstallingUpdates);
- 
-     connect(m_installTrans, &PackageKit::Transaction::statusChanged, this, &PkUpdates::onStatusChanged);
 @@ -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);
diff --git a/plasma-pk-updates.spec b/plasma-pk-updates.spec
index 6cab8af..2cd69ce 100644
--- a/plasma-pk-updates.spec
+++ b/plasma-pk-updates.spec
@@ -1,6 +1,6 @@
 Name:           plasma-pk-updates
 Version:        0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Plasma applet for system updates using PackageKit
 
 License:        GPLv2+
@@ -9,6 +9,7 @@ Source0:        https://github.com/caybro/plasma-pk-updates/archive/v%{version}.
 
 # Upstream patches
 Patch00:        0001-allow-installing-untrusted-packages-too.patch
+Patch01:        0002-micro-optimization.patch
 
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qtdeclarative-devel
@@ -34,6 +35,7 @@ Requires:       kf5-filesystem
 %setup -q -n %{name}-%{version}
 
 %patch0 -p1 -b .allow-installing-untrusted-packages-too
+%patch1 -p1 -b .micro-optimization
 
 %build
 mkdir -p %{_target_platform}
@@ -52,6 +54,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %{_datadir}/plasma/plasmoids/org.kde.plasma.pkupdates
 
 %changelog
+* Mon Mar 23 2015 Jan Grulich <jgrulich at redhat.com> - 0.1-3
+- backport minor fixes from upstream
+
 * Mon Mar 23 2015 Jan Grulich <jgrulich at redhat.com> - 0.1-2
 - fix URL
 


More information about the scm-commits mailing list