Update to PackageKit 0.1.5.
This commit is contained in:
Robin Norwood
parent
f68e3338de
commit
f2d1546abb
@ -1 +1 @@
|
||||
PackageKit-0.1.4.tar.gz
|
||||
PackageKit-0.1.5.tar.gz
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
%define glib2_version 2.6.0
|
||||
%define dbus_version 0.90
|
||||
%define dbus_glib_version 0.70
|
||||
%define policykit_version 0.7
|
||||
|
||||
%{!?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 package management
|
||||
Name: PackageKit
|
||||
Version: 0.1.4
|
||||
Release: 3%{?dist}
|
||||
Version: 0.1.5
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.packagekit.org
|
||||
Source0: http://people.freedesktop.org/~hughsient/releases/PackageKit-%{version}.tar.gz
|
||||
Patch0: polkit.patch
|
||||
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}
|
||||
@ -26,7 +26,7 @@ BuildRequires: libX11-devel
|
||||
BuildRequires: xmlto
|
||||
BuildRequires: sqlite-devel
|
||||
BuildRequires: NetworkManager-glib-devel
|
||||
BuildRequires: PolicyKit-devel >= 0.7
|
||||
BuildRequires: PolicyKit-devel >= %{policykit_version}
|
||||
BuildRequires: libtool
|
||||
BuildRequires: docbook-utils
|
||||
BuildRequires: python-devel
|
||||
@ -64,13 +64,13 @@ 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
|
||||
%patch0 -p1 -b .polkit
|
||||
|
||||
autoconf
|
||||
|
||||
@ -87,7 +87,6 @@ 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
|
||||
|
||||
rm -f $RPM_BUILD_ROOT%{_datadir}/doc/packagekit/pk-reference.html
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
@ -99,10 +98,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc README AUTHORS NEWS COPYING
|
||||
%doc docs/pk* docs/*.css
|
||||
%doc %{_datadir}/doc/packagekit/*.html
|
||||
|
||||
%dir %{_datadir}/PackageKit
|
||||
%dir %{_datadir}/PackageKit/helpers
|
||||
%dir %{_sysconfdir}/PackageKit
|
||||
%dir %{_localstatedir}/lib/PackageKit
|
||||
%dir %{_localstatedir}/run/PackageKit
|
||||
%{_sysconfdir}/bash_completion.d/pk-completion.bash
|
||||
%config(noreplace) %{_sysconfdir}/PackageKit/PackageKit.conf
|
||||
@ -113,9 +114,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_sbindir}/packagekitd
|
||||
%{_bindir}/pkmon
|
||||
%{_bindir}/pkcon
|
||||
%{_bindir}/packagekit-bugreport.sh
|
||||
%ghost %verify(not md5 size mtime) %{_localstatedir}/lib/PackageKit/transactions.db
|
||||
%ghost %verify(not md5 size mtime) %{_localstatedir}/run/PackageKit/job_count.dat
|
||||
%{_localstatedir}/lib/PackageKit/
|
||||
%{_datadir}/dbus-1/system-services/*.service
|
||||
%{python_sitelib}/packagekit
|
||||
|
||||
@ -134,12 +135,16 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
|
||||
%doc docs/pk* docs/*.css docs/*.xsl
|
||||
%{_libdir}/lib*.so
|
||||
%{_libdir}/pkgconfig/*
|
||||
%{_includedir}/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Dec 21 2007 Robin Norwood <rnorwood@redhat.com> - 0.1.5-1
|
||||
- Update to latest upstream version: 0.1.5
|
||||
- Remove polkit.patch for PolicyKit 0.7, no longer needed
|
||||
|
||||
* Mon Dec 17 2007 Robin Norwood <rnorwood@redhat.com> - 0.1.4-3
|
||||
- fix rpm -V issues by ghosting data files
|
||||
- Resolves: rhbz#408401
|
||||
|
||||
28
polkit.patch
28
polkit.patch
@ -1,28 +0,0 @@
|
||||
diff -up PackageKit-0.1.3/configure.ac.polkit PackageKit-0.1.3/configure.ac
|
||||
--- PackageKit-0.1.3/configure.ac.polkit 2007-11-10 10:41:06.000000000 -0500
|
||||
+++ PackageKit-0.1.3/configure.ac 2007-12-09 22:33:56.000000000 -0500
|
||||
@@ -228,11 +228,7 @@ AC_ARG_WITH([security_framework],
|
||||
[Default security framework to use polkit,dummy]))
|
||||
# try and guess this if nothing is listed
|
||||
if test x$with_security_framework = x; then
|
||||
- if test -f /usr/bin/polkit-list-actions ; then
|
||||
- with_security_framework=polkit
|
||||
- else
|
||||
- AC_MSG_ERROR([--with-security-framework explicitly required when not using PolicyKit or RBAC])
|
||||
- fi
|
||||
+ with_security_framework=polkit
|
||||
fi
|
||||
|
||||
AC_DEFINE(security_framework, "$with_security_framework", [default security framework])
|
||||
diff -up PackageKit-0.1.3/src/pk-security-polkit.c.polkit PackageKit-0.1.3/src/pk-security-polkit.c
|
||||
--- PackageKit-0.1.3/src/pk-security-polkit.c.polkit 2007-12-09 22:39:21.000000000 -0500
|
||||
+++ PackageKit-0.1.3/src/pk-security-polkit.c 2007-12-09 22:40:47.000000000 -0500
|
||||
@@ -83,7 +83,7 @@ pk_security_can_do_action (PkSecurity *s
|
||||
return POLKIT_RESULT_NO;
|
||||
}
|
||||
|
||||
- pk_result = polkit_context_can_caller_do_action (security->priv->pk_context, pk_action, pk_caller);
|
||||
+ pk_result = polkit_context_is_caller_authorized (security->priv->pk_context, pk_action, pk_caller, TRUE, NULL);
|
||||
pk_debug ("PolicyKit result = '%s'", polkit_result_to_string_representation (pk_result));
|
||||
|
||||
polkit_action_unref (pk_action);
|
||||
Loading…
Reference in New Issue
Block a user