Hello community, here is the log from the commit of package PackageKit checked in at Fri Jul 25 16:58:58 CEST 2008. -------- --- PackageKit/PackageKit.changes 2008-07-03 01:27:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/PackageKit/PackageKit.changes 2008-07-18 17:57:18.552699000 +0200 @@ -1,0 +2,8 @@ +Fri Jul 18 01:18:27 CEST 2008 - sreeves@suse.de + +- Move to 0.2.3 + Add PkCatalog for installing catalogs + Add source filter support. + Allow adding and removing multiple packages at one time with pkcon + +------------------------------------------------------------------- Old: ---- PackageKit-0.2.1.tar.bz2 PackageKit-ac.patch PackageKit-bnc389415.patch PackageKit-bnc398367-bnc398380.patch PackageKit-bnc398391-2.patch PackageKit-bnc398391.patch PackageKit_libzypp_api_change.patch PackageKit-openSUSE-branch.patch New: ---- PackageKit-0.2.3.tar.bz2 PackageKit-0.2.3-to-git20080717.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.R28703/_old 2008-07-25 16:58:42.000000000 +0200 +++ /var/tmp/diff_new_pack.R28703/_new 2008-07-25 16:58:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package PackageKit (Version 0.2.1) +# spec file for package PackageKit (Version 0.2.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,8 +11,8 @@ Name: PackageKit -Version: 0.2.1 -Release: 23 +Version: 0.2.3 +Release: 1 License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: NetworkManager-devel PolicyKit-devel dbus-1-glib-devel fdupes gcc-c++ glib2-devel gtk-doc intltool libzypp-devel perl-XML-Parser python-devel sqlite-devel @@ -21,13 +21,7 @@ Url: http://packagekit.org/ Source: %{name}-%{version}.tar.bz2 Patch: PackageKit_release.patch -Patch1: PackageKit-ac.patch -Patch2: PackageKit-openSUSE-branch.patch -Patch3: PackageKit-bnc398367-bnc398380.patch -Patch4: PackageKit-bnc398391.patch -Patch5: PackageKit-bnc389415.patch -Patch6: PackageKit-bnc398391-2.patch -Patch7: PackageKit_libzypp_api_change.patch +Patch1: PackageKit-0.2.3-to-git20080717.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Requires: dbus-1 PolicyKit @@ -97,14 +91,8 @@ %prep %setup -q -n %{name}-%{version} -%patch -p1 -%patch1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p0 +%patch -p0 +%patch1 -p1 %build # uncomment out the following line if autotools should be run again (i.e., @@ -147,6 +135,7 @@ %dir %{_libdir}/pm-utils/sleep.d %dir /var/lib/PackageKit %dir /var/run/PackageKit +%dir /lib/udev %dir /usr/share/locale/no_nb %dir /usr/share/locale/no_nb/LC_MESSAGES %dir /usr/share/locale/sr@latin @@ -154,6 +143,7 @@ %{_sysconfdir}/bash_completion.d/pk-completion.bash %{_sysconfdir}/PackageKit/PackageKit.conf %{_sysconfdir}/dbus-1/system.d/org.freedesktop.PackageKit.conf +%{_sysconfdir}/udev/rules.d/51-packagekit-firmware.rules %{_bindir}/packagekit-bugreport.sh %{_bindir}/pkcon %{_bindir}/pkmon @@ -169,6 +159,8 @@ %{_datadir}/PackageKit/helpers/test_spawn/search-name.sh %{_datadir}/PolicyKit/policy/org.freedesktop.packagekit.policy %{_datadir}/dbus-1/system-services/* +%{_datadir}/mime/packages/packagekit-catalog.xml +/lib/udev/packagekit-firmware.sh %verify(not md5 size mtime) /var/lib/PackageKit/transactions.db %verify(not md5 size mtime) /var/run/PackageKit/job_count.dat @@ -183,6 +175,11 @@ %{_libdir}/libpackagekit.so %changelog +* Fri Jul 18 2008 sreeves@suse.de +- Move to 0.2.3 + Add PkCatalog for installing catalogs + Add source filter support. + Allow adding and removing multiple packages at one time with pkcon * Thu Jul 03 2008 sreeves@suse.de - Match libzypp API change * Wed Jun 25 2008 sreeves@suse.de ++++++ PackageKit-0.2.1.tar.bz2 -> PackageKit-0.2.3.tar.bz2 ++++++ ++++ 59817 lines of diff (skipped) ++++++ PackageKit-0.2.3-to-git20080717.patch ++++++ diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index e666c8e..a1b4051 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -1349,7 +1349,8 @@ backend_get_repo_list (PkBackend *backend, PkFilterEnum filters) std::list <zypp::RepoInfo> repos; try { - repos = manager.knownRepositories(); + //repos = manager.knownRepositories(); + repos = std::list<zypp::RepoInfo>(manager.repoBegin(),manager.repoEnd()); } catch ( const zypp::Exception &e) { diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp index 293dba3..47e4e1e 100644 --- a/backends/zypp/zypp-utils.cpp +++ b/backends/zypp/zypp-utils.cpp @@ -165,7 +165,8 @@ zypp_build_pool (gboolean include_local) zypp::RepoManager manager; std::list<zypp::RepoInfo> repos; try { - repos = manager.knownRepositories (); + //repos = manager.knownRepositories (); + repos = std::list<zypp::RepoInfo>(manager.repoBegin(),manager.repoEnd()); for (std::list<zypp::RepoInfo>::iterator it = repos.begin(); it != repos.end (); it++) { zypp::RepoInfo repo (*it); @@ -861,7 +862,8 @@ zypp_refresh_cache (PkBackend *backend, gboolean force) std::list <zypp::RepoInfo> repos; try { - repos = manager.knownRepositories(); + //repos = manager.knownRepositories(); + repos = std::list<zypp::RepoInfo>(manager.repoBegin(),manager.repoEnd()); } catch ( const zypp::Exception &e) { diff --git a/client/pk-import-desktop.c b/client/pk-import-desktop.c index 20bc866..2e5fb9b 100644 --- a/client/pk-import-desktop.c +++ b/client/pk-import-desktop.c @@ -132,16 +132,6 @@ pk_desktop_process_desktop (const gchar *package_name, const gchar *filename) gsize len; gchar *locale_temp; static GPtrArray *locale_array = NULL; - const gchar *icon_name; - const gchar *summary; - - /* can we optimise for the common case? */ - icon_name = pk_extra_get_icon_name (extra, package_name); - summary = pk_extra_get_summary (extra, package_name); - if (icon_name != NULL || summary != NULL) { - g_print ("PackageName:\t%s\t[skipping]\n", package_name); - return; - } key = g_key_file_new (); ret = g_key_file_load_from_file (key, filename, G_KEY_FILE_KEEP_TRANSLATIONS, NULL); diff --git a/src/pk-backend.c b/src/pk-backend.c index 1853c9b..317716e 100644 --- a/src/pk-backend.c +++ b/src/pk-backend.c @@ -2204,7 +2204,7 @@ libst_backend (LibSelfTest *test) if (text == NULL) { libst_success (test, NULL); } else { - libst_failed (test, "invalid name %s", text); + libst_failed (test, "invalid name %s (test suite needs to unref backend?)", text); } g_free (text); diff --git a/src/pk-transaction-list.c b/src/pk-transaction-list.c index f325f94..ad5b41f 100644 --- a/src/pk-transaction-list.c +++ b/src/pk-transaction-list.c @@ -53,7 +53,6 @@ static void pk_transaction_list_finalize (GObject *object); struct PkTransactionListPrivate { GPtrArray *array; - gchar *current_tid; }; typedef struct { @@ -135,24 +134,18 @@ pk_transaction_list_role_present (PkTransactionList *tlist, PkRoleEnum role) } /** - * pk_transaction_list_remove: + * pk_transaction_list_remove_internal: **/ gboolean -pk_transaction_list_remove (PkTransactionList *tlist, PkTransaction *transaction) +pk_transaction_list_remove_internal (PkTransactionList *tlist, PkTransactionItem *item) { gboolean ret; - PkTransactionItem *item; g_return_val_if_fail (PK_IS_TRANSACTION_LIST (tlist), FALSE); - g_return_val_if_fail (transaction != NULL, FALSE); + g_return_val_if_fail (item != NULL, FALSE); - item = pk_transaction_list_get_from_transaction (tlist, transaction); - if (item == NULL) { - pk_warning ("could not get item"); - return FALSE; - } /* valid item */ - pk_debug ("remove transaction %p, item %p", item->transaction, item); + pk_debug ("remove transaction %s, item %p", item->tid, item); ret = g_ptr_array_remove (tlist->priv->array, item); if (ret == FALSE) { pk_warning ("could not remove %p as not present in list", item); @@ -161,10 +154,34 @@ pk_transaction_list_remove (PkTransactionList *tlist, PkTransaction *transaction g_object_unref (item->transaction); g_free (item->tid); g_free (item); - return TRUE; } +/** + * pk_transaction_list_remove: + **/ +gboolean +pk_transaction_list_remove (PkTransactionList *tlist, PkTransaction *transaction) +{ + PkTransactionItem *item; + gboolean ret; + + g_return_val_if_fail (PK_IS_TRANSACTION_LIST (tlist), FALSE); + g_return_val_if_fail (transaction != NULL, FALSE); + + item = pk_transaction_list_get_from_transaction (tlist, transaction); + if (item == NULL) { + pk_warning ("could not get item"); + return FALSE; + } + if (item->finished) { + pk_warning ("already finished, so waiting to timeout"); + return FALSE; + } + ret = pk_transaction_list_remove_internal (tlist, item); + return ret; +} + /* we need this for the finished data */ typedef struct { PkTransactionList *tlist; @@ -180,7 +197,7 @@ pk_transaction_list_remove_item_timeout (gpointer data) PkTransactionFinished *finished = (PkTransactionFinished *) data; pk_debug ("transaction %s completed, removing", finished->item->tid); - pk_transaction_list_remove (finished->tlist, finished->item->transaction); + pk_transaction_list_remove_internal (finished->tlist, finished->item); g_free (finished); return FALSE; } diff --git a/src/pk-transaction.c b/src/pk-transaction.c index 8e318c7..97875a7 100644 --- a/src/pk-transaction.c +++ b/src/pk-transaction.c @@ -1153,7 +1153,7 @@ pk_transaction_cancel (PkTransaction *transaction, GError **error) g_return_val_if_fail (PK_IS_TRANSACTION (transaction), FALSE); g_return_val_if_fail (transaction->priv->tid != NULL, FALSE); - pk_debug ("Cancel method called"); + pk_debug ("Cancel method called on %s", transaction->priv->tid); /* if it's never been run, just remove this transaction from the list */ if (!transaction->priv->has_been_run) { ++++++ PackageKit_release.patch ++++++ --- /var/tmp/diff_new_pack.R28703/_old 2008-07-25 16:58:45.000000000 +0200 +++ /var/tmp/diff_new_pack.R28703/_new 2008-07-25 16:58:45.000000000 +0200 @@ -1,33 +1,30 @@ -diff --git a/etc/PackageKit.conf.in b/etc/PackageKit.conf.in -index 7d6fca8..3915a5c 100644 ---- a/etc/PackageKit.conf.in -+++ b/etc/PackageKit.conf.in -@@ -9,7 +9,7 @@ TransactionLogging=true - +--- etc/PackageKit.conf.in ++++ etc/PackageKit.conf.in +@@ -23,7 +23,7 @@ # Shut down the daemon after this many seconds idle. 0 means don't shutdown. + # # default=300 -ShutdownTimeout=300 +ShutdownTimeout=15 # Default backend, as chosen in the configure script. This will be used where # no --backend="foo" option is given to the daemon. -diff --git a/data/Makefile.am b/data/Makefile.am -index 65a0200..59ac17f 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -10,21 +10,12 @@ SUBDIRS = \ +--- data/Makefile.am ++++ data/Makefile.am +@@ -10,12 +10,6 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = packagekit.pc -cronfiledir = ${SYSCONFDIR}/cron.daily --cronfile_DATA = packagekit-background.cron +-cronfile_SCRIPTS = packagekit-background.cron - -crondatadir = ${SYSCONFDIR}/sysconfig --crondata_DATA = packagekit-background +-crondata_SCRIPTS = packagekit-background - pmutilsdir = $(libdir)/pm-utils/sleep.d pmutils_DATA = 95packagekit +@@ -27,9 +21,6 @@ dbusdir = ${SYSCONFDIR}/dbus-1/system.d dist_dbus_DATA = \ org.freedesktop.PackageKit.conf \ @@ -37,7 +34,7 @@ $(NULL) servicemaindir = $(DBUS_SERVICES_DIR) -@@ -33,24 +24,6 @@ servicemain_DATA = $(servicemain_in_files:.service.in=.service) +@@ -38,24 +29,6 @@ $(servicemain_DATA): $(servicemain_in_files) Makefile @sed -e "s|\@servicedir\@|$(sbindir)|" -e "s|\@PACKAGEKIT_USER\@|$(PACKAGEKIT_USER)|" $< > $@ @@ -62,7 +59,7 @@ localcachedir = $(localstatedir)/run/PackageKit localcache_DATA = \ job_count.dat \ -@@ -63,17 +36,9 @@ database_DATA = \ +@@ -68,17 +41,9 @@ EXTRA_DIST = \ 95packagekit \ @@ -77,12 +74,12 @@ - $(serviceyum_in_files) \ - $(servicetest_in_files) \ - $(serviceapt_in_files) \ + $(mime_in_files) \ $(localcache_DATA) \ $(database_DATA) \ - $(NULL) -@@ -83,9 +48,6 @@ clean-local: - +@@ -93,9 +58,6 @@ DISTCLEANFILES = \ + $(mime_DATA) \ org.freedesktop.PackageKit.service \ - org.freedesktop.PackageKitTestBackend.service \ - org.freedesktop.PackageKitYumBackend.service \ @@ -90,13 +87,3 @@ $(NULL) MAINTAINERCLEANFILES = \ -diff --git a/contrib/Makefile.am b/contrib/Makefile.am -index acfd88c..a9d1506 100644 ---- a/contrib/Makefile.am -+++ b/contrib/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = udev -+SUBDIRS = - - if BACKEND_TYPE_YUM - SUBDIRS += yum-packagekit ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org