Tue Nov 11 13:15:56 UTC 2008

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24398

Modified Files:
	.cvsignore PackageKit.spec sources 
Added Files:
	PackageKit-0.3.8-Fedora-Vendor.conf.patch 
Removed Files:
	pk-check-what-requires-search-string.patch 
	pk-dont-blacklist-apostrophes.patch 
	pk-dont-stop-at-first-package.patch 
	pk-handle-restart-x64.patch 
	pk-network-fallback-use-zero-destination.patch 
	pk-ship-yum-install-signature.patch 
	pk-test-local-files-correctly.patch 
	pk-yum-api-broken-fingerprint-now-function.patch 
Log Message:
* Tue Nov 11 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.10-1
- Backport new upstream version from F10.
- Drop all upstreamed patches


PackageKit-0.3.8-Fedora-Vendor.conf.patch:

--- NEW FILE PackageKit-0.3.8-Fedora-Vendor.conf.patch ---
diff -up PackageKit-0.3.8/etc/Vendor.conf.BAD PackageKit-0.3.8/etc/Vendor.conf
--- PackageKit-0.3.8/etc/Vendor.conf.BAD	2008-10-24 16:02:00.000000000 -0400
+++ PackageKit-0.3.8/etc/Vendor.conf	2008-10-24 17:49:27.000000000 -0400
@@ -12,7 +12,7 @@
 # If the value is set to 'none' then no link is shown.
 #
 # default=http://www.packagekit.org/pk-package-not-found.html
-DefaultUrl=http://www.packagekit.org/pk-package-not-found.html
+DefaultUrl=https://fedoraproject.org/wiki/PackageKit_Items_Not_Found#Missing_Package
 
 # The URL which is shown to the user when a codec could not be found.
 # It should explain why certain codecs cannot be used, and perhaps show
@@ -21,7 +21,7 @@ DefaultUrl=http://www.packagekit.org/pk-
 # If the value is set to 'none' then the value of DefaultUrl is used.
 #
 # default=none
-CodecUrl=none
+CodecUrl=https://fedoraproject.org/wiki/PackageKit_Items_Not_Found#Missing_Codec
 
 # The URL which is shown to the user when hardware drivers could not be found.
 # It should explain why some hardware is not supported, and links to futher
@@ -30,7 +30,7 @@ CodecUrl=none
 # If the value is set to 'none' then the value of DefaultUrl is used.
 #
 # default=none
-HardwareUrl=none
+HardwareUrl=https://fedoraproject.org/wiki/PackageKit_Items_Not_Found#Missing_Driver
 
 # The URL which is shown to the user when fonts could not be found.
 # Alternatives should probably be suggested where possible.
@@ -38,7 +38,7 @@ HardwareUrl=none
 # If the value is set to 'none' then the value of DefaultUrl is used.
 #
 # default=none
-FontUrl=none
+FontUrl=https://fedoraproject.org/wiki/PackageKit_Items_Not_Found#Missing_Font
 
 # The URL which is shown to the user when programs handing a mime tpye could not
 # be found. It should probably explain how to use wine if the program is a
@@ -47,17 +47,17 @@ FontUrl=none
 # If the value is set to 'none' then the value of DefaultUrl is used.
 #
 # default=none
-MimeUrl=none
+MimeUrl=https://fedoraproject.org/wiki/PackageKit_Items_Not_Found#Missing_MIME_Support
 
 [Groups]
 
 # The vendor name shown for the 'vendor' group
 #
 # default=My Vendor
-VendorName=My Vendor
+VendorName=Fedora
 
 # The vendor icon name shown for the 'vendor' group
 #
 # default=emblem-favorite
-VendorIcon=emblem-favorite
+VendorIcon=fedora-logo-small
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-9/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	6 Sep 2008 09:49:18 -0000	1.26
+++ .cvsignore	11 Nov 2008 13:15:25 -0000	1.27
@@ -1 +1 @@
-PackageKit-0.2.5.tar.gz
+PackageKit-0.3.10.tar.gz


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-9/PackageKit.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- PackageKit.spec	6 Sep 2008 09:49:18 -0000	1.52
+++ PackageKit.spec	11 Nov 2008 13:15:25 -0000	1.53
@@ -7,7 +7,7 @@
 
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
-Version:   0.2.5
+Version:   0.3.10
 Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
@@ -15,11 +15,19 @@
 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
+
 Requires: dbus >= %{dbus_version}
-Requires: PackageKit-libs = %{version}-%{release}
-Requires: yum-packagekit = %{version}-%{release}
-Requires: yum >= 3.2.6
+Requires: dbus-glib >= %{dbus_glib_version}
+Requires: PackageKit-glib = %{version}-%{release}
+Requires: PackageKit-udev-helper = %{version}-%{release}
+Requires: PackageKit-yum-plugin = %{version}-%{release}
+Requires: PackageKit-yum = %{version}-%{release}
 Requires: shared-mime-info
+Requires: python-sqlite2
+Requires: comps-extras
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
@@ -38,42 +46,89 @@
 BuildRequires: perl(XML::Parser)
 BuildRequires: intltool
 BuildRequires: gettext
+BuildRequires: xulrunner-devel
+BuildRequires: libarchive-devel
+BuildRequires: gstreamer-devel
+BuildRequires: gstreamer-plugins-base-devel
+BuildRequires: qt4-devel
+BuildRequires: cppunit-devel
 
-%description 
+%description
 PackageKit is a D-Bus abstraction layer that allows the session user
 to manage packages in a secure way using a cross-distro,
 cross-architecture API.
 
-%package -n udev-packagekit
+%package yum
+Summary: PackageKit YUM backend
+Group: System Environment/Libraries
+Requires: yum >= 3.2.19
+Requires: %{name} = %{version}-%{release}
+
+%description yum
+A backend for PackageKit to enable yum functionality.
+
+%package smart
+Summary: PackageKit SMART backend
+Group: System Environment/Libraries
+Requires: smart
+Requires: %{name} = %{version}-%{release}
+
+%description smart
+A backend for PackageKit to enable SMART functionality.
+
+%package docs
+Summary: Documentation for PackageKit
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description docs
+API docs for PackageKit.
+
+%package udev-helper
 Summary: Tell PackageKit to install firmware that udev requires
 Group: System Environment/Base
 Requires: udev
 Requires: PackageKit
+Obsoletes: udev-packagekit < %{version}-%{release}
 
-%description -n udev-packagekit
-udev-packagekit tells PackageKit that firmware was not available and was
+%description udev-helper
+PackageKit-udev-helper tells PackageKit that firmware was not available and was
 needed. This allows PackageKit to do the right thing and prompt for
 the firmware to be installed.
 
-%package -n yum-packagekit
+%package yum-plugin
 Summary: Tell PackageKit to check for updates when yum exits
 Group: System Environment/Base
 Requires: yum >= 3.0
 Requires: PackageKit
+Obsoletes: yum-packagekit < %{version}-%{release}
 
-%description -n yum-packagekit
-yum-packagekit tells PackageKit to check for updates when yum exits.
+%description yum-plugin
+PackageKit-yum-plugin tells PackageKit to check for updates when yum exits.
 This way, if you run 'yum update' and install all available updates, puplet
 will almost instantly update itself to reflect this.
 
-%package libs
-Summary: Libraries for accessing PackageKit
+%package glib
+Summary: GLib libraries for accessing PackageKit
 Group: Development/Libraries
 Requires: dbus >= %{dbus_version}
 Requires: %{name} = %{version}-%{release}
+Obsoletes: PackageKit-libs < %{version}-%{release}
+Provides: PackageKit-libs = %{version}-%{release}
 
-%description libs
-Libraries for accessing PackageKit.
+%description glib
+GLib libraries for accessing PackageKit.
+
+%package qt
+Summary: QT libraries for accessing PackageKit
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+# 2 short-lived rawhide pkgs
+Obsoletes: packagekit-qt < 0.3.1
+Obsoletes: qpackagekit < 0.3.1-2
+
+%description qt
+QT libraries for accessing PackageKit.
 
 %package cron
 Summary: Cron job and related utilities for PackageKit
@@ -84,22 +139,70 @@
 %description cron
 Crontab and utilities for running PackageKit as a cron job.
 
-%package devel
-Summary: Libraries and headers for PackageKit
+%package glib-devel
+Summary: GLib Libraries and headers for PackageKit
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: dbus-devel >= %{dbus_version}
 Requires: pkgconfig
 Requires: sqlite-devel
+Requires: PackageKit-glib = %{version}-%{release}
+Obsoletes: PackageKit-devel < %{version}-%{release}
+Provides: PackageKit-devel = %{version}-%{release}
+
+%description glib-devel
+GLib headers and libraries for PackageKit.
+
+%package qt-devel
+Summary: QT Libraries and headers for PackageKit
+Group: Development/Libraries
+Requires: %{name}-qt = %{version}-%{release}
+Requires: pkgconfig
+# 2 short-lived rawhide pkgs
+Obsoletes: packagekit-qt-devel < 0.3.1
+Obsoletes: qpackagekit-devel < 0.3.1-2
+
+%description qt-devel
+QT headers and libraries for PackageKit.
+
+%package backend-devel
+Summary: Headers to compile out of tree PackageKit backends
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description backend-devel
+Headers to compile out of tree PackageKit backends.
+
+%package browser-plugin
+Summary: Browser Plugin for PackageKit
+Group: Development/Libraries
+Requires: gtk2
+Requires: PackageKit-glib = %{version}-%{release}
+Requires: mozilla-filesystem
+
+%description browser-plugin
+The PackageKit browser plugin allows web sites to offer the ability to
+users to install and update packages from configured repositories
+using PackageKit.
 
-%description devel
-Headers and libraries for PackageKit.
+%package gstreamer-plugin
+Summary: Install GStreamer codecs using PackageKit
+Group: Development/Libraries
+Requires: gstreamer
+Requires: PackageKit-glib = %{version}-%{release}
+Obsoletes: codeina < 0.10.1-10
+Provides: codeina = 0.10.1-10
+
+%description gstreamer-plugin
+The PackageKit GStreamer plugin allows any Gstreamer application to install
+codecs from configured repositories using PackageKit.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%configure --enable-yum --enable-yum2 --with-default-backend=yum --disable-local
+%configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
 
 make %{?_smp_mflags}
 
@@ -111,9 +214,23 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/libpackagekit*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.a
-
-chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/yumDBUSBackend.py
+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
+ln -s pk-gstreamer-install gst-install-plugins-helper
+popd > /dev/null
+
+# create a link that from the comps icons to PK, as PackageKit frontends
+# cannot add /usr/share/pixmaps/comps to the icon search path as some distros
+# do not use comps. Patching this in the frontend is not a good idea, as there
+# are multiple frontends in multiple programming languages.
+pushd ${RPM_BUILD_ROOT}%{_datadir}/PackageKit > /dev/null
+ln -s ../pixmaps/comps icons
+popd > /dev/null
 
 %find_lang %name
 
@@ -123,76 +240,149 @@
 %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 || :
 
-%post libs -p /sbin/ldconfig
+%post glib -p /sbin/ldconfig
+%post qt -p /sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun glib -p /sbin/ldconfig
+%postun qt -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README AUTHORS NEWS COPYING 
+%doc README AUTHORS NEWS COPYING
 %dir %{_datadir}/PackageKit
 %dir %{_datadir}/PackageKit/helpers
 %dir %{_sysconfdir}/PackageKit
 %dir %{_localstatedir}/lib/PackageKit
 %dir %{python_sitelib}/packagekit
-%dir %{_localstatedir}/run/PackageKit
+%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
+%dir %{_libdir}/packagekit-backend
 %config %{_sysconfdir}/bash_completion.d/pk-completion.bash
-%config(noreplace) %{_sysconfdir}/PackageKit/PackageKit.conf
+%config(noreplace) %{_sysconfdir}/PackageKit/*.conf
 %config %{_sysconfdir}/dbus-1/system.d/*
-%{_datadir}/PackageKit/helpers/*
+%dir %{_datadir}/PackageKit/helpers/test_spawn
+%dir %{_datadir}/PackageKit/icons
+%{_datadir}/PackageKit/helpers/test_spawn/*
 %{_datadir}/man/man1/*.1.gz
-%{_datadir}/gtk-doc/html/PackageKit
 %{_datadir}/PolicyKit/policy/*.policy
-%{_datadir}/mime/packages/packagekit-catalog.xml
+%{_datadir}/mime/packages/packagekit-*.xml
+%{_datadir}/PackageKit/pk-upgrade-distro.sh
 %{_sbindir}/packagekitd
 %{_bindir}/pkmon
 %{_bindir}/pkcon
+%{_bindir}/pkgenpack
 %{_bindir}/packagekit-bugreport.sh
-%{_libexecdir}/pk-import-desktop
-%{_libexecdir}/pk-import-specspo
 %exclude %{_libdir}/libpackagekit*.so.*
-%exclude %{_libdir}/packagekit-backend/*.so
+%{_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*
 
-%files -n yum-packagekit
+%files docs
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_datadir}/gtk-doc/html/PackageKit
+
+%files smart
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_libdir}/packagekit-backend/libpk_backend_smart.so
+%dir %{_datadir}/PackageKit/helpers/smart
+%{_datadir}/PackageKit/helpers/smart/*
+
+%files yum
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_libdir}/packagekit-backend/libpk_backend_yum.so
+%dir %{_datadir}/PackageKit/helpers/yum
+%{_datadir}/PackageKit/helpers/yum/*
+
+%files yum-plugin
 %defattr(-, root, root)
+%doc README AUTHORS NEWS COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/refresh-packagekit.conf
 /usr/lib/yum-plugins/refresh-packagekit.*
 
-%files -n udev-packagekit
+%files udev-helper
 %defattr(-, root, root)
+%doc README AUTHORS NEWS COPYING
 %{_sysconfdir}/udev/rules.d/*.rules
 /lib/udev/*.sh
 
-%files libs
+%files glib
 %defattr(-,root,root,-)
-%doc README AUTHORS NEWS COPYING 
-%dir %{_libdir}/packagekit-backend
-%{_libdir}/*packagekit*.so.*
-%{_libdir}/packagekit-backend/*.so
+%doc README AUTHORS NEWS COPYING
+%{_libdir}/*packagekit-glib*.so.*
+
+%files qt
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_libdir}/*packagekit-qt*.so.*
 
 %files cron
 %defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
 %config %{_sysconfdir}/cron.daily/packagekit-background.cron
-%config %{_sysconfdir}/sysconfig/packagekit-background
+%config(noreplace) %{_sysconfdir}/sysconfig/packagekit-background
+
+%files browser-plugin
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_libdir}/mozilla/plugins/packagekit-plugin.so
 
-%files devel
+%files gstreamer-plugin
 %defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_libexecdir}/pk-gstreamer-install
+%{_libexecdir}/gst-install-plugins-helper
 
-%{_libdir}/lib*.so
-%{_libdir}/pkgconfig/*
-%{_includedir}/*
+%files glib-devel
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_libdir}/libpackagekit-glib*.so
+%{_libdir}/pkgconfig/packagekit-glib.pc
+%dir %{_includedir}/PackageKit
+%dir %{_includedir}/PackageKit/packagekit-glib
+%{_includedir}/PackageKit/packagekit-glib/*.h
+
+%files qt-devel
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_libdir}/libpackagekit-qt*.so
+%{_libdir}/pkgconfig/packagekit-qt.pc
+%dir %{_includedir}/PackageKit
+%dir %{_includedir}/PackageKit/packagekit-qt
+%{_includedir}/PackageKit/packagekit-qt/QPackageKit
+%{_includedir}/PackageKit/packagekit-qt/*.h
+%{_datadir}/cmake/Modules/FindQPackageKit.cmake
+
+%files backend-devel
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%dir %{_includedir}/PackageKit
+%dir %{_includedir}/PackageKit/backend
+%{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Tue Nov 11 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.10-1
+- Backport new upstream version from F10.
+- Drop all upstreamed patches
+
 * Sat Sep 06 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.5-1
 - New upstream version, only bugfixes.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-9/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	6 Sep 2008 09:49:18 -0000	1.27
+++ sources	11 Nov 2008 13:15:26 -0000	1.28
@@ -1 +1 @@
-dc86dfa60b48e58a3a3aa91a355b2edf  PackageKit-0.2.5.tar.gz
+7fc32329aeb80e6f6eeda7db46d4563b  PackageKit-0.3.10.tar.gz


--- pk-check-what-requires-search-string.patch DELETED ---


--- pk-dont-blacklist-apostrophes.patch DELETED ---


--- pk-dont-stop-at-first-package.patch DELETED ---


--- pk-handle-restart-x64.patch DELETED ---


--- pk-network-fallback-use-zero-destination.patch DELETED ---


--- pk-ship-yum-install-signature.patch DELETED ---


--- pk-test-local-files-correctly.patch DELETED ---


--- pk-yum-api-broken-fingerprint-now-function.patch DELETED ---


