Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at 2012-10-04 18:41:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit (Old) and /work/SRC/openSUSE:Factory/.PackageKit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PackageKit", Maintainer is "gnome-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit/PackageKit.changes 2012-09-11 17:17:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.PackageKit.new/PackageKit.changes 2012-10-04 18:41:22.000000000 +0200 @@ -1,0 +2,25 @@ +Mon Sep 24 21:29:57 UTC 2012 - dims...@opensuse.org + +- Add PackageKit-gstreamer-1.0.patch: Add GStreamer 1.0 support to + the PackageKit plugin. + +------------------------------------------------------------------- +Mon Sep 24 02:47:55 UTC 2012 - g...@suse.com + +- Add PackageKit-bnc780058-zypp-backend-match-patches.patch to + prevent the internal error (bnc#780058) + +------------------------------------------------------------------- +Tue Sep 11 20:43:33 UTC 2012 - vu...@opensuse.org + +- Change license tags to be per package: + + GPL-2.0+: PackageKit, backend-zypp, + typelib-1_0-PackageKitPlugin-1_0, browser-plugin, + gstreamer-plugin, gtk3-module, devel, branding-upstream. + + LGPL-2.1+: libpackagekit-glib2-14, + typelib-1_0-PackageKitGlib-1_0, libpackagekit-glib2-devel, + libpackagekit-qt2-2, libpackagekit-qt2-devel. +- This is clearer than using "GPL-2.0+ and LGPL-2.1+" for + everything. + +------------------------------------------------------------------- New: ---- PackageKit-bnc780058-zypp-backend-match-patches.patch PackageKit-gstreamer-1.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.mSkGmp/_old 2012-10-04 18:41:23.000000000 +0200 +++ /var/tmp/diff_new_pack.mSkGmp/_new 2012-10-04 18:41:23.000000000 +0200 @@ -37,7 +37,7 @@ Version: 0.7.4 Release: 0 Summary: Simple software installation management software -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ Group: System/Daemons Url: http://packagekit.org/ Source: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz @@ -72,6 +72,10 @@ Patch9: PackageKit-zypp-packagesize.patch # PATCH-FIX-UPSTREAM PackageKit-bnc775651-ignore-accept-eula.patch bnc#775651 fdo#53532 g...@suse.com -- ignore "accept-eula" transactions to avoid crash Patch10: PackageKit-bnc775651-ignore-accept-eula.patch +# PATCH-FIX-UPSTREAM PackageKit-bnc780058-zypp-backend-match-patches.patch bnc#780058 fdo#55267 g...@suse.com -- zypp: match the patch names to prevent the internal error +Patch11: PackageKit-bnc780058-zypp-backend-match-patches.patch +# PATCH-FIX-UPSTREAM PackageKit-gstreamer-1.0.patch dims...@opensuse.org -- Support GStreamer 1.0, taken from upstream git. +Patch12: PackageKit-gstreamer-1.0.patch BuildRequires: NetworkManager-devel BuildRequires: automake BuildRequires: docbook-utils @@ -129,6 +133,7 @@ %package backend-zypp Summary: Simple software installation management software -- Zypp Backend +License: GPL-2.0+ Group: System/Daemons Requires: %{name} = %{version} Provides: %{name}-backend = %{version} @@ -142,6 +147,7 @@ %package -n typelib-1_0-PackageKitPlugin-1_0 Summary: Simple software installation management software -- Plugin library, Introspection bindings +License: GPL-2.0+ Group: System/Libraries %description -n typelib-1_0-PackageKitPlugin-1_0 @@ -156,6 +162,7 @@ %package browser-plugin Summary: Simple software installation management software +License: GPL-2.0+ Group: Productivity/Networking/Web/Browsers Recommends: %{name} = %{version} Supplements: packageand(%{name}:MozillaFirefox) @@ -170,6 +177,7 @@ %package gstreamer-plugin Summary: Simple software installation management software +License: GPL-2.0+ Group: Productivity/Multimedia/Other Requires(post): update-alternatives Requires(postun): update-alternatives @@ -189,6 +197,7 @@ %package gtk3-module Summary: Simple software installation management software +License: GPL-2.0+ Group: System/Libraries Recommends: %{name} = %{version} Supplements: packageand(%{name}:gtk3) @@ -203,6 +212,7 @@ %package devel Summary: Needed include files and libraries for development +License: GPL-2.0+ Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: libpackagekit-glib2-devel @@ -215,6 +225,7 @@ %package -n libpackagekit-glib2-14 Summary: Simple software installation management software +License: LGPL-2.1+ Group: System/Libraries Recommends: %{name} Provides: libpackagekit-glib12 = %{version} @@ -229,6 +240,7 @@ %package -n typelib-1_0-PackageKitGlib-1_0 Summary: Simple software installation management software -- Introspection bindings +License: LGPL-2.1+ Group: System/Libraries %description -n typelib-1_0-PackageKitGlib-1_0 @@ -243,6 +255,7 @@ %package -n libpackagekit-glib2-devel Summary: Simple software installation management software +License: LGPL-2.1+ Group: Development/Libraries/GNOME Requires: libpackagekit-glib2-14 = %{version} Requires: typelib-1_0-PackageKitGlib-1_0 = %{version} @@ -258,6 +271,7 @@ %package -n libpackagekit-qt2-2 Summary: Simple software installation management software +License: LGPL-2.1+ Group: System/Libraries Recommends: %{name} @@ -270,6 +284,7 @@ %package -n libpackagekit-qt2-devel Summary: Simple software installation management software +License: LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: libpackagekit-qt2-2 = %{version} @@ -282,6 +297,7 @@ %package branding-upstream Summary: Simple software installation management software -- Upstream default configuration +License: GPL-2.0+ Group: System/Daemons Requires: %{name} = %{version} Provides: %{name}-branding = %{version} @@ -317,6 +333,8 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 %build # Needed due to patch 3 @@ -479,6 +497,7 @@ %files -n libpackagekit-glib2-14 %defattr(-,root,root) +%doc lib/packagekit-glib2/COPYING %{_libdir}/libpackagekit-glib2.so.* %files -n typelib-1_0-PackageKitGlib-1_0 ++++++ PackageKit-bnc780058-zypp-backend-match-patches.patch ++++++ >From 2df6b9bfd00a4188f442683d823fd8afc06aa289 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin <chingp...@gmail.com> Date: Mon, 24 Sep 2012 10:06:09 +0800 Subject: [PATCH] zypp: match the patch name to prevent an internal error https://bugs.freedesktop.org/show_bug.cgi?id=55267 --- backends/zypp/pk-backend-zypp.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index 0a81390..8bfd6e9 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -1688,10 +1688,13 @@ backend_get_files_thread (PkBackendJob *job, GVariant *params, gpointer user_dat vector<sat::Solvable> v; vector<sat::Solvable> v2; + vector<sat::Solvable> v3; zypp_get_packages_by_name (backend, (const gchar *)id_parts[PK_PACKAGE_ID_NAME], ResKind::package, v); zypp_get_packages_by_name (backend, (const gchar *)id_parts[PK_PACKAGE_ID_NAME], ResKind::srcpackage, v2); + zypp_get_packages_by_name (backend, (const gchar *)id_parts[PK_PACKAGE_ID_NAME], ResKind::patch, v3); v.insert (v.end (), v2.begin (), v2.end ()); + v.insert (v.end (), v3.begin (), v3.end ()); sat::Solvable package; for (vector<sat::Solvable>::iterator it = v.begin (); -- 1.7.10.4 ++++++ PackageKit-gstreamer-1.0.patch ++++++ >From 0a1e7cfe43ec19432838867d957ce32efb91020d Mon Sep 17 00:00:00 2001 From: Richard Hughes <rich...@hughsie.com> Date: Fri, 03 Aug 2012 15:04:14 +0000 Subject: Add GStreamer 1.0 support to the PackageKit plugin --- (limited to 'contrib/gstreamer-plugin/pk-gstreamer-install.c') diff --git a/contrib/gstreamer-plugin/pk-gstreamer-install.c b/contrib/gstreamer-plugin/pk-gstreamer-install.c index 5f8bbf5..7e4f1d4 100644 --- a/contrib/gstreamer-plugin/pk-gstreamer-install.c +++ b/contrib/gstreamer-plugin/pk-gstreamer-install.c @@ -31,6 +31,7 @@ typedef struct { gchar *type_name; gchar *codec_name; gchar *app_name; + gchar *gstreamer_version; } PkGstCodecInfo; enum { @@ -58,9 +59,13 @@ pk_gst_parse_codec (const gchar *codec) g_message ("PackageKit: not a GStreamer codec line"); goto out; } - if (g_strcmp0 (split[0], "gstreamer") != 0 || - g_strcmp0 (split[1], "0.10") != 0) { - g_message ("PackageKit: not for GStreamer 0.10"); + if (g_strcmp0 (split[0], "gstreamer") != 0) { + g_message ("PackageKit: not a GStreamer codec request"); + goto out; + } + if (g_strcmp0 (split[1], "0.10") != 0 && + g_strcmp0 (split[1], "1.0") != 0) { + g_message ("PackageKit: not recognised GStreamer version"); goto out; } @@ -99,6 +104,7 @@ pk_gst_parse_codec (const gchar *codec) gst_structure_remove_field (s, "bitrate"); info = g_new0 (PkGstCodecInfo, 1); + info->gstreamer_version = g_strdup (split[1]); info->app_name = g_strdup (split[2]); info->codec_name = g_strdup (split[3]); info->type_name = g_strdup (type_name); @@ -219,6 +225,7 @@ pk_gst_codec_free (PkGstCodecInfo *codec) g_free (codec->type_name); g_free (codec->codec_name); g_free (codec->app_name); + g_free (codec->gstreamer_version); } /** @@ -344,12 +351,18 @@ main (int argc, gchar **argv) g_message ("PackageKit: Codec nice name: %s", info->codec_name); if (info->structure != NULL) { s = pk_gst_structure_to_provide (info->structure); - type = g_strdup_printf ("gstreamer0.10(%s-%s)%s%s", info->type_name, - gst_structure_get_name (info->structure), s, suffix); + type = g_strdup_printf ("gstreamer%s(%s-%s)%s%s", + info->gstreamer_version, + info->type_name, + gst_structure_get_name (info->structure), + s, suffix); g_free (s); g_message ("PackageKit: structure: %s", type); } else { - type = g_strdup_printf ("gstreamer0.10(%s)%s", info->type_name, suffix); + type = g_strdup_printf ("gstreamer%s(%s)%s", + info->gstreamer_version, + info->type_name, + suffix); g_message ("PackageKit: non-structure: %s", type); } -- cgit v0.9.0.2-2-gbebe -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
