rpms/PackageKit/devel PackageKit.spec, 1.69, 1.70 pk-idle-add-pkcontrol-refresh.patch, 1.1, NONE

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26384

Modified Files:
	PackageKit.spec 
Removed Files:
	pk-idle-add-pkcontrol-refresh.patch 
Log Message:
* Mon Oct 20 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.7-2
- Rename as newest upstream has QT binding also:
 * PackageKit-libs -> PackageKit-glib
 * PackageKit-devel -> PackageKit-glib-devel
- Add a BR for comps, and create a link that from the comps icons for the
  new category group icons.
- Create a subpackage for devel files required for out-of-tree backends.



Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- PackageKit.spec	13 Oct 2008 12:03:24 -0000	1.69
+++ PackageKit.spec	20 Oct 2008 12:28:45 -0000	1.70
@@ -8,7 +8,7 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.7
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -20,12 +20,13 @@
 
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
-Requires: PackageKit-libs = %{version}-%{release}
+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}
@@ -85,7 +86,7 @@
 Group: System Environment/Base
 Requires: udev
 Requires: PackageKit
-Obsoletes: udev-packagekit
+Obsoletes: udev-packagekit < %{version}-%{release}
 
 %description udev-helper
 PackageKit-udev-helper tells PackageKit that firmware was not available and was
@@ -97,21 +98,23 @@
 Group: System Environment/Base
 Requires: yum >= 3.0
 Requires: PackageKit
-Obsoletes: yum-packagekit
+Obsoletes: yum-packagekit < %{version}-%{release}
 
 %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 cron
 Summary: Cron job and related utilities for PackageKit
@@ -122,22 +125,33 @@
 %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 devel
-Headers and libraries for PackageKit.
+%description glib-devel
+GLib 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-libs = %{version}-%{release}
+Requires: PackageKit-glib = %{version}-%{release}
 
 %description browser-plugin
 The PackageKit browser plugin allows web sites to offer the ability to
@@ -148,9 +162,9 @@
 Summary: Install GStreamer codecs using PackageKit
 Group: Development/Libraries
 Requires: gstreamer
-Requires: PackageKit-libs = %{version}-%{release}
+Requires: PackageKit-glib = %{version}-%{release}
 Obsoletes: codeina < 0.10.1-10
-Provides:  codeina = 0.10.1-10
+Provides: codeina = 0.10.1-10
 
 %description gstreamer-plugin
 The PackageKit GStreamer plugin allows any Gstreamer application to install
@@ -182,6 +196,14 @@
 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
 
 %clean
@@ -193,9 +215,9 @@
 %postun
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
-%post libs -p /sbin/ldconfig
+%post glib -p /sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun glib -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -211,10 +233,12 @@
 %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/*.conf
 %config %{_sysconfdir}/dbus-1/system.d/*
 %dir %{_datadir}/PackageKit/helpers/test_spawn
+%dir %{_datadir}/PackageKit/icons
 %{_datadir}/PackageKit/helpers/test_spawn/*
 %{_datadir}/man/man1/*.1.gz
 %{_datadir}/PolicyKit/policy/*.policy
@@ -266,7 +290,7 @@
 %{_sysconfdir}/udev/rules.d/*.rules
 /lib/udev/*.sh
 
-%files libs
+%files glib
 %defattr(-,root,root,-)
 %doc README AUTHORS NEWS COPYING
 %dir %{_libdir}/packagekit-backend
@@ -291,14 +315,29 @@
 %{_libexecdir}/pk-gstreamer-install
 %{_libexecdir}/gst-install-plugins-helper
 
-%files devel
+%files glib-devel
 %defattr(-,root,root,-)
 %doc README AUTHORS NEWS COPYING
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
-%{_includedir}/*
+%dir %{_includedir}/packagekit
+%{_includedir}/packagekit/*
+
+%files backend-devel
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%dir %{_includedir}/packagekit-backend
+%{_includedir}/packagekit-backend/*.h
 
 %changelog
+* Mon Oct 20 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.7-2
+- Rename as newest upstream has QT binding also:
+ * PackageKit-libs -> PackageKit-glib
+ * PackageKit-devel -> PackageKit-glib-devel
+- Add a BR for comps, and create a link that from the comps icons for the
+  new category group icons.
+- Create a subpackage for devel files required for out-of-tree backends.
+
 * Mon Oct 13 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.7-1
 - New upstream version
 - Add dynamic groups functionality to the API


--- pk-idle-add-pkcontrol-refresh.patch DELETED ---