pool/PackageKit
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 422076 from GNOME:Factory

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/422076
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/PackageKit?expand=0&rev=154
This commit is contained in:
Dominique Leuenberger 2016-08-28 10:16:59 +00:00 committed by Git OBS Bridge
commit 99eacd4193
4 changed files with 18 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
PackageKit-1.0.1-fix-bashisms.patch
View File

@ -1,29 +0,0 @@
diff -Ndur PackageKit-1.0.1/backends/test/helpers/search-name.sh PackageKit-1.0.1-fix-bashisms/backends/test/helpers/search-name.sh
--- PackageKit-1.0.1/backends/test/helpers/search-name.sh 2014-09-09 19:45:45.000000000 +0300
+++ PackageKit-1.0.1-fix-bashisms/backends/test/helpers/search-name.sh 2014-11-16 23:31:29.322207783 +0200
@@ -9,17 +9,16 @@
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-echo -e "no-percentage-updates"
+echo "no-percentage-updates"
sleep 1
-echo -e "percentage\t10"
-echo -e "status\tquery"
+echo "percentage 10"
+echo "status query"
sleep 1
-echo -e "percentage\t30"
-echo -e "package\tavailable\tglib2;2.14.0;i386;fedora\tThe GLib library"
+echo "percentage 30"
+echo "package available glib2;2.14.0;i386;fedora The GLib library"
sleep 1
-echo -e "percentage\t70"
-echo -e "package\tinstalled\tgtk2;gtk2-2.11.6-6.fc8;i386;fedora\tGTK+ Libraries for GIMP"
+echo "percentage 70"
+echo "package installed gtk2;gtk2-2.11.6-6.fc8;i386;fedora GTK+ Libraries for GIMP"
sleep 1
-echo -e "percentage\t100"
+echo "percentage 100"
exit 0
-

14
PackageKit-fix-offline-trigger.patch
View File

@ -1,14 +0,0 @@
Index: PackageKit-1.0.10/lib/packagekit-glib2/pk-offline.c
===================================================================
--- PackageKit-1.0.10.orig/lib/packagekit-glib2/pk-offline.c
+++ PackageKit-1.0.10/lib/packagekit-glib2/pk-offline.c
@@ -238,8 +238,7 @@ pk_offline_get_action (GError **error)
g_return_val_if_fail (error == NULL || *error == NULL, PK_OFFLINE_ACTION_UNKNOWN);
/* is the trigger set? */
- if (!g_file_test (PK_OFFLINE_TRIGGER_FILENAME, G_FILE_TEST_EXISTS) ||
- !g_file_test (PK_OFFLINE_ACTION_FILENAME, G_FILE_TEST_EXISTS))
+ if (!g_file_test (PK_OFFLINE_ACTION_FILENAME, G_FILE_TEST_EXISTS))
return PK_OFFLINE_ACTION_UNSET;
/* read data file */

17
PackageKit.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Thu Aug 25 11:17:18 UTC 2016 - dimstar@opensuse.org
- Drop PackageKit-1.0.1-fix-bashisms.patch: this patch has been
submitted upstream for discussion (gh#hughsie/PackageKit#162). If
accepted, we'll inherit with a future update, if declined, it is
not important enough to carry around. The code it touches is only
used by the internal test suite.
-------------------------------------------------------------------
Thu Aug 25 10:30:17 UTC 2016 - dimstar@opensuse.org
- Drop PackageKit-fix-offline-trigger.patch: in line with upstreams
expectation we package /var/cache/PackageKit. With this present
the symlink produced for offline update can correctly symlink
to an existing directory.
-------------------------------------------------------------------
Fri Aug 12 11:31:11 UTC 2016 - zaitor@opensuse.org

6
PackageKit.spec
View File

@ -34,9 +34,6 @@ Source99: PackageKit.keyring
Patch1: 0001-Change-the-configuration-of-the-cron-script-to-a-sys.patch
# PATCH-FIX-UPSTREAM PackageKit-dbus-location.patch bnc#829944 dimstar@opensuse.org -- Look for dbus socket in /run instead of /var/run. Sent to upstream.
Patch3: PackageKit-dbus-location.patch
Patch4: PackageKit-1.0.1-fix-bashisms.patch
# PATCH-FIX-UPSTREAM PackageKit-fix-offline-trigger.patch boo#954125 dimstar@opensuse.org -- Fix the PK trigger detection; if not done properly, PK might believe that something else triggered the system update and expects something else to handle the update
Patch5: PackageKit-fix-offline-trigger.patch
# PATCH-FIX-UPSTREAM PackageKit-avoid-endless-loop-on-autoupdate.patch zaitor@opensuse.org -- Avoid a endless loop on autoupdates.
Patch6: PackageKit-avoid-endless-loop-on-autoupdate.patch
# PATCH-FIX-UPSTREAM PackageKit-annotate-dbus-interface.patch gh#hughsie/PackageKit#147 dimstar@opensuse.org -- Annotate new DBus interface, which is too complex for Qt
@ -228,8 +225,6 @@ This package provides the upstream default configuration for PackageKit.
%setup -q
%patch1 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
@ -365,6 +360,7 @@ fi
%{_datadir}/polkit-1/actions/org.freedesktop.packagekit.policy
%{_datadir}/polkit-1/rules.d/org.freedesktop.packagekit.rules
%{_datadir}/dbus-1/system-services/*
%dir %{_localstatedir}/cache/%{name}
%{_unitdir}/packagekit.service
%{_sbindir}/rcpackagekit
%{_mandir}/man?/*.*