Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at 2012-01-09 11:16:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2011-11-08 17:44:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.PackageKit.new/PackageKit.changes 2012-01-09 11:16:12.000000000 +0100 @@ -1,0 +2,175 @@ +Wed Dec 21 15:32:38 UTC 2011 - vu...@opensuse.org + +- Update to version 0.7.1: + + New Features: + - Add command line option to keep environment + - Add Introspection support for PK-Plugins + - Add possibility for backends/plugins to skip transactions + - Add 'uid' and 'cmdline' properties to PkBackend + - Use the new g_thread_new() for new versions of GLib + + Libraries (qt): Drop packagekit-qt1 which is obsolete in favor + of packagekit-qt2 + + Libraries (qt2): + - Remove old Find* macro + - Really do not distribute moc files + + Zypp Backend: + - Dont call build pool inside the loop + - Only load repositories once + - Refactor the private static data into one structure + + Non-zypp backends updates + + Bugfixes: + - Check if a transaction should be skipped after it has started + too + - Don't use the deprecated g_thread_supported() in the dameon + code + - Finalize PackageKitPlugin GIR file + - Find uninstalled PackageKitGlib-1.0.gir when building + - Fix the role of the EULA transaction + - Make PK compile on GNU Hurd + - Move the gtk-module extra files to the PK tarball + - Offset the cache age by 30 minutes + - plugin: Add a few GIR annotations + - Remove the implemented checks for the simulate methods + - Require exactly 'y<enter>' or 'yes<enter>' before running a + transaction + - Use the newest filter when resolving for new packages to + install + - website: Fix broken link to gdb docs + - website: Improve links to bug trackers +- Changes from version 0.7.0: + + Notes: + - This is the first release of the unstable 0.7.x series. + - This code removes a lot of deprecated code and compatibility + shims compared to the previous branch. + - Highlights of this release is the new transaction plugin + interface that allows external projects to add modules for + interfacing with PackageKit. + + New Features: + - Add an 'auto' string for the --with-default-backend= + configure option + - Add an example plugin that saves private state + - Add an example to contrib to show how to build an out-of-tree + plugin + - Add an ItemProgress signal designed to eventually replace + SubPercentage + - Add an untrusted section header when using console + applications + - Add a PK_PROVIDES_ENUM_LIBRARY entry + - Add a "Python" type to PkProvidesEnum and document how the + provided components should be named + - Add a transaction plugin infrastructure to packagekitd + - Do not do the compatibility method fallbacks anymore + - Don't ship all the valid licences as enums anymore + - Install a pkgconfig file so external projects can build + plugins + - Move the check for libraries in use for security updates + functionality to a plugin + - Move the checking for running processes before update to a + plugin + - Move the clearing firmware functionality into a plugin + - Move the desktop database rescan functionality into a plugin + - Move the pre-transaction.d and post-transaction.d + functionality into a plugin + - Move the update check for running processes into a plugin + - Move the updating of the package list into a plugin + - Raise the PolicyKit required version to 0.98 and drop the + compat code + - Remove PkFileMonitor, we can now use GFileMonitor + - Remove the deprecated PK_BACKEND_OPTIONS + - Remove the GTK+2 pango module and only support GTK+3 + - Remove the HAL integration code + - Require a new version of automake, and make configure.in sane + again + - Use g_bus_watch_name() and remove the homegrown + EggDbusMonitor + + Libraries (glib): + - Free the PkProgress' package + - Remove the foo_from_text() compatibility defines + + Libraries (python): Remove the native python library + + Libraries (qt): Do not dist the moc files + + Libraries (qt2): Use cmake package config instead of Find* + module + + Zypp Backend: + - Do not install locked (taboo) patches + - Do not rebuild the pool on every call causing slowness + (bnc#679650) + - Just use the iterator instead of so many temps + + Non-zypp backends updates + + Bugfixes: + - Actually use the value from /etc/login.defs + - Fix the browser-plugin build with GTK+ < 2.24 + - Port the browser-plugin from dbus-glib to GDBus + - Convert the daemon to use GDBus rather than dbus-glib + - Port the gstreamer-plugin from dbus-glib to GDBus + - gtk-module: Port from dbus-glib to GDBus + - Ignore local packages when calculating the simulate list + - Ignore untrusted packages when calculating the simulate list + - Make percentage, subpercentage and remaining proper GObject + properties on the PkBackend object + - Make the lsof plugin code support distros such as Fedora with + /lib64 + - pk-command-not-found: An ellipsis has three dots, not two + - Make lsof use the '-n' option to avoid looking up hostnames + - Remove cppunit check as packagekit-qt2 does not use it + - Remove the duplicate 'The software is not from a trusted + source' + - Use g_unix_signal_add_full() which has been renamed in GLib +- Remove dbus-1-glib-devel BuildRequires: removed upstream. +- Remove the gtk-module subpackage: the GTK+ 2 module got dropped. + To ensure smooth upgrades, add an Obsoletes for it to main + subpackage. +- Remove libpackagekit-qt14 and libpackagekit-qt-devel subpackages: + this library got dropped. +- Add %glib2_gsettings_schema_* macro machinery for gtk3-module + subpackage since it now contains a GSettings schema. +- Create typelib-1_0-PackageKitPlugin-1_0 subpackage for + PackageKitPlugin-1.0.typelib, and add Requires for it to devel + subpackage. +- Split PackageKitGlib-1.0.typelib from libpackagekit-glib2-14 into + typelib-1_0-PackageKitGlib-1_0 subpackage. Add + typelib-1_0-PackageKitGlib-1_0 Requires to + libpackagekit-glib2-devel subpackage. +- Stop marking devel subpackage as noarch as it now contains files + in %{_libdir}. +- Stop removing .moc files in %prep: they're not shipped anymore. +- Use correct groups for subpackages: + + System/Daemons for main and branding-upstream subpackages. + + System/Libraries for typelib-1_0-PackageKitPlugin-1_0, + gtk3-module, libpackagekit-glib2-14, + typelib-1_0-PackageKitGlib-1_0, libpackagekit-qt2-2 + subpackages. + + Development/Libraries/C and C++ for devel and + libpackagekit-qt2-devel subpackages. + + Development/Libraries/GNOME for libpackagekit-glib2-devel + subpackage. + + Productivity/Networking/Web/Browsers for browser-plugin + subpackage. + + Productivity/Multimedia/Other for gstreamer-plugin subpackage. + + Documentation/Other for doc subpackage. + +------------------------------------------------------------------- +Wed Nov 30 14:27:09 UTC 2011 - co...@suse.com + +- add automake as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Mon Nov 14 10:17:27 UTC 2011 - dmacvi...@suse.de + +- Update to version 0.6.20 + + New features: + - Add command line option to keep environment + + Libraries: + - python: Implement and use utf8 stream writer for stdout, + stderr + + Zypp Backend: + - Dont call build pool inside the loop + - Only load repositories once + + Non-zypp backends updates +- Drop upstreamed patches: + + 0002-dont-call-build-pool-inside-the-loop.patch + + 0003-only-load-repositories-once.patch + + 0004-Workaround-Don-t-refresh-repositories-each-time-for-.patch +- Add patch to retrieve url of packages: + 0002-Retrieve-url-for-packages-instead-of-returning-TODO.patch + +------------------------------------------------------------------- Old: ---- 0002-dont-call-build-pool-inside-the-loop.patch 0003-only-load-repositories-once.patch 0004-Workaround-Don-t-refresh-repositories-each-time-for-.patch 0005-Build-against-npapi-sdk-instead-of-xulrunner.patch PackageKit-0.6.19.tar.xz New: ---- 0002-Retrieve-url-for-packages-instead-of-returning-TODO.patch 0003-Build-against-npapi-sdk-instead-of-xulrunner.patch PackageKit-0.7.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.WMls6T/_old 2012-01-09 11:16:13.000000000 +0100 +++ /var/tmp/diff_new_pack.WMls6T/_new 2012-01-09 11:16:13.000000000 +0100 @@ -14,8 +14,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - # $ pkcon search file /usr/bin/anjuta %define BUILD_CNF 1 @@ -34,12 +32,11 @@ %endif Name: PackageKit -Version: 0.6.19 -Release: 1 +Version: 0.7.1 +Release: 0 # FIXME: on update, check if we can remove the rm hack for .moc files in %%prep (see fdo#40662). Last checked: 0.6.18. -License: GPLv2+ BuildRequires: NetworkManager-devel -BuildRequires: dbus-1-glib-devel +BuildRequires: automake BuildRequires: docbook-utils BuildRequires: fdupes BuildRequires: gcc-c++ @@ -54,6 +51,7 @@ BuildRequires: libcppunit-devel BuildRequires: libgudev-1_0-devel BuildRequires: libqt4-devel +BuildRequires: libtool BuildRequires: libzypp-devel BuildRequires: mozilla-nspr-devel %if 0%{suse_version} > 1140 @@ -62,7 +60,7 @@ BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel %endif BuildRequires: pm-utils -BuildRequires: polkit-devel +BuildRequires: polkit-devel >= 0.98 BuildRequires: python-devel # We need the %%mime_database_* macros BuildRequires: shared-mime-info @@ -70,8 +68,9 @@ BuildRequires: translation-update-upstream # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 BuildRequires: xz -Group: System/Daemons Summary: Simple software installation management software +License: GPL-2.0+ +Group: System/Daemons Url: http://packagekit.org/ Source: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz Source2: baselibs.conf @@ -85,19 +84,17 @@ # # PATCH-FEATURE-OPENSUSE 0001-Change-the-configuration-of-the-cron-script-to-a-sys.patch vu...@opensuse.org -- Change the configuration of the cron script to a sysconfig-like config Patch0: 0001-Change-the-configuration-of-the-cron-script-to-a-sys.patch -# PATCH-FIX-UPSTREAM backport part of fix for bnc#679650 -Patch1: 0002-dont-call-build-pool-inside-the-loop.patch -# PATCH-FIX-UPSTREAM backport part of fix for bnc#679650 -Patch2: 0003-only-load-repositories-once.patch -# PATCH-FIX-UPSTREAM backport part of fix for bnc#679650 -Patch3: 0004-Workaround-Don-t-refresh-repositories-each-time-for-.patch +# PATCH-FIX-UPSTREAM backport fix for packages showing "TODO" as url +Patch1: 0002-Retrieve-url-for-packages-instead-of-returning-TODO.patch # PATCH-FIX-UPSTREAM PackageKit-npapi.patch fdo#40026 w...@rosenauer.org -- Build against npapi-sdk instead of xulrunner -Patch4: 0005-Build-against-npapi-sdk-instead-of-xulrunner.patch +Patch2: 0003-Build-against-npapi-sdk-instead-of-xulrunner.patch # BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-branding = %{version} Recommends: %{name}-lang PreReq: %fillup_prereq +# gtk+ 2 module was removed in 0.7.0 +Obsoletes: %{name}-gtk-module < 0.7.0 # ruck was removed in 0.6.4, make sure it gets removed Obsoletes: ruck <= 0.6.3 %py_requires @@ -112,10 +109,23 @@ use some of the latest technology like PolicyKit to make the process suck less. +%package -n typelib-1_0-PackageKitPlugin-1_0 +Summary: Simple software installation management software -- Plugin library, Introspection bindings +Group: System/Libraries + +%description -n typelib-1_0-PackageKitPlugin-1_0 +PackageKit is a system designed to make installing and updating +software on your computer easier. The primary design goal is to unify +all the software graphical tools used in different distributions, and +use some of the latest technology like PolicyKit to make the process +suck less. + +This package provides the GObject Introspection bindings for the +PackageKit plugin library. + %package browser-plugin -License: GPLv2+ Summary: Simple software installation management software -Group: System/Daemons +Group: Productivity/Networking/Web/Browsers Recommends: %{name} = %{version} Supplements: packageand(%{name}:MozillaFirefox) Supplements: packageand(%{name}:epiphany) @@ -128,9 +138,8 @@ suck less. %package gstreamer-plugin -License: GPLv2+ Summary: Simple software installation management software -Group: System/Daemons +Group: Productivity/Multimedia/Other Requires(post): update-alternatives Requires(postun): update-alternatives Recommends: %{name} = %{version} @@ -147,26 +156,12 @@ use some of the latest technology like PolicyKit to make the process suck less. -%package gtk-module -License: GPLv2+ -Summary: Simple software installation management software -Group: System/Daemons -Recommends: %{name} = %{version} -Supplements: packageand(%{name}:gtk2) - -%description gtk-module -PackageKit is a system designed to make installing and updating -software on your computer easier. The primary design goal is to unify -all the software graphical tools used in different distributions, and -use some of the latest technology like PolicyKit to make the process -suck less. - %package gtk3-module -License: GPLv2+ Summary: Simple software installation management software -Group: System/Daemons +Group: System/Libraries Recommends: %{name} = %{version} Supplements: packageand(%{name}:gtk3) +%glib2_gsettings_schema_requires %description gtk3-module PackageKit is a system designed to make installing and updating @@ -176,14 +171,11 @@ suck less. %package devel -License: GPLv2+ Summary: Needed include files and libraries for development +Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: libpackagekit-glib2-devel -Group: System/Daemons -%if 0%{?suse_version} >= 1120 -BuildArch: noarch -%endif +Requires: typelib-1_0-PackageKitPlugin-1_0 = %{version} %description devel This package contains all necessary include files, libraries, @@ -191,9 +183,8 @@ compile and link applications using PackageKit. %package -n libpackagekit-glib2-14 -License: GPLv2+ Summary: Simple software installation management software -Group: System/Daemons +Group: System/Libraries Recommends: %{name} Provides: libpackagekit-glib12 = %{version} Obsoletes: libpackagekit-glib12 < %{version} @@ -205,43 +196,29 @@ use some of the latest technology like PolicyKit to make the process suck less. -%package -n libpackagekit-glib2-devel -License: GPLv2+ -Summary: Simple software installation management software -Group: System/Daemons -Requires: libpackagekit-glib2-14 = %{version} -Provides: libpackagekit-glib12-devel = %{version} -Obsoletes: libpackagekit-glib12-devel < %{version} +%package -n typelib-1_0-PackageKitGlib-1_0 +Summary: Simple software installation management software -- Introspection bindings +Group: System/Libraries -%description -n libpackagekit-glib2-devel +%description -n typelib-1_0-PackageKitGlib-1_0 PackageKit is a system designed to make installing and updating software on your computer easier. The primary design goal is to unify all the software graphical tools used in different distributions, and use some of the latest technology like PolicyKit to make the process suck less. -%package -n libpackagekit-qt14 -License: GPLv2+ -Summary: Simple software installation management software -Group: System/Daemons -Recommends: %{name} - -%description -n libpackagekit-qt14 -PackageKit is a system designed to make installing and updating -software on your computer easier. The primary design goal is to unify -all the software graphical tools used in different distributions, and -use some of the latest technology like PolicyKit to make the process -suck less. +This package provides the GObject Introspection bindings for the +PackageKit client library. -%package -n libpackagekit-qt-devel -License: GPLv2+ +%package -n libpackagekit-glib2-devel Summary: Simple software installation management software -Group: System/Daemons -Requires: libpackagekit-qt14 = %{version} -# Old name of the package; we can't provide it since the ABI has changed -Obsoletes: libpackagekit-qt12-devel <= 0.5.4 +Group: Development/Libraries/GNOME +Requires: libpackagekit-glib2-14 = %{version} +Requires: typelib-1_0-PackageKitGlib-1_0 = %{version} +Provides: libpackagekit-glib12-devel = %{version} +Obsoletes: libpackagekit-glib12-devel < %{version} -%description -n libpackagekit-qt-devel +%description -n libpackagekit-glib2-devel PackageKit is a system designed to make installing and updating software on your computer easier. The primary design goal is to unify all the software graphical tools used in different distributions, and @@ -249,9 +226,8 @@ suck less. %package -n libpackagekit-qt2-2 -License: GPLv2+ Summary: Simple software installation management software -Group: System/Daemons +Group: System/Libraries Recommends: %{name} %description -n libpackagekit-qt2-2 @@ -262,9 +238,8 @@ suck less. %package -n libpackagekit-qt2-devel -License: GPLv2+ Summary: Simple software installation management software -Group: System/Daemons +Group: Development/Libraries/C and C++ Requires: libpackagekit-qt2-2 = %{version} %description -n libpackagekit-qt2-devel @@ -275,9 +250,8 @@ suck less. %package doc -License: GPLv2+ Summary: Simple software installation management software -Group: System/Daemons +Group: Documentation/Other Requires: %{name} = %{version} %if 0%{?suse_version} >= 1120 BuildArch: noarch @@ -291,7 +265,6 @@ suck less. %package branding-upstream -License: GPLv2+ Summary: Simple software installation management software -- Upstream default configuration Group: System/Daemons Requires: %{name} = %{version} @@ -317,13 +290,9 @@ translation-update-upstream %patch0 -p1 %patch1 -p1 +%if 0%{?suse_version} > 1140 %patch2 -p1 -%patch3 -p1 -%if 0%{suse_version} > 1140 -%patch4 -p1 %endif -# Remove .moc files, as they make the build fail with our qt. They will be re-created during the build. See fdo#40662. -rm lib/packagekit-qt/src/*.moc lib/packagekit-qt2/*.moc %build %configure \ @@ -371,16 +340,18 @@ update-alternatives --remove gst-install-plugins-helper %{_libexecdir}/pk-gstreamer-install fi -%post -n libpackagekit-glib2-14 -p /sbin/ldconfig +%post gtk3-module +%glib2_gsettings_schema_post -%post -n libpackagekit-qt14 -p /sbin/ldconfig +%postun gtk3-module +%glib2_gsettings_schema_postun + +%post -n libpackagekit-glib2-14 -p /sbin/ldconfig %post -n libpackagekit-qt2-2 -p /sbin/ldconfig %postun -n libpackagekit-glib2-14 -p /sbin/ldconfig -%postun -n libpackagekit-qt14 -p /sbin/ldconfig - %postun -n libpackagekit-qt2-2 -p /sbin/ldconfig %files lang -f %{name}.lang @@ -396,6 +367,7 @@ %dir %{_datadir}/PackageKit/helpers %dir %{_datadir}/PackageKit/helpers/test_spawn %dir %{_libdir}/packagekit-backend +%dir %{_libdir}/packagekit-plugins %dir %{python_sitelib}/packagekit %dir %{_libexecdir}/pm-utils %dir %{_libexecdir}/pm-utils/sleep.d @@ -415,6 +387,7 @@ %{_bindir}/pkmon %{_bindir}/pkgenpack %{_libdir}/packagekit-backend/*.so +%{_libdir}/packagekit-plugins/*.so %{_libexecdir}/packagekitd %{_libexecdir}/pm-utils/sleep.d/95packagekit %if %BUILD_CNF @@ -430,6 +403,10 @@ %doc %{_mandir}/man?/*.* %verify(not md5 size mtime) %{_localstatedir}/lib/PackageKit/transactions.db +%files -n typelib-1_0-PackageKitPlugin-1_0 +%defattr(-,root,root) +%{_libdir}/girepository-1.0/PackageKitPlugin-1.0.typelib + %files browser-plugin %defattr(-,root,root) %{_libdir}/browser-plugins/packagekit-plugin.so @@ -439,13 +416,13 @@ %ghost %attr(755,root,root) %{_libexecdir}/gst-install-plugins-helper %{_libexecdir}/pk-gstreamer-install -%files gtk-module -%defattr(-,root,root) -%{_libdir}/gtk-2.0/modules/* - %files gtk3-module %defattr(-,root,root) +%dir %{_libdir}/gnome-settings-daemon-3.0 +%dir %{_libdir}/gnome-settings-daemon-3.0/gtk-modules +%{_libdir}/gnome-settings-daemon-3.0/gtk-modules/pk-gtk-module.desktop %{_libdir}/gtk-3.0/modules/* +%{_datadir}/glib-2.0/schemas/org.gnome.setttings-daemon.gtk-modules-packagekit.gschema.xml %files doc %defattr(-,root,root) @@ -453,16 +430,21 @@ %files devel %defattr(-,root,root) -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/PackageKit +%doc %{_datadir}/gtk-doc/html/PackageKit +%{_libdir}/pkgconfig/packagekit-plugin.pc %dir %{_includedir}/PackageKit -%dir %{_includedir}/PackageKit/backend -%{_includedir}/PackageKit/backend/pk*.h +%{_includedir}/PackageKit/backend/ +%{_includedir}/PackageKit/plugin/ +%{_datadir}/dbus-1/interfaces/org.freedesktop.PackageKit.Transaction.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.PackageKit.xml +%{_datadir}/gir-1.0/PackageKitPlugin-1.0.gir %files -n libpackagekit-glib2-14 %defattr(-,root,root) %{_libdir}/libpackagekit-glib2.so.* + +%files -n typelib-1_0-PackageKitGlib-1_0 +%defattr(-,root,root) %{_libdir}/girepository-1.0/PackageKitGlib-1.0.typelib %files -n libpackagekit-glib2-devel @@ -473,19 +455,6 @@ %{_includedir}/PackageKit/packagekit-glib2/ %{_datadir}/gir-1.0/PackageKitGlib-1.0.gir -%files -n libpackagekit-qt14 -%defattr(-,root,root) -%{_libdir}/libpackagekit-qt.so.* - -%files -n libpackagekit-qt-devel -%defattr(-,root,root) -%{_libdir}/libpackagekit-qt.so -%{_libdir}/pkgconfig/packagekit-qt.pc -%dir %{_includedir}/PackageKit -%{_includedir}/PackageKit/packagekit-qt/ -%dir %{_datadir}/cmake -%{_datadir}/cmake/Modules/* - %files -n libpackagekit-qt2-2 %defattr(-,root,root) %{_libdir}/libpackagekit-qt2.so.* @@ -493,6 +462,7 @@ %files -n libpackagekit-qt2-devel %defattr(-,root,root) %{_libdir}/libpackagekit-qt2.so +%{_libdir}/cmake/packagekit-qt2/ %{_libdir}/pkgconfig/packagekit-qt2.pc %dir %{_includedir}/PackageKit %{_includedir}/PackageKit/packagekit-qt2/ ++++++ 0001-Change-the-configuration-of-the-cron-script-to-a-sys.patch ++++++ --- /var/tmp/diff_new_pack.WMls6T/_old 2012-01-09 11:16:13.000000000 +0100 +++ /var/tmp/diff_new_pack.WMls6T/_new 2012-01-09 11:16:13.000000000 +0100 @@ -1,7 +1,7 @@ -From 08ee1392820f91986eea93637c13cc5786ad102a Mon Sep 17 00:00:00 2001 +From d45f2c7eb50f1351996559aeb9978cda25031800 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vu...@opensuse.org> Date: Tue, 26 Jul 2011 11:34:22 +0200 -Subject: [PATCH 1/5] Change the configuration of the cron script to a +Subject: [PATCH 1/3] Change the configuration of the cron script to a sysconfig-like config --- @@ -65,5 +65,5 @@ +# SLEEP_MAX=3600 -- -1.7.6.4 +1.7.7.3 ++++++ 0002-Retrieve-url-for-packages-instead-of-returning-TODO.patch ++++++ >From 58fef040d1feeb6ddcc70ae395981bf54d54a7bd Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P <dmacvi...@suse.de> Date: Mon, 14 Nov 2011 10:16:42 +0100 Subject: [PATCH 2/3] Retrieve url for packages instead of returning "TODO". Not sure why this was left as "TODO". In any case, this code needs to be written correctly, using zypp::Package instead of the low-level zypp::sat::Solvable and then use pkg.url() instead of solvable.lookupStringAttribute(SolvAttr::url) [A --- backends/zypp/pk-backend-zypp.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index 05cf9e8..27c04dd 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -570,7 +570,7 @@ backend_get_details_thread (PkBackend *backend) package.lookupStrAttribute (sat::SolvAttr::license).c_str (), group, package.lookupStrAttribute (sat::SolvAttr::description).c_str (), - "TODO", // pkg->url ().c_str (), + package.lookupStrAttribute (sat::SolvAttr::url).c_str (), size * 1024); } -- 1.7.7.3 ++++++ 0005-Build-against-npapi-sdk-instead-of-xulrunner.patch -> 0003-Build-against-npapi-sdk-instead-of-xulrunner.patch ++++++ --- /work/SRC/openSUSE:Factory/PackageKit/0005-Build-against-npapi-sdk-instead-of-xulrunner.patch 2011-11-08 17:44:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.PackageKit.new/0003-Build-against-npapi-sdk-instead-of-xulrunner.patch 2012-01-09 11:16:12.000000000 +0100 @@ -1,7 +1,7 @@ -From a311186fdff76aaf7ac796c5e931d843ad0d4e1b Mon Sep 17 00:00:00 2001 +From 110495a873e3205742ff448d938d32ac1e9d0df5 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer <w...@rosenauer.org> Date: Tue, 25 Oct 2011 14:27:15 +0200 -Subject: [PATCH 5/5] Build against npapi-sdk instead of xulrunner +Subject: [PATCH 3/3] Build against npapi-sdk instead of xulrunner https://bugs.freedesktop.org/show_bug.cgi?id=40026 --- @@ -10,23 +10,23 @@ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index c261882..f7811c0 100644 +index 3699c86..92d745b 100644 --- a/configure.ac +++ b/configure.ac -@@ -355,7 +355,7 @@ AC_ARG_ENABLE(browser_plugin, AS_HELP_STRING([--enable-browser-plugin],[Build br +@@ -354,7 +354,7 @@ AC_ARG_ENABLE(browser_plugin, AS_HELP_STRING([--enable-browser-plugin],[Build br enable_browser_plugin=$enableval,enable_browser_plugin=yes) if test x$enable_browser_plugin = xyes; then PKG_CHECK_MODULES(PK_BROWSER_PLUGIN, \ - mozilla-plugin \ -+ npapi-sdk \ ++ npapi-sdk \ gio-unix-2.0 \ nspr \ cairo \ diff --git a/contrib/browser-plugin/pk-main.c b/contrib/browser-plugin/pk-main.c -index 072a576..7d35f51 100644 +index 5e67112..56f0377 100644 --- a/contrib/browser-plugin/pk-main.c +++ b/contrib/browser-plugin/pk-main.c -@@ -543,7 +543,7 @@ NP_Shutdown () +@@ -503,7 +503,7 @@ NP_Shutdown () /** * NP_GetMIMEDescription: **/ @@ -34,7 +34,7 @@ +const char * NP_GetMIMEDescription (void) { - pk_debug ("NP_GetMIMEDescription"); + g_debug ("NP_GetMIMEDescription"); -- -1.7.6.4 +1.7.7.3 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org