commit PackageKit for openSUSE:12.3
Hello community,
here is the log from the commit of package PackageKit for openSUSE:12.3 checked
in at 2013-03-01 07:39:32
Comparing /work/SRC/openSUSE:12.3/PackageKit (Old)
and /work/SRC/openSUSE:12.3/.PackageKit.new (New)
Package is PackageKit, Maintainer is gnome-maintain...@suse.de
Changes:
--- /work/SRC/openSUSE:12.3/PackageKit/PackageKit.changes 2013-02-20
09:33:53.0 +0100
+++ /work/SRC/openSUSE:12.3/.PackageKit.new/PackageKit.changes 2013-03-01
07:39:34.0 +0100
@@ -1,0 +2,6 @@
+Thu Feb 28 16:00:49 CET 2013 - m...@suse.de
+
+- Add 0014-Instantiate-PoolStatusSaver-after-pool-is-built-bnc-.patch
+ (bnc#804054)
+
+---
New:
0014-zypp-Instantiate-PoolStatusSaver-after-pool-is-built.patch
Other differences:
--
++ PackageKit.spec ++
--- /var/tmp/diff_new_pack.pt3Wyt/_old 2013-03-01 07:39:35.0 +0100
+++ /var/tmp/diff_new_pack.pt3Wyt/_new 2013-03-01 07:39:35.0 +0100
@@ -59,6 +59,8 @@
Patch14:0013-zypp-remap-PK-provides-into-rpm-provides-as-the-zif-.patch
# PATCH-FIX-UPSTREAM PackageKit-allow-to-disable-systemd-updates.patch
fdo#61103 dims...@opensuse.org -- Fix build with --disable-systemd-updates
Patch15:PackageKit-allow-to-disable-systemd-updates.patch
+# PATCH-FIX-UPSTREAM
0014-zypp-Instantiate-PoolStatusSaver-after-pool-is-built.patch bnc#804054
co...@suse.de
+Patch16:0014-zypp-Instantiate-PoolStatusSaver-after-pool-is-built.patch
# To update this package, please git-format-patch the tag of the
# tarball version (eg: PACKAGEKIT_0_6_19) vs the distro tag (eg:
openSUSE_Factory)
# in https://github.com/openSUSE/PackageKit and keep the patches
@@ -292,6 +294,7 @@
%patch13 -p1
%patch14 -p1
%patch15 -p1
+%patch16 -p1
translation-update-upstream
%build
++ 0014-zypp-Instantiate-PoolStatusSaver-after-pool-is-built.patch ++
From e81a7af4d48348f00c40532c23a097533795c1b6 Mon Sep 17 00:00:00 2001
From: Michael Andres m...@suse.de
Date: Thu, 28 Feb 2013 15:01:20 +0100
Subject: [PATCH] zypp: Instantiate PoolStatusSaver after pool is built
(bnc#804054)
---
backends/zypp/pk-backend-zypp.cpp | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
Index: PackageKit-0.8.7/backends/zypp/pk-backend-zypp.cpp
===
--- PackageKit-0.8.7.orig/backends/zypp/pk-backend-zypp.cpp
+++ PackageKit-0.8.7/backends/zypp/pk-backend-zypp.cpp
@@ -120,8 +120,12 @@ enum PkgSearchType {
SEARCH_TYPE_RESOLVE = 3
};
-// helper function to restore the pool status
-// after doing operations on it
+/// \class PoolStatusSaver
+/// \brief Helper to restore the pool status after doing operations on it.
+///
+/// \note It's important that a PoolStatusSaver is instantiated \b after
+/// the pool is built/refreshed. Otherwise you lose all the locks applied
+/// during refresh. (bnc#804054)
class PoolStatusSaver : private base::NonCopyable
{
public:
@@ -1732,8 +1736,8 @@ backend_get_requires_thread (PkBackendJo
pk_backend_job_set_percentage (job, 10);
- PoolStatusSaver saver;
ResPool pool = zypp_build_pool (zypp, true);
+ PoolStatusSaver saver;
for (uint i = 0; package_ids[i]; i++) {
sat::Solvable solvable = zypp_get_package_by_id
(package_ids[i]);
@@ -2463,7 +2467,6 @@ static void
backend_install_packages_thread (PkBackendJob *job, GVariant *params, gpointer
user_data)
{
MIL endl;
- PoolStatusSaver saver;
PkBitfield transaction_flags = 0;
gchar **package_ids;
@@ -2491,6 +2494,7 @@ backend_install_packages_thread (PkBacke
try
{
ResPool pool = zypp_build_pool (zypp, TRUE);
+ PoolStatusSaver saver;
pk_backend_job_set_percentage (job, 10);
vectorPoolItem *items = new vectorPoolItem ();
@@ -2581,7 +2585,6 @@ static void
backend_remove_packages_thread (PkBackendJob *job, GVariant *params, gpointer
user_data)
{
MIL endl;
- PoolStatusSaver saver;
PkBitfield transaction_flags = 0;
gboolean autoremove = false;
gboolean allow_deps = false;
@@ -2613,6 +2616,7 @@ backend_remove_packages_thread (PkBacken
target-load ();
pk_backend_job_set_percentage (job, 10);
+ PoolStatusSaver saver;
for (guint i = 0; package_ids[i]; i++) {
sat::Solvable solvable = zypp_get_package_by_id
(package_ids[i]);
@@ -3137,8 +3141,6 @@ static void
backend_update_packages_thread (PkBackendJob *job, GVariant *params, gpointer
user_data)
{
MIL endl;
- PoolStatusSaver saver;
-
commit PackageKit for openSUSE:12.3
Hello community,
here is the log from the commit of package PackageKit for openSUSE:12.3 checked
in at 2013-02-20 09:33:52
Comparing /work/SRC/openSUSE:12.3/PackageKit (Old)
and /work/SRC/openSUSE:12.3/.PackageKit.new (New)
Package is PackageKit, Maintainer is gnome-maintain...@suse.de
Changes:
--- /work/SRC/openSUSE:12.3/PackageKit/PackageKit.changes 2013-02-14
21:29:28.0 +0100
+++ /work/SRC/openSUSE:12.3/.PackageKit.new/PackageKit.changes 2013-02-20
09:33:53.0 +0100
@@ -1,0 +2,16 @@
+Tue Feb 19 08:01:34 UTC 2013 - dims...@opensuse.org
+
+- Add PackageKit-allow-to-disable-systemd-updates.patch: Disabling
+ systemd-updates has the effect that HAVE_SYSTEMD is completely
+ ignored, causing build failures.
+- Introduce with_systemd_updates (currently set to 0) to have an
+ easy way enabling/disabling systemd offline updates. For openSUSE
+ 12.3 this is not fully ready, and instead of the UI offering it
+ and having any kind of side effect, we for now decide to disable
+ it. The defines conditionally does:
+ + Pass --disable-systemd-updates to configure
+ + Add a section to the %post scripts, removing remnant files if
+left there.
+ + Adjust the files section.
+
+---
New:
PackageKit-allow-to-disable-systemd-updates.patch
Other differences:
--
++ PackageKit.spec ++
--- /var/tmp/diff_new_pack.RyDlKR/_old 2013-02-20 09:33:54.0 +0100
+++ /var/tmp/diff_new_pack.RyDlKR/_new 2013-02-20 09:33:54.0 +0100
@@ -18,6 +18,7 @@
# $ pkcon search file /usr/bin/anjuta
%define BUILD_CNF 1
+%define with_offline_updates 0
Name: PackageKit
Version:0.8.7
@@ -56,6 +57,8 @@
Patch13:0012-zypp-less-debug-in-progress-functions.patch
# PATCH-FIX-UPSTREAM
0013-zypp-remap-PK-provides-into-rpm-provides-as-the-zif-.patch co...@suse.de
-- search in ppds
Patch14:0013-zypp-remap-PK-provides-into-rpm-provides-as-the-zif-.patch
+# PATCH-FIX-UPSTREAM PackageKit-allow-to-disable-systemd-updates.patch
fdo#61103 dims...@opensuse.org -- Fix build with --disable-systemd-updates
+Patch15:PackageKit-allow-to-disable-systemd-updates.patch
# To update this package, please git-format-patch the tag of the
# tarball version (eg: PACKAGEKIT_0_6_19) vs the distro tag (eg:
openSUSE_Factory)
# in https://github.com/openSUSE/PackageKit and keep the patches
@@ -288,6 +291,7 @@
%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
translation-update-upstream
%build
@@ -305,6 +309,12 @@
%else
--enable-command-not-found \
%endif
+--enable-systemd \
+%if %{with_offline_updates}
+--enable-systemd-updates \
+%else
+--disable-systemd-updates \
+%endif
%{nil}
make %{?_smp_mflags} V=1
@@ -325,20 +335,35 @@
%find_lang %{name} %{?no_lang_C}
%fdupes $RPM_BUILD_ROOT
+%if %{with_offline_updates}
%pre
%service_add_pre packagekit-offline-update.service
+%endif
%post
%{fillup_only -n packagekit-background}
%mime_database_post
+%if %{with_offline_updates}
%service_add_post packagekit-offline-update.service
+%else
+ if [ -L system-update ]; then
+rm system-update
+ fi
+ if [ -f var/lib/PackageKit/prepared-update ]; then
+rm var/lib/PackageKit/prepared-update
+ fi
+%endif
+%if %{with_offline_updates}
%preun
%service_del_preun packagekit-offline-update.service
+%endif
%postun
%mime_database_postun
+%if %{with_offline_updates}
%service_del_postun packagekit-offline-update.service
+%endif
%post gstreamer-plugin
update-alternatives --install %{_libexecdir}/gst-install-plugins-helper
gst-install-plugins-helper %{_libexecdir}/pk-gstreamer-install 10
@@ -403,9 +428,6 @@
%{_libdir}/packagekit-plugins/libpk_plugin-systemd-updates.so
%{_libdir}/packagekit-plugins/libpk_plugin-update-package-cache.so
%{_libexecdir}/packagekitd
-%{_libexecdir}/pk-clear-offline-update
-%{_libexecdir}/pk-offline-update
-%{_libexecdir}/pk-trigger-offline-update
%{_libexecdir}/pm-utils/sleep.d/95packagekit
%if %BUILD_CNF
%{_libexecdir}/pk-command-not-found
@@ -421,7 +443,12 @@
%{_datadir}/dbus-1/system-services/*
%doc %{_mandir}/man?/*.*
%verify(not md5 size mtime) %{_localstatedir}/lib/PackageKit/transactions.db
+%if %{with_offline_updates}
+%{_libexecdir}/pk-clear-offline-update
+%{_libexecdir}/pk-offline-update
+%{_libexecdir}/pk-trigger-offline-update
%{_unitdir}/packagekit-offline-update.service
+%endif
%files backend-zypp
%defattr(-,root,root)
++ PackageKit-allow-to-disable-systemd-updates.patch ++
Index: PackageKit-0.8.7/configure.ac
===
--- PackageKit-0.8.7.orig/configure.ac
+++
commit PackageKit for openSUSE:12.3
Hello community,
here is the log from the commit of package PackageKit for openSUSE:12.3 checked
in at 2013-02-14 21:29:22
Comparing /work/SRC/openSUSE:12.3/PackageKit (Old)
and /work/SRC/openSUSE:12.3/.PackageKit.new (New)
Package is PackageKit, Maintainer is gnome-maintain...@suse.de
Changes:
--- /work/SRC/openSUSE:12.3/PackageKit/PackageKit.changes 2013-02-05
15:37:10.0 +0100
+++ /work/SRC/openSUSE:12.3/.PackageKit.new/PackageKit.changes 2013-02-14
21:29:28.0 +0100
@@ -1,0 +2,6 @@
+Mon Feb 11 18:37:26 UTC 2013 - co...@suse.com
+
+- Add one more patch from git (bnc#735864):
+ + 0013-zypp-remap-PK-provides-into-rpm-provides-as-the-zif-.patch
+
+---
New:
0013-zypp-remap-PK-provides-into-rpm-provides-as-the-zif-.patch
Other differences:
--
++ PackageKit.spec ++
--- /var/tmp/diff_new_pack.zkWaJd/_old 2013-02-14 21:29:28.0 +0100
+++ /var/tmp/diff_new_pack.zkWaJd/_new 2013-02-14 21:29:28.0 +0100
@@ -54,6 +54,8 @@
Patch12:0011-zypp-Fix-compile-with-__attribute__-gnu_printf.patch
# PATCH-FIX-UPSTREAM 0012-zypp-less-debug-in-progress-functions.patch
co...@suse.de -- less debug
Patch13:0012-zypp-less-debug-in-progress-functions.patch
+# PATCH-FIX-UPSTREAM
0013-zypp-remap-PK-provides-into-rpm-provides-as-the-zif-.patch co...@suse.de
-- search in ppds
+Patch14:0013-zypp-remap-PK-provides-into-rpm-provides-as-the-zif-.patch
# To update this package, please git-format-patch the tag of the
# tarball version (eg: PACKAGEKIT_0_6_19) vs the distro tag (eg:
openSUSE_Factory)
# in https://github.com/openSUSE/PackageKit and keep the patches
@@ -285,6 +287,7 @@
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
translation-update-upstream
%build
++ 0013-zypp-remap-PK-provides-into-rpm-provides-as-the-zif-.patch ++
From cc89ed2698fd21245d955e722fdd2509f857b355 Mon Sep 17 00:00:00 2001
From: Stephan Kulow co...@suse.de
Date: Mon, 11 Feb 2013 19:07:53 +0100
Subject: [PATCH] zypp: remap PK provides into rpm provides as the zif backend
does
---
backends/zypp/pk-backend-zypp.cpp | 97 ++-
1 file changed, 85 insertions(+), 12 deletions(-)
diff --git a/backends/zypp/pk-backend-zypp.cpp
b/backends/zypp/pk-backend-zypp.cpp
index f492a1c..6df4067 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -3314,6 +3314,73 @@ pk_backend_repo_set_data (PkBackend *backend,
PkBackendJob *job, const gchar *re
pk_backend_job_thread_create (job, backend_repo_set_data_thread, NULL,
NULL);
}
+/**
+ * pk_backend_what_provides_decompose: maps enums to provides
+ */
+static gchar **
+pk_backend_what_provides_decompose (PkBackendJob *job,
+ PkProvidesEnum provides,
+ gchar **values)
+{
+ guint i;
+ guint len;
+ gchar **search = NULL;
+ GPtrArray *array = NULL;
+
+ /* iter on each provide string, and wrap it with the fedora prefix -
unless different to openSUSE */
+ len = g_strv_length (values);
+ array = g_ptr_array_new_with_free_func (g_free);
+ for (i=0; ilen; i++) {
+ MIL provides values[i] endl;
+ /* compatibility with previous versions of GPK */
+ if (g_str_has_prefix (values[i], gstreamer0.10() ||
+ g_str_has_prefix (values[i], gstreamer1()) {
+ g_ptr_array_add (array, g_strdup (values[i]));
+ } else if (provides == PK_PROVIDES_ENUM_CODEC) {
+ g_ptr_array_add (array, g_strdup_printf
(gstreamer0.10(%s), values[i]));
+ g_ptr_array_add (array, g_strdup_printf
(gstreamer1(%s), values[i]));
+ } else if (provides == PK_PROVIDES_ENUM_FONT) {
+ g_ptr_array_add (array, g_strdup_printf (font(%s),
values[i]));
+ } else if (provides == PK_PROVIDES_ENUM_MIMETYPE) {
+ g_ptr_array_add (array, g_strdup_printf
(mimehandler(%s), values[i]));
+ } else if (provides == PK_PROVIDES_ENUM_POSTSCRIPT_DRIVER) {
+ g_ptr_array_add (array, g_strdup_printf
(postscriptdriver(%s), values[i]));
+ } else if (provides == PK_PROVIDES_ENUM_PLASMA_SERVICE) {
+ /* We need to allow the Plasma version to be specified.
*/
+ if (g_str_has_prefix (values[i], plasma)) {
+ g_ptr_array_add (array, g_strdup (values[i]));
+ } else {
+ /* For compatibility, we default to
commit PackageKit for openSUSE:12.3:Update
Hello community, here is the log from the commit of package PackageKit for openSUSE:12.3:Update checked in at 2013-02-13 13:58:25 Comparing /work/SRC/openSUSE:12.3:Update/PackageKit (Old) and /work/SRC/openSUSE:12.3:Update/.PackageKit.new (New) Package is PackageKit, Maintainer is gnome-maintain...@suse.de Changes: New Changes file: NO CHANGES FILE!!! Other differences: -- ++ _link ++ --- /var/tmp/diff_new_pack.Beyxxh/_old 2013-02-13 13:58:26.0 +0100 +++ /var/tmp/diff_new_pack.Beyxxh/_new 2013-02-13 13:58:26.0 +0100 @@ -1 +1 @@ -link package='PackageKit.1292' cicount='copy' / +link package='PackageKit.1327' cicount='copy' / -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit PackageKit for openSUSE:12.3:Update
Hello community, here is the log from the commit of package PackageKit for openSUSE:12.3:Update checked in at 2013-02-06 15:53:20 Comparing /work/SRC/openSUSE:12.3:Update/PackageKit (Old) and /work/SRC/openSUSE:12.3:Update/.PackageKit.new (New) Package is PackageKit, Maintainer is gnome-maintain...@suse.de Changes: New Changes file: NO CHANGES FILE!!! Other differences: -- ++ _link ++ --- /var/tmp/diff_new_pack.pdLTHj/_old 2013-02-06 15:53:22.0 +0100 +++ /var/tmp/diff_new_pack.pdLTHj/_new 2013-02-06 15:53:22.0 +0100 @@ -1 +1 @@ -link package='PackageKit.1266' cicount='copy' / +link package='PackageKit.1292' cicount='copy' / -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit PackageKit for openSUSE:12.3
Hello community,
here is the log from the commit of package PackageKit for openSUSE:12.3 checked
in at 2013-02-05 15:37:05
Comparing /work/SRC/openSUSE:12.3/PackageKit (Old)
and /work/SRC/openSUSE:12.3/.PackageKit.new (New)
Package is PackageKit, Maintainer is gnome-maintain...@suse.de
Changes:
--- /work/SRC/openSUSE:12.3/PackageKit/PackageKit.changes 2013-01-31
01:11:44.0 +0100
+++ /work/SRC/openSUSE:12.3/.PackageKit.new/PackageKit.changes 2013-02-05
15:37:10.0 +0100
@@ -1,0 +2,7 @@
+Sun Jan 27 07:38:52 UTC 2013 - co...@suse.com
+
+- Add two more patches from git:
+ + 0011-zypp-Fix-compile-with-__attribute__-gnu_printf.patch
+ + 0012-zypp-less-debug-in-progress-functions.patch
+
+---
New:
0011-zypp-Fix-compile-with-__attribute__-gnu_printf.patch
0012-zypp-less-debug-in-progress-functions.patch
Other differences:
--
++ PackageKit.spec ++
--- /var/tmp/diff_new_pack.cwdmc6/_old 2013-02-05 15:37:11.0 +0100
+++ /var/tmp/diff_new_pack.cwdmc6/_new 2013-02-05 15:37:11.0 +0100
@@ -50,6 +50,10 @@
Patch10:0009-zypp-merge-all-backend-code-into-one-file-much-easie.patch
# PATCH-FIX-UPSTREAM
0010-zypp-ignore-system-resolvables-during-install-too.patch co...@suse.de --
avoid useless confirmations 2
Patch11:0010-zypp-ignore-system-resolvables-during-install-too.patch
+# PATCH-FIX-UPSTREAM 0011-zypp-Fix-compile-with-__attribute__-gnu_printf.patch
co...@suse.de -- minor bug fix
+Patch12:0011-zypp-Fix-compile-with-__attribute__-gnu_printf.patch
+# PATCH-FIX-UPSTREAM 0012-zypp-less-debug-in-progress-functions.patch
co...@suse.de -- less debug
+Patch13:0012-zypp-less-debug-in-progress-functions.patch
# To update this package, please git-format-patch the tag of the
# tarball version (eg: PACKAGEKIT_0_6_19) vs the distro tag (eg:
openSUSE_Factory)
# in https://github.com/openSUSE/PackageKit and keep the patches
@@ -279,6 +283,8 @@
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
+%patch13 -p1
translation-update-upstream
%build
++ 0011-zypp-Fix-compile-with-__attribute__-gnu_printf.patch ++
From 303ad61ff5fb25d68da31457dc88c419a7e27155 Mon Sep 17 00:00:00 2001
From: Stephan Kulow co...@suse.de
Date: Tue, 22 Jan 2013 13:00:25 +0100
Subject: [PATCH 06/12] zypp: Fix compile with __attribute__ gnu_printf
---
backends/zypp/pk-backend-zypp.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backends/zypp/pk-backend-zypp.cpp
b/backends/zypp/pk-backend-zypp.cpp
index 0d8f51a..0f32c18 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -680,7 +680,7 @@ zypp_is_valid_repo (PkBackendJob *job, RepoInfo repo)
{
if (repo.alias().empty()){
- pk_backend_job_error_code (job,
PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR, Repository has no or invalid repo name
defined.\n, repo.alias ().c_str ());
+ pk_backend_job_error_code (job,
PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR, %s: Repository has no or invalid repo
name defined.\n, repo.alias ().c_str ());
return FALSE;
}
--
1.8.1.1
++ 0012-zypp-less-debug-in-progress-functions.patch ++
From 90864427d3384363d82813cf5b69a4f74f4330f4 Mon Sep 17 00:00:00 2001
From: Stephan Kulow co...@suse.de
Date: Sun, 27 Jan 2013 08:34:46 +0100
Subject: [PATCH 12/12] zypp: less debug in progress functions
Also remove the hacks trying to work around progress bugs - we need to
fix that in rpm/zypp and don't try to hide it, creating new bugs
---
backends/zypp/pk-backend-zypp.cpp | 23 +--
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/backends/zypp/pk-backend-zypp.cpp
b/backends/zypp/pk-backend-zypp.cpp
index 0f32c18..f492a1c 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -205,8 +205,8 @@ public:
// fact that libzypp may skip over a divisible by ten
// value (i.e., 28, 29, 31, 32).
- MIL percentage _sub_percentage std::endl;
- if (percentage = _sub_percentage)
+ //MIL percentage _sub_percentage std::endl;
+ if (percentage == _sub_percentage)
return;
if (!_package_id) {
@@ -236,8 +236,6 @@ protected:
struct InstallResolvableReportReceiver : public
zypp::callback::ReceiveReportzypp::target::rpm::InstallResolvableReport,
ZyppBackendReceiver
{
zypp::Resolvable::constPtr _resolvable;
- bool preparing;
- int last_value;
virtual void start (zypp::Resolvable::constPtr resolvable) {
