[PackageKit-commit] packagekit: Branch 'master' - 6 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Wed Apr 16 02:59:17 PDT 2008
backends/zypp/pk-backend-zypp.cpp | 2
backends/zypp/zypp-utils.cpp | 4
contrib/PackageKit.spec.in | 176 ++++++++++++++++++++++++++++++++++++++
contrib/gnome-packagekit.spec.in | 171 ++++++++++++++++++++++++++++++++++++
docs/html/pk-faq.html | 6 -
5 files changed, 353 insertions(+), 6 deletions(-)
New commits:
commit 848b2e4101acf7578eba966d290949edf3715813
Author: Richard Hughes <richard at hughsie.com>
Date: Wed Apr 16 10:58:26 2008 +0100
update yum's status in the faq
diff --git a/docs/html/pk-faq.html b/docs/html/pk-faq.html
index 06ef195..44367d5 100644
--- a/docs/html/pk-faq.html
+++ b/docs/html/pk-faq.html
@@ -401,7 +401,7 @@
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- pisi -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- poldek -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- smart -->
-<td><img src="img/status-bad.png" alt="[no]"/></td><!-- yum -->
+<td><img src="img/status-bad.png" alt="[yes]"/></td><!-- yum -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- yum2 -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- zypp -->
</tr>
@@ -416,7 +416,7 @@
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- pisi -->
<td><img src="img/status-good.png" alt="[yes]"/></td><!-- poldek -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- smart -->
-<td><img src="img/status-bad.png" alt="[no]"/></td><!-- yum -->
+<td><img src="img/status-bad.png" alt="[yes]"/></td><!-- yum -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- yum2 -->
<td><img src="img/status-good.png" alt="[no]"/></td><!-- zypp -->
</tr>
@@ -495,7 +495,7 @@
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- pisi -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- poldek -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- smart -->
-<td><img src="img/status-bad.png" alt="[no]"/></td><!-- yum -->
+<td><img src="img/status-bad.png" alt="[yes]"/></td><!-- yum -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- yum2 -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- zypp -->
</tr>
commit 7e36cf015082cca837396faa48ef65dddd8a6a04
Author: Stefan Haas <shaas at suse.de>
Date: Wed Apr 16 10:45:38 2008 +0200
build whole in get_requires
diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
index 6debf91..0c6c3ed 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -192,7 +192,7 @@ backend_get_requires_thread (PkBackendThread *thread, gpointer data) {
zypp::PoolItem package;
if (solvable.isSystem ()) {
- zypp::ResPool pool = zypp_build_local_pool ();
+ zypp::ResPool pool = zypp_build_pool (true);
gboolean found = FALSE;
commit 5e269ee04d9783ce9de08dd936636bf8b66b96d4
Merge: 88bf5b4... 9b561c5...
Author: Stefan Haas <shaas at suse.de>
Date: Wed Apr 16 09:47:20 2008 +0200
Merge branch 'master' of git+ssh://shaas@git.packagekit.org/srv/git/PackageKit
commit 9b561c5409d81d3b9f6464dc77540bd6f160560e
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Apr 15 23:20:57 2008 +0100
add two sample spec files I use - maybe of interest to people
diff --git a/contrib/PackageKit.spec.in b/contrib/PackageKit.spec.in
new file mode 100644
index 0000000..d543766
--- /dev/null
+++ b/contrib/PackageKit.spec.in
@@ -0,0 +1,176 @@
+%define glib2_version 2.6.0
+%define dbus_version 0.90
+%define dbus_glib_version 0.70
+%define policykit_version 0.7
+%define alphatag #ALPHATAG#
+
+%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+Summary: System daemon that is a DBUS abstraction layer for packages
+Name: PackageKit
+Version: #VERSION#
+Release: 0.#BUILD#%{?alphatag}%{?dist}
+License: GPLv2+
+Group: System Environment/Libraries
+URL: http://packagekit.freedesktop.org
+Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires: dbus >= %{dbus_version}
+Requires: PackageKit-libs = %{version}-%{release}
+Requires: yum-packagekit = %{version}-%{release}
+Requires: yum >= 3.2.6
+
+BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
+BuildRequires: pam-devel
+BuildRequires: libX11-devel
+BuildRequires: libsexy-devel
+BuildRequires: xmlto
+BuildRequires: sqlite-devel
+BuildRequires: NetworkManager-glib-devel
+BuildRequires: PolicyKit-devel >= %{policykit_version}
+BuildRequires: libtool
+BuildRequires: docbook-utils
+BuildRequires: gnome-doc-utils
+BuildRequires: python-devel
+BuildRequires: perl(XML::Parser)
+BuildRequires: gettext
+
+%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 yum-packagekit
+Summary: Tell PackageKit to check for updates when yum exits
+Group: System Environment/Base
+Requires: yum >= 3.0
+Requires: PackageKit
+
+%description -n yum-packagekit
+yum-packagekit 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
+Group: Development/Libraries
+Requires: dbus >= %{dbus_version}
+Requires: %{name} = %{version}-%{release}
+
+%description libs
+Libraries for accessing PackageKit.
+
+%package cron
+Summary: Cron job and related utilities for PackageKit
+Group: System Environment/Base
+Requires: cronie
+Requires: %{name} = %{version}-%{release}
+
+%description cron
+Crontab and utilities for running PackageKit as a cron job.
+
+%package devel
+Summary: Libraries and headers for PackageKit
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: dbus-devel >= %{dbus_version}
+Requires: pkgconfig
+Requires: sqlite-devel
+
+%description devel
+Headers and libraries for PackageKit.
+
+%prep
+%setup -q
+
+%build
+%configure --enable-yum --enable-yum2 --with-default-backend=yum
+
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/libpackagekit*.a
+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
+
+install -m644 docs/spec/pk-structure.png $RPM_BUILD_ROOT%{_datadir}/doc/packagekit/
+
+chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/yumDBUSBackend.py
+chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/PackageKitDbusTest.py
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%dir %{_datadir}/doc/packagekit
+%doc %{_datadir}/doc/packagekit/pk-reference.html
+%doc %{_datadir}/doc/packagekit/pk-structure.png
+
+%dir %{_datadir}/PackageKit
+%dir %{_datadir}/PackageKit/helpers
+%dir %{_sysconfdir}/PackageKit
+%dir %{_localstatedir}/lib/PackageKit
+%dir %{python_sitelib}/packagekit
+%dir %{_localstatedir}/run/PackageKit
+%{python_sitelib}/packagekit/*py*
+%config %{_sysconfdir}/bash_completion.d/pk-completion.bash
+%config(noreplace) %{_sysconfdir}/PackageKit/PackageKit.conf
+%config %{_sysconfdir}/dbus-1/system.d/*
+%{_datadir}/PackageKit/helpers/*
+%{_datadir}/man/man1/*.1.gz
+%{_datadir}/gtk-doc/html/PackageKit
+%{_datadir}/PolicyKit/policy/*.policy
+%{_sbindir}/packagekitd
+%{_bindir}/pkmon
+%{_bindir}/pkcon
+%{_bindir}/packagekit-bugreport.sh
+%{_libexecdir}/pk-import-desktop
+%{_libexecdir}/pk-import-specspo
+%exclude %{_libdir}/libpackagekit*.so.*
+%exclude %{_libdir}/packagekit-backend/*.so
+%ghost %verify(not md5 size mtime) %{_localstatedir}/lib/PackageKit/transactions.db
+%ghost %verify(not md5 size mtime) %{_localstatedir}/run/PackageKit/job_count.dat
+%{_datadir}/dbus-1/system-services/*.service
+%{_libdir}/pm-utils/sleep.d/95packagekit
+%{_libexecdir}/*py*
+
+%files -n yum-packagekit
+%defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/refresh-packagekit.conf
+/usr/lib/yum-plugins/refresh-packagekit.*
+
+%files libs
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%dir %{_libdir}/packagekit-backend
+%{_libdir}/*packagekit*.so.*
+%{_libdir}/packagekit-backend/*.so
+
+%files cron
+%defattr(-,root,root,-)
+%config %{_sysconfdir}/cron.daily/packagekit-background.cron
+%config %{_sysconfdir}/sysconfig/packagekit-background
+
+%files devel
+%defattr(-,root,root,-)
+
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*
+%{_includedir}/*
+
+%changelog
+* #LONGDATE# Richard Hughes <richard at hughsie.com> #VERSION#-0.#BUILD##ALPHATAG#
+- Update from git
diff --git a/contrib/gnome-packagekit.spec.in b/contrib/gnome-packagekit.spec.in
new file mode 100644
index 0000000..3fed43f
--- /dev/null
+++ b/contrib/gnome-packagekit.spec.in
@@ -0,0 +1,171 @@
+%define dbus_version 0.61
+%define alphatag #ALPHATAG#
+
+Summary: GNOME PackageKit Client
+Name: gnome-packagekit
+Version: #VERSION#
+Release: 0.#BUILD#%{?alphatag}%{?dist}
+License: GPLv2+
+Group: Applications/System
+URL: http://www.packagekit.org
+Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.gz
+Source1: system-install-packages
+Source2: system-install-packages.1.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: gtk2 >= 2.12.0
+Requires: gnome-icon-theme
+Requires: libnotify >= 0.4.3
+Requires: dbus-glib >= %{dbus_version}
+Requires: dbus-x11 >= %{dbus_version}
+Requires: PackageKit >= %{packagekit_version}
+Requires: gnome-packagekit-libs = %{version}-%{release}
+Requires(post): scrollkeeper
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
+Requires(postun): scrollkeeper
+Obsoletes: pirut < 1.3.30-3
+Provides: pirut = 1.3.30-3
+
+BuildRequires: libgnomeui-devel
+BuildRequires: libglade2-devel
+BuildRequires: libwnck-devel
+BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: libnotify-devel
+BuildRequires: gnome-panel-devel
+BuildRequires: scrollkeeper
+BuildRequires: gnome-doc-utils >= 0.3.2
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: libtool
+BuildRequires: cairo-devel
+BuildRequires: startup-notification-devel
+BuildRequires: perl(XML::Parser)
+BuildRequires: gnome-doc-utils
+BuildRequires: libsexy-devel
+BuildRequires: PackageKit-devel >= %{packagekit_version}
+BuildRequires: PolicyKit-gnome-devel
+
+%description
+packagekit-gnome provides session applications for the PackageKit API.
+There are several utilities designed for installing, updating and
+removing packages on your system.
+
+%package libs
+Summary: Libraries for accessing PackageKit
+Group: Development/Libraries
+Requires: dbus >= %{dbus_version}
+Requires: %{name} = %{version}-%{release}
+
+%description libs
+Libraries for accessing PackageKit in the GNOME desktop.
+
+%package devel
+Summary: Libraries and headers for gnome-packagekit
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: dbus-devel >= %{dbus_version}
+Requires: pkgconfig
+Requires: sqlite-devel
+
+%description devel
+Headers and libraries for packagekit-gnome.
+
+%prep
+%setup -q
+
+%build
+%configure --disable-scrollkeeper --disable-schemas-install
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+make install DESTDIR=$RPM_BUILD_ROOT
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
+install %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/system-install-packages
+install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/man/man1/system-install-packages.1.gz
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/libpackagekit-gnome*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/libpackagekit-gnome*.la
+
+desktop-file-install --delete-original \
+ --dir=$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ \
+ $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/gpk-update-icon.desktop
+
+for i in gpk-application gpk-update-viewer gpk-install-file gpk-log gpk-prefs gpk-repo ; do
+ desktop-file-install --delete-original \
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
+ $RPM_BUILD_ROOT%{_datadir}/applications/$i.desktop
+done
+
+%find_lang %name
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+ %{_sysconfdir}/gconf/schemas/gnome-packagekit.schemas >/dev/null || :
+scrollkeeper-update -q
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+/usr/bin/update-desktop-database %{_datadir}/applications
+
+%pre
+if [ "$1" -gt 1 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/gnome-packagekit.schemas > /dev/null || :
+fi
+
+%preun
+if [ "$1" -eq 0 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/gnome-packagekit.schemas > /dev/null || :
+fi
+
+%postun
+scrollkeeper-update -q
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+/usr/bin/update-desktop-database %{_datadir}/applications
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{_bindir}/gpk-*
+%{_bindir}/system-install-packages
+%{_datadir}/gnome-packagekit
+%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
+%{_datadir}/man/man1/*.1.gz
+%{_datadir}/gtk-doc/html/gnome-packagekit
+%{_datadir}/gnome/help/gnome-packagekit
+%{_datadir}/omf/gnome-packagekit
+%{_sysconfdir}/xdg/autostart/gpk-update-icon.desktop
+%{_datadir}/applications/gpk-*.desktop
+%exclude %{_libdir}/libpackagekit-gnome*.so.*
+
+%files libs
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_libdir}/*packagekit-gnome*.so.*
+
+%files devel
+%defattr(-,root,root,-)
+
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*
+%{_includedir}/*
+
+%changelog
+* #LONGDATE# Richard Hughes <richard at hughsie.com> #VERSION#-0.#BUILD##ALPHATAG#
+- Update from GIT
+
commit 88bf5b4115dfd13c5953910ec6519f264a809d06
Merge: 87691a5... 92da84c...
Author: Stefan Haas <shaas at suse.de>
Date: Tue Apr 15 13:05:32 2008 +0200
Merge branch 'master' of git+ssh://shaas@git.packagekit.org/srv/git/PackageKit
commit 87691a5df311236f2ad628662b1ae3aad08defe3
Author: Stefan Haas <shaas at suse.de>
Date: Tue Apr 15 12:43:14 2008 +0200
logical error in license-handling
diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp
index 0a78222..7e0916e 100644
--- a/backends/zypp/zypp-utils.cpp
+++ b/backends/zypp/zypp-utils.cpp
@@ -544,13 +544,13 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force)
zypp::ResPool pool = zypp::ResPool::instance ();
for (zypp::ResPool::const_iterator it = pool.begin (); it != pool.end (); it++) {
- if (it->status () == zypp::ResStatus::toBeInstalled && !((*it)->licenseToConfirm ().empty ())) {
+ if (it->status ().isToBeInstalled () && !(it->satSolvable ().lookupStrAttribute (zypp::sat::SolvAttr::eula).empty ())) {
gchar *package_id = zypp_build_package_id_from_resolvable (it->satSolvable ());
pk_backend_eula_required (backend,
"", //eula_id
package_id,
(*it)->vendor ().c_str (),
- (*it)->licenseToConfirm ().c_str ());
+ it->satSolvable ().lookupStrAttribute (zypp::sat::SolvAttr::eula).c_str ());
pk_backend_error_code (backend, PK_ERROR_ENUM_NO_LICENSE_AGREEMENT, "You've to agree/decline a license");
g_free (package_id);
}
More information about the PackageKit-commit
mailing list