don't try !allow_deps, -yum,-hif backends do not support it apparently (#877038,kde#315063)

can use %%autosetup later if we so choose instead

.gitignore

@@ -1,3 +1,4 @@
 /apper-0.7.2.tar.bz2
 /apper-0.8.1-20130624.tar.bz2
 /apper-0.8.1.tar.bz2
+/apper-0.8.2.tar.xz

apper-0.8.2-allow_deps.patch

@@ -0,0 +1,12 @@
+diff -up apper-0.8.2/libapper/PkTransaction.cpp.allow_deps apper-0.8.2/libapper/PkTransaction.cpp
+--- apper-0.8.2/libapper/PkTransaction.cpp.allow_deps	2014-04-19 14:25:19.000000000 -0500
++++ apper-0.8.2/libapper/PkTransaction.cpp	2014-12-06 13:22:34.855124992 -0600
+@@ -166,7 +166,7 @@ void PkTransaction::removePackages(const
+ {
+     if (Daemon::global()->actions() & Transaction::RoleRemovePackages) {
+         d->originalRole = Transaction::RoleRemovePackages;
+-        d->allowDeps = false; // Default to avoid dependencies removal unless simulate says so
++        d->allowDeps = true; // Default to avoid dependencies removal unless simulate says so
+         d->packages = packages;
+         d->flags = Transaction::TransactionFlagOnlyTrusted | Transaction::TransactionFlagSimulate;
+ 

apper-0.8.2-kde318864.patch

@@ -0,0 +1,18 @@
+diff -up apper-0.8.2/apperd/TransactionWatcher.cpp.kde318864 apper-0.8.2/apperd/TransactionWatcher.cpp
+--- apper-0.8.2/apperd/TransactionWatcher.cpp.kde318864	2014-04-19 14:25:19.000000000 -0500
++++ apper-0.8.2/apperd/TransactionWatcher.cpp	2014-11-05 08:42:19.418370932 -0600
+@@ -199,7 +199,13 @@ void TransactionWatcher::transactionChan
+     }
+ 
+     // If the
+-    if (!m_transactionJob.contains(tid) && interactive) {
++    Transaction::Role role = transaction->role();
++    if (!m_transactionJob.contains(tid) && interactive &&
++        (role == Transaction::RoleInstallPackages ||
++         role == Transaction::RoleInstallFiles ||
++         role == Transaction::RoleRemovePackages ||
++         role == Transaction::RoleUpdatePackages ||
++         role == Transaction::RoleUpgradeSystem )) {
+         TransactionJob *job = new TransactionJob(transaction, this);
+         connect(transaction, SIGNAL(errorCode(PackageKit::Transaction::Error,QString)),
+                 this, SLOT(errorCode(PackageKit::Transaction::Error,QString)));

apper-updater-l10n.patch

@@ -1,21 +0,0 @@
-commit 5abe135b5907ab10ed52be0046a3de0d52d98f22
-Author: Lukáš Tinkl <lukas@kde.org>
-Date:   Fri Aug 23 19:35:56 2013 +0200
-
-    load the main apper catalog for the applet
-    
-    for a 3rd time, make this thing show up translated...
-
-diff --git a/declarative-plugins/qmlplugins.cpp b/declarative-plugins/qmlplugins.cpp
-index 9deb29f..b39b3d2 100644
---- a/declarative-plugins/qmlplugins.cpp
-+++ b/declarative-plugins/qmlplugins.cpp
-@@ -35,6 +35,8 @@
- #include <Daemon>
- #include <QDeclarativeEngine>
- 
-+static const KCatalogLoader loader(QLatin1String("apper"));
-+
- void QmlPlugins::registerTypes(const char* uri)
- {
-     Q_ASSERT(uri == QLatin1String("org.kde.apper"));

apper.spec

@@ -4,8 +4,8 @@
 #define app_install 1
 
 Name:    apper
-Version: 0.8.1
-Release: 2%{?dist}
+Version: 0.8.2
+Release: 3%{?dist}
 Summary: KDE interface for PackageKit
 
 License: GPLv2+
@@ -13,22 +13,27 @@ License: GPLv2+
 # use releaseme/apper.rc --version 0.8.1
 Source0: apper-%{version}-%{snap}.tar.bz2
 %else
-Source0: http://download.kde.org/stable/apper/%{version}/apper-%{version}.tar.bz2
+Source0: http://download.kde.org/stable/apper/%{version}/apper-%{version}.tar.xz
 %endif
 URL:     http://kde-apps.org/content/show.php/Apper?content=84745
 
 # plasma js to enable apper plasma applet
 Source10: 01-fedora-org.packagekit.updater.js
 
+## upstreamable patches 
+# This one is already essentially in apper/master branch
+# https://git.reviewboard.kde.org/r/117990
+# http://bugs.kde.org/show_bug.cgi?id=318864
+# http://bugzilla.redhat.com/1090595
+Patch50: apper-0.8.2-kde318864.patch
+# -hif (and yum?) backends apparently do not support !allow_deps at all, so don't try
+# https://bugzilla.redhat.com/show_bug.cgi?id=877038
+# http://bugs.kde.org/show_bug.cgi?id=315063
+Patch51: apper-0.8.2-allow_deps.patch
+
 ## upstream patches
-#define git_patches 1
-%if 0%{?git_patches}
-BuildRequires: git-core
-%endif
 # hack around https://bugzilla.redhat.com/948099
 Patch200: 0100-pk-cache-update-debugging.patch
-# fix translations in the updater applet
-Patch201: apper-updater-l10n.patch
 
 
 Obsoletes: kpackagekit < 0.7.0
@@ -60,21 +65,9 @@ KDE interface for PackageKit.
 %prep
 %setup -q 
 
-%if 0%{?git_patches}
-git init
-if [ -z "$GIT_COMMITTER_NAME" ]; then
-git config user.email "kde@lists.fedoraproject.org"
-git config user.name "Fedora KDE SIG"
-fi
-git add .
-git commit -a -q -m "%{version} baseline."
-
-# Apply all the patches
-git am -p1 %{patches} < /dev/null
-%else
+%patch50 -p1 -b .kde318864
+%patch51 -p1 -b .allow_deps
 %patch200 -p1 -b .pk_cache_update
-%endif
-%patch201 -p1 -b .applet-l10n
 
 %build
 mkdir -p %{_target_platform}
@@ -127,6 +120,8 @@ fi
 %{_kde4_libdir}/apper/
 %{_kde4_libdir}/kde4/kcm_apper.so
 %{_kde4_libdir}/kde4/kded_apperd.so
+# (co)own the whole directory for now, nothing systemwide owns this in F19/F20
+%{_kde4_datadir}/appdata/
 %{_kde4_datadir}/applications/kde4/apper.desktop
 %{_kde4_datadir}/applications/kde4/apper_*.desktop
 %{_kde4_datadir}/kde4/services/kcm_apper.desktop
@@ -151,6 +146,17 @@ fi
 
 
 %changelog
+* Sat Dec 06 2014 Rex Dieter <rdieter@fedoraproject.org> 0.8.2-3
+- don't try !allow_deps, -yum,-hif backends do not support it apparently (#877038,kde#315063)
+
+* Wed Nov 05 2014 Rex Dieter <rdieter@fedoraproject.org> 0.8.2-2
+- avoid notification spam (kde#318864,#1090595)
+
+* Sat Apr 19 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 0.8.2-1
+- update to 0.8.2
+- drop upstreamed apper-updater-l10n.patch
+- update file list for the new apper.appdata.xml
+
 * Mon Aug 26 2013 Lukáš Tinkl <ltinkl@redhat.com> 0.8.1-2
 - fix translations in the updater applet
 

sources

@@ -1 +1 @@
-53dc89d5a2e95c3382c3f223a2ac8b17  apper-0.8.1.tar.bz2
+bac09cf96295623908c1a080152113ad  apper-0.8.2.tar.xz