From 04024d63636bae92b0e2b3846bab46d7aed90610 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mar 19 2009 12:22:00 +0000 Subject: - Update to todays git snapshot so we can test the update ChangeLog feature. --- diff --git a/.cvsignore b/.cvsignore index 908fb18..6b2b948 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -PackageKit-0.4.5.tar.gz +PackageKit-0.4.6-20090319.tar.gz diff --git a/PackageKit-0.4.5-allow-disable-icon-cache.patch b/PackageKit-0.4.5-allow-disable-icon-cache.patch deleted file mode 100644 index 443cefe..0000000 --- a/PackageKit-0.4.5-allow-disable-icon-cache.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit f5af9b0477899e2c246ca8ff8fe5b42ba02e8009 -Author: Richard Hughes -Date: Mon Mar 16 15:16:43 2009 +0000 - - feature: add a UseUpdateCache config variable to be able to turn off the updates cache for debugging - -diff --git a/etc/PackageKit.conf.in b/etc/PackageKit.conf.in -index bc0bea2..c2f1303 100644 ---- a/etc/PackageKit.conf.in -+++ b/etc/PackageKit.conf.in -@@ -104,3 +104,11 @@ UpdateCheckProcesses=true - # default=true - CheckTestingRepos=true - -+# Use update cache when possible to avoid using the backend -+# -+# NOTE: Don't disable this unless you're trying to find bugs in packagekitd -+# and you want your backend to service every request. -+# -+# default=true -+UseUpdateCache=true -+ -diff --git a/src/pk-transaction.c b/src/pk-transaction.c -index 89f4c04..be79ae4 100644 ---- a/src/pk-transaction.c -+++ b/src/pk-transaction.c -@@ -2497,7 +2497,8 @@ pk_transaction_get_updates (PkTransaction *transaction, const gchar *filter, DBu - - /* try and reuse cache */ - updates_cache = pk_cache_get_updates (transaction->priv->cache); -- if (updates_cache != NULL) { -+ ret = pk_conf_get_bool (transaction->priv->conf, "UseUpdateCache"); -+ if (ret && updates_cache != NULL) { - const PkPackageObj *obj; - const gchar *info_text; - guint i; diff --git a/PackageKit-0.4.5-filter-dup-updates.patch b/PackageKit-0.4.5-filter-dup-updates.patch deleted file mode 100644 index 642bc67..0000000 --- a/PackageKit-0.4.5-filter-dup-updates.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 7b13b2aa13fbb2d374a895a895025441a387e600 -Author: Richard Hughes -Date: Mon Mar 9 11:57:57 2009 +0000 - - yum: don't output duplicated updates. Fixes rh#488509 - -diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py -index e33779f..9b47614 100755 ---- a/backends/yum/yumBackend.py -+++ b/backends/yum/yumBackend.py -@@ -2157,7 +2157,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage): - except Exception, e: - self.error(ERROR_INTERNAL_ERROR, _format_str(traceback.format_exc())) - md = self.updateMetadata -- for pkg in pkgs: -+ for pkg in unique(pkgs): - if pkgfilter.pre_process(pkg): - # Get info about package in updates info - notice = md.get_notice((pkg.name, pkg.version, pkg.release)) diff --git a/PackageKit.spec b/PackageKit.spec index 290bbca..5b3895e 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -2,25 +2,26 @@ %define dbus_version 0.90 %define dbus_glib_version 0.70 %define policykit_version 0.8 +%define alphatag 20090319 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Summary: Package management service Name: PackageKit -Version: 0.4.5 -Release: 2%{?dist} +Version: 0.4.6 +Release: 0.1.%{?alphatag}git%{?dist} +#Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.packagekit.org -Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.gz +Source0: http://www.packagekit.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz +#Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Fedora-specific # Set Vendor.conf up for Fedora. Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch Patch1: PackageKit-0.4.4-Fedora-turn-off-time.conf.patch -Patch2: PackageKit-0.4.5-allow-disable-icon-cache.patch -Patch3: PackageKit-0.4.5-filter-dup-updates.patch Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} @@ -218,11 +219,10 @@ A simple helper that offers to install new packages on the command line using PackageKit. %prep -%setup -q +%setup -q -n %{?name}-%{?version}-%{?alphatag} +#%setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local --disable-ruck @@ -417,6 +417,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_includedir}/PackageKit/backend/*.h %changelog +* Thu Mar 19 2009 Richard Hughes - 0.4.6-0.1.20090319git +- Update to todays git snapshot so we can test the update ChangeLog feature. + * Mon Mar 16 2009 Richard Hughes - 0.4.5-2 - Add two patches from upstream: - Allow users to turn off update cache to try to debug #20559 diff --git a/sources b/sources index 7c94af8..3063d8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a335d299bb7e14d910c600d0975dd375 PackageKit-0.4.5.tar.gz +aa74d3c479e40df2c7bf015e71575a14 PackageKit-0.4.6-20090319.tar.gz