From ba1a8cadcdeed38e115a4c5243d6cae338d3f11f Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 20 Apr 2014 01:00:38 +0200 Subject: [PATCH 01/10] update to 0.8.2 * Sat Apr 19 2014 Kevin Kofler 0.8.2-1 - update to 0.8.2 - drop upstreamed apper-updater-l10n.patch - update file list for the new apper.appdata.xml --- .gitignore | 1 + apper-updater-l10n.patch | 21 --------------------- apper.spec | 14 +++++++++----- sources | 2 +- 4 files changed, 11 insertions(+), 27 deletions(-) delete mode 100644 apper-updater-l10n.patch diff --git a/.gitignore b/.gitignore index 899e305..4e0924c 100644 --- a/.gitignore +++ b/.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 diff --git a/apper-updater-l10n.patch b/apper-updater-l10n.patch deleted file mode 100644 index 3eb96b4..0000000 --- a/apper-updater-l10n.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 5abe135b5907ab10ed52be0046a3de0d52d98f22 -Author: Lukáš Tinkl -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 - #include - -+static const KCatalogLoader loader(QLatin1String("apper")); -+ - void QmlPlugins::registerTypes(const char* uri) - { - Q_ASSERT(uri == QLatin1String("org.kde.apper")); diff --git a/apper.spec b/apper.spec index 5156688..ae0bc53 100644 --- a/apper.spec +++ b/apper.spec @@ -4,8 +4,8 @@ #define app_install 1 Name: apper -Version: 0.8.1 -Release: 2%{?dist} +Version: 0.8.2 +Release: 1%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -27,8 +27,6 @@ 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 @@ -74,7 +72,6 @@ git am -p1 %{patches} < /dev/null %else %patch200 -p1 -b .pk_cache_update %endif -%patch201 -p1 -b .applet-l10n %build mkdir -p %{_target_platform} @@ -127,6 +124,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 +150,11 @@ fi %changelog +* Sat Apr 19 2014 Kevin Kofler 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 0.8.1-2 - fix translations in the updater applet diff --git a/sources b/sources index 07db0ea..a4f85e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53dc89d5a2e95c3382c3f223a2ac8b17 apper-0.8.1.tar.bz2 +bac09cf96295623908c1a080152113ad apper-0.8.2.tar.xz From 83b9c9bb2fff11ccdee0313782af9d827e5e8c85 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 20 Apr 2014 01:02:18 +0200 Subject: [PATCH 02/10] fix/update tarball extension (now .tar.xz instead of .tar.bz2) --- apper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index ae0bc53..ded7a98 100644 --- a/apper.spec +++ b/apper.spec @@ -13,7 +13,7 @@ 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 From a84cb47c1cacf18bda6af8cc2d1da200da98a5a4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 5 Nov 2014 08:37:58 -0600 Subject: [PATCH 03/10] drop git_patches hack can use %%autosetup later if we so choose instead --- apper.spec | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/apper.spec b/apper.spec index ded7a98..e048f74 100644 --- a/apper.spec +++ b/apper.spec @@ -21,10 +21,6 @@ URL: http://kde-apps.org/content/show.php/Apper?content=84745 Source10: 01-fedora-org.packagekit.updater.js ## 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 @@ -58,20 +54,7 @@ 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 %patch200 -p1 -b .pk_cache_update -%endif %build mkdir -p %{_target_platform} From eadfdfae54ac7f694b5081355173137623cbf621 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 5 Nov 2014 10:07:55 -0600 Subject: [PATCH 04/10] avoid notification spam (kde#318864,#1090595) --- apper-0.8.2-kde318864.patch | 18 ++++++++++++++++++ apper.spec | 13 ++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 apper-0.8.2-kde318864.patch diff --git a/apper-0.8.2-kde318864.patch b/apper-0.8.2-kde318864.patch new file mode 100644 index 0000000..ca68db5 --- /dev/null +++ b/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))); diff --git a/apper.spec b/apper.spec index e048f74..b8db43a 100644 --- a/apper.spec +++ b/apper.spec @@ -5,7 +5,7 @@ Name: apper Version: 0.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -20,6 +20,13 @@ 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 + ## upstream patches # hack around https://bugzilla.redhat.com/948099 Patch200: 0100-pk-cache-update-debugging.patch @@ -54,6 +61,7 @@ KDE interface for PackageKit. %prep %setup -q +%patch50 -p1 -b .kde318864 %patch200 -p1 -b .pk_cache_update %build @@ -133,6 +141,9 @@ fi %changelog +* Wed Nov 05 2014 Rex Dieter 0.8.2-2 +- avoid notification spam (kde#318864,#1090595) + * Sat Apr 19 2014 Kevin Kofler 0.8.2-1 - update to 0.8.2 - drop upstreamed apper-updater-l10n.patch From 92a8733718d640a2d0d5a7902381500c756dab65 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 6 Dec 2014 13:24:23 -0600 Subject: [PATCH 05/10] don't try !allow_deps, -yum,-hif backends do not support it apparently (#877038,kde#315063) --- apper-0.8.2-allow_deps.patch | 12 ++++++++++++ apper.spec | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 apper-0.8.2-allow_deps.patch diff --git a/apper-0.8.2-allow_deps.patch b/apper-0.8.2-allow_deps.patch new file mode 100644 index 0000000..34b90e4 --- /dev/null +++ b/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; + diff --git a/apper.spec b/apper.spec index b8db43a..54be9ec 100644 --- a/apper.spec +++ b/apper.spec @@ -5,7 +5,7 @@ Name: apper Version: 0.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -26,6 +26,10 @@ Source10: 01-fedora-org.packagekit.updater.js # 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 # hack around https://bugzilla.redhat.com/948099 @@ -62,6 +66,7 @@ KDE interface for PackageKit. %setup -q %patch50 -p1 -b .kde318864 +%patch51 -p1 -b .allow_deps %patch200 -p1 -b .pk_cache_update %build @@ -141,6 +146,9 @@ fi %changelog +* Sat Dec 06 2014 Rex Dieter 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 0.8.2-2 - avoid notification spam (kde#318864,#1090595) From 7308dc39051251763ac8f659ffe4aff8060bbb77 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 7 Dec 2015 10:51:40 -0600 Subject: [PATCH 06/10] Revert "don't try !allow_deps, -yum,-hif backends do not support it apparently (#877038,kde#315063)" This reverts commit 92a8733718d640a2d0d5a7902381500c756dab65. --- apper-0.8.2-allow_deps.patch | 12 ------------ apper.spec | 10 +--------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 apper-0.8.2-allow_deps.patch diff --git a/apper-0.8.2-allow_deps.patch b/apper-0.8.2-allow_deps.patch deleted file mode 100644 index 34b90e4..0000000 --- a/apper-0.8.2-allow_deps.patch +++ /dev/null @@ -1,12 +0,0 @@ -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; - diff --git a/apper.spec b/apper.spec index 54be9ec..b8db43a 100644 --- a/apper.spec +++ b/apper.spec @@ -5,7 +5,7 @@ Name: apper Version: 0.8.2 -Release: 3%{?dist} +Release: 2%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -26,10 +26,6 @@ Source10: 01-fedora-org.packagekit.updater.js # 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 # hack around https://bugzilla.redhat.com/948099 @@ -66,7 +62,6 @@ KDE interface for PackageKit. %setup -q %patch50 -p1 -b .kde318864 -%patch51 -p1 -b .allow_deps %patch200 -p1 -b .pk_cache_update %build @@ -146,9 +141,6 @@ fi %changelog -* Sat Dec 06 2014 Rex Dieter 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 0.8.2-2 - avoid notification spam (kde#318864,#1090595) From 2dab8be9a93c1e7398379233b0036007da89d542 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 7 Dec 2015 10:51:40 -0600 Subject: [PATCH 07/10] Revert "avoid notification spam (kde#318864,#1090595)" This reverts commit eadfdfae54ac7f694b5081355173137623cbf621. --- apper-0.8.2-kde318864.patch | 18 ------------------ apper.spec | 13 +------------ 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 apper-0.8.2-kde318864.patch diff --git a/apper-0.8.2-kde318864.patch b/apper-0.8.2-kde318864.patch deleted file mode 100644 index ca68db5..0000000 --- a/apper-0.8.2-kde318864.patch +++ /dev/null @@ -1,18 +0,0 @@ -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))); diff --git a/apper.spec b/apper.spec index b8db43a..e048f74 100644 --- a/apper.spec +++ b/apper.spec @@ -5,7 +5,7 @@ Name: apper Version: 0.8.2 -Release: 2%{?dist} +Release: 1%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -20,13 +20,6 @@ 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 - ## upstream patches # hack around https://bugzilla.redhat.com/948099 Patch200: 0100-pk-cache-update-debugging.patch @@ -61,7 +54,6 @@ KDE interface for PackageKit. %prep %setup -q -%patch50 -p1 -b .kde318864 %patch200 -p1 -b .pk_cache_update %build @@ -141,9 +133,6 @@ fi %changelog -* Wed Nov 05 2014 Rex Dieter 0.8.2-2 -- avoid notification spam (kde#318864,#1090595) - * Sat Apr 19 2014 Kevin Kofler 0.8.2-1 - update to 0.8.2 - drop upstreamed apper-updater-l10n.patch From 10cb81bae320259cb71213e1d039236f08c2f3c7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 7 Dec 2015 10:51:40 -0600 Subject: [PATCH 08/10] Revert "drop git_patches hack" This reverts commit a84cb47c1cacf18bda6af8cc2d1da200da98a5a4. --- apper.spec | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/apper.spec b/apper.spec index e048f74..ded7a98 100644 --- a/apper.spec +++ b/apper.spec @@ -21,6 +21,10 @@ URL: http://kde-apps.org/content/show.php/Apper?content=84745 Source10: 01-fedora-org.packagekit.updater.js ## 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 @@ -54,7 +58,20 @@ 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 %patch200 -p1 -b .pk_cache_update +%endif %build mkdir -p %{_target_platform} From d3872c045f46b93af00b2ea924716cc65fc5a964 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 7 Dec 2015 10:51:40 -0600 Subject: [PATCH 09/10] Revert "fix/update tarball extension (now .tar.xz instead of .tar.bz2)" This reverts commit 83b9c9bb2fff11ccdee0313782af9d827e5e8c85. --- apper.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apper.spec b/apper.spec index ded7a98..ae0bc53 100644 --- a/apper.spec +++ b/apper.spec @@ -13,7 +13,7 @@ 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.xz +Source0: http://download.kde.org/stable/apper/%{version}/apper-%{version}.tar.bz2 %endif URL: http://kde-apps.org/content/show.php/Apper?content=84745 From f5ab5970fb89eadfcd060f9046d0874155d20898 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 7 Dec 2015 10:51:40 -0600 Subject: [PATCH 10/10] Revert "update to 0.8.2" This reverts commit ba1a8cadcdeed38e115a4c5243d6cae338d3f11f. --- .gitignore | 1 - apper-updater-l10n.patch | 21 +++++++++++++++++++++ apper.spec | 14 +++++--------- sources | 2 +- 4 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 apper-updater-l10n.patch diff --git a/.gitignore b/.gitignore index 4e0924c..899e305 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /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 diff --git a/apper-updater-l10n.patch b/apper-updater-l10n.patch new file mode 100644 index 0000000..3eb96b4 --- /dev/null +++ b/apper-updater-l10n.patch @@ -0,0 +1,21 @@ +commit 5abe135b5907ab10ed52be0046a3de0d52d98f22 +Author: Lukáš Tinkl +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 + #include + ++static const KCatalogLoader loader(QLatin1String("apper")); ++ + void QmlPlugins::registerTypes(const char* uri) + { + Q_ASSERT(uri == QLatin1String("org.kde.apper")); diff --git a/apper.spec b/apper.spec index ae0bc53..5156688 100644 --- a/apper.spec +++ b/apper.spec @@ -4,8 +4,8 @@ #define app_install 1 Name: apper -Version: 0.8.2 -Release: 1%{?dist} +Version: 0.8.1 +Release: 2%{?dist} Summary: KDE interface for PackageKit License: GPLv2+ @@ -27,6 +27,8 @@ 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 @@ -72,6 +74,7 @@ git am -p1 %{patches} < /dev/null %else %patch200 -p1 -b .pk_cache_update %endif +%patch201 -p1 -b .applet-l10n %build mkdir -p %{_target_platform} @@ -124,8 +127,6 @@ 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 @@ -150,11 +151,6 @@ fi %changelog -* Sat Apr 19 2014 Kevin Kofler 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 0.8.1-2 - fix translations in the updater applet diff --git a/sources b/sources index a4f85e5..07db0ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bac09cf96295623908c1a080152113ad apper-0.8.2.tar.xz +53dc89d5a2e95c3382c3f223a2ac8b17 apper-0.8.1.tar.bz2