rpms/PackageKit
7
0
Fork 1
Code Issues Pull Requests Releases Activity

- New upstream version

Browse Source 
- Drop all upstreamed patches
This commit is contained in:
Richard Hughes 2008-11-11 09:23:17 +00:00
parent 67ded19926
commit 2819179c15
8 changed files with 17 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
PackageKit-0.3.9.tar.gz
PackageKit-0.3.10.tar.gz

40
PackageKit.spec
View File

@ -7,8 +7,8 @@
Summary: System daemon that is a DBUS abstraction layer for package management
Name: PackageKit
Version: 0.3.9
Release: 4%{?dist}
Version: 0.3.10
Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://packagekit.freedesktop.org
@ -19,21 +19,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Set Vendor.conf up for Fedora.
Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch
# upstream, 99f995788473f4627acb7447aa467a61bc61893a
Patch1: pk-yum-fix-devel-filtering.patch
# upstream, 211b538cd0d6e420f288af49f7bb106cf99b4ce6
Patch2: pk-fix-browser-plugin.patch
# upstream, 746b79e082e696b6eae9df10916e00e2a847b138
Patch3: pk-install-qt-cmake-build.patch
# upstream, 32f39d67971f1bd6dbf4b559a8f95e8712edccf8
Patch4: pk-fix-get-distro-upgrade.patch
# upstream, with the proper fix not this bodge
Patch5: pk-cleanup-transaction-longer.patch
Requires: dbus >= %{dbus_version}
Requires: dbus-glib >= %{dbus_glib_version}
Requires: PackageKit-glib = %{version}-%{release}
@ -215,11 +200,6 @@ codecs from configured repositories using PackageKit.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
%configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@ -237,6 +217,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/packagekit-plugin.a
rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/packagekit-plugin.la
chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/PackageKitDbusTest.py
touch $RPM_BUILD_ROOT%{_localstatedir}/cache/PackageKit/groups.sqlite
# create a link that GStreamer will recognise
pushd ${RPM_BUILD_ROOT}%{_libexecdir} > /dev/null
@ -259,6 +240,12 @@ rm -rf $RPM_BUILD_ROOT
%post
update-mime-database %{_datadir}/mime &> /dev/null || :
# the job count used to live in /var/run, but it's now in /var/lib with the
# other persistent bits
if [ -e %{_localstatedir}/run/PackageKit/job_count.dat ]; then
mv %{_localstatedir}/run/PackageKit/job_count.dat %{_localstatedir}/lib/PackageKit/job_count.dat
fi
%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
@ -276,9 +263,8 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%dir %{_sysconfdir}/PackageKit
%dir %{_localstatedir}/lib/PackageKit
%dir %{python_sitelib}/packagekit
%dir %{_localstatedir}/run/PackageKit
%dir %{_localstatedir}/run/PackageKit/udev
%dir %{_localstatedir}/cache/PackageKit
%ghost %verify(not md5 size mtime) %{_localstatedir}/cache/PackageKit/groups.sqlite
%dir %{_localstatedir}/cache/PackageKit/downloads
%{python_sitelib}/packagekit/*py*
%dir %{_sysconfdir}/bash_completion.d
@ -302,7 +288,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_libdir}/packagekit-backend/libpk_backend_dummy.so
%{_libdir}/packagekit-backend/libpk_backend_test_*.so
%ghost %verify(not md5 size mtime) %{_localstatedir}/lib/PackageKit/transactions.db
%ghost %verify(not md5 size mtime) %{_localstatedir}/run/PackageKit/job_count.dat
%ghost %verify(not md5 size mtime) %{_localstatedir}/lib/PackageKit/job_count.dat
%{_datadir}/dbus-1/system-services/*.service
%{_libdir}/pm-utils/sleep.d/95packagekit
%{_libexecdir}/*py*
@ -393,6 +379,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_includedir}/PackageKit/backend/*.h
%changelog
* Tue Nov 11 2008 Richard Hughes <rhughes@redhat.com> - 0.3.10-1
- New upstream version
- Drop all upstreamed patches
* Wed Nov 05 2008 Richard Hughes <rhughes@redhat.com> - 0.3.9-4
- Increase the timeout for cleaning up unused transactions. Due to a bug
in the PkClient library the new TID was not being requested, and the old

13
pk-cleanup-transaction-longer.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/pk-transaction-list.c b/src/pk-transaction-list.c
index 2e5a018..ad9aedd 100644
--- a/src/pk-transaction-list.c
+++ b/src/pk-transaction-list.c
@@ -56,7 +56,7 @@ static void pk_transaction_list_finalize (GObject *object);
#define PK_TRANSACTION_LIST_KEEP_FINISHED_TIMEOUT 5
/* how long the tid is valid before it's destroyed, in seconds */
-#define PK_TRANSACTION_LIST_CREATE_COMMIT_TIMEOUT 5
+#define PK_TRANSACTION_LIST_CREATE_COMMIT_TIMEOUT 5000
/* the interval between each CST, in seconds */
#define PK_TRANSACTION_WEDGE_CHECK 10

19
pk-fix-browser-plugin.patch
View File

@ -1,19 +0,0 @@
commit 211b538cd0d6e420f288af49f7bb106cf99b4ce6
Author: Richard Hughes <richard@hughsie.com>
Date: Tue Oct 28 14:29:02 2008 +0000
bugfix: use the correct session interface in the browser plugin
diff --git a/contrib/packagekit-plugin/src/contents.cpp b/contrib/packagekit-plugin/src/contents.cpp
index bd0d69f..2c16e92 100644
--- a/contrib/packagekit-plugin/src/contents.cpp
+++ b/contrib/packagekit-plugin/src/contents.cpp
@@ -662,6 +662,8 @@ PkpContents::installPackage (Time time)
this,
(GDestroyNotify)0,
24 * 60 * 1000 * 1000, /* one day */
+ G_TYPE_UINT, 0, /* xid */
+ G_TYPE_UINT, 0, /* timespec */
G_TYPE_STRING, mAvailablePackageName.c_str(),
G_TYPE_INVALID,
G_TYPE_INVALID);

34
pk-fix-get-distro-upgrade.patch
View File

@ -1,34 +0,0 @@
commit 32f39d67971f1bd6dbf4b559a8f95e8712edccf8
Author: Richard Hughes <richard@hughsie.com>
Date: Thu Oct 30 16:22:47 2008 +0000
bugfix: yum: fix getting distibution upgrade information when we have multiple repos providing preupgrade. Fixes rh#469172
diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index 9a75200..85cf4da 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -1657,15 +1657,17 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
pkgs = self.yumbase.rpmdb.searchNevra(name='preupgrade')
if len(pkgs) == 0:
#install preupgrade
- pkgs = self.yumbase.pkgSack.searchNevra(name='preupgrade')
+ pkgs = self.yumbase.pkgSack.returnNewestByName(name='preupgrade')
if len(pkgs) == 0:
self.error(ERROR_PACKAGE_NOT_FOUND, "Could not find upgrade preupgrade package in any enabled repos")
- elif len(pkgs) == 1:
- txmbr = self.yumbase.install(po=pkgs[0])
- if txmbr:
- self._runYumTransaction()
+ # we can have more than one result if the package is in multiple repos, for example
+ # a machine with i386 _and_ x86_64 configured.
+ # in this case, just pick the first entry as they are both noarch
+ txmbr = self.yumbase.install(po=pkgs[0])
+ if txmbr:
+ self._runYumTransaction()
else:
- self.error(ERROR_INTERNAL_ERROR, "not one update possibility")
+ self.error(ERROR_INTERNAL_ERROR, "could not install preupgrade as no transaction")
elif len(pkgs) == 1:
# check if there are any updates to the preupgrade package
po = pkgs[0]

21
pk-install-qt-cmake-build.patch
View File

@ -1,21 +0,0 @@
commit 746b79e082e696b6eae9df10916e00e2a847b138
Author: Richard Hughes <richard@hughsie.com>
Date: Mon Oct 27 16:57:18 2008 +0000
bugfix: install FindQPackageKit.cmake as KPackageKit needs it to build
diff --git a/lib/packagekit-qt/modules/Makefile.am b/lib/packagekit-qt/modules/Makefile.am
index cd3b443..a61e00b 100644
--- a/lib/packagekit-qt/modules/Makefile.am
+++ b/lib/packagekit-qt/modules/Makefile.am
@@ -1,3 +1,9 @@
+cmakemoduledir = $(datadir)/cmake/Modules
+cmakemodule_DATA = \
+ FindQPackageKit.cmake \
+ $(NULL)
+
EXTRA_DIST = \
CMakeLists.txt \
- FindQPackageKit.cmake
+ $(cmakemodule_DATA)
+

28
pk-yum-fix-devel-filtering.patch
View File

@ -1,28 +0,0 @@
commit 99f995788473f4627acb7447aa467a61bc61893a
Author: Richard Hughes <richard@hughsie.com>
Date: Tue Oct 28 12:31:29 2008 +0000
yum: replace the regular expression with four simple comparisons
diff --git a/backends/yum/yumFilter.py b/backends/yum/yumFilter.py
index 9e1b563..855a51f 100644
--- a/backends/yum/yumFilter.py
+++ b/backends/yum/yumFilter.py
@@ -120,8 +120,15 @@ class YumFilter(PackagekitFilter):
'''
Return if the package is development.
'''
- regex = re.compile(r'(-devel)|(-debuginfo)|(-static)|(-libs)')
- return regex.search(pkg.name)
+ if pkg.name.endswith('-devel'):
+ return True
+ if pkg.name.endswith('-debuginfo'):
+ return True
+ if pkg.name.endswith('-static'):
+ return True
+ if pkg.name.endswith('-libs'):
+ return True
+ return False
def _pkg_is_gui(self, pkg):
'''

2
sources
View File

@ -1 +1 @@
c13ecaa4cb300802e9f72d60db7b759c PackageKit-0.3.9.tar.gz
7fc32329aeb80e6f6eeda7db46d4563b PackageKit-0.3.10.tar.gz