delete patches

This commit is contained in:
xiaoweiwei 2020-01-09 15:15:05 +08:00
parent d2983c85e8
commit 69ba9e1dde
2 changed files with 8 additions and 16 deletions

View File

@ -1,15 +1,12 @@
Name: cups-pk-helper Name: cups-pk-helper
Version: 0.2.6 Version: 0.2.6
Release: 7 Release: 8
Summary: Cups config helper Summary: Cups config helper
License: GPLv2+ License: GPLv2+
URL: http://www.freedesktop.org/wiki/Software/cups-pk-helper/ URL: http://www.freedesktop.org/wiki/Software/cups-pk-helper/
Source0: http://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-%{version}.tar.xz Source0: http://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-%{version}.tar.xz
#Get Patch from fedora
Patch0: polkit_result.patch
BuildRequires: libtool >= 1.4.3 cups-devel >= 1.2 glib2-devel >= 2.29.8 gtk2-devel >= 2.12.0 BuildRequires: libtool >= 1.4.3 cups-devel >= 1.2 glib2-devel >= 2.29.8 gtk2-devel >= 2.12.0
BuildRequires: dbus-glib-devel >= 0.74 polkit-devel >= 0.97 polkit-gnome >= 0.97 BuildRequires: dbus-glib-devel >= 0.74 polkit-devel >= 0.97 polkit-gnome >= 0.97
BuildRequires: intltool >= 0.40.6 gettext-devel >= 0.17 gnome-common >= 2.26 BuildRequires: intltool >= 0.40.6 gettext-devel >= 0.17 gnome-common >= 2.26
@ -38,5 +35,11 @@ This package provides a helper to configure cups.
%{_datadir}/polkit-1/actions/org.opensuse.cupspkhelper.mechanism.policy %{_datadir}/polkit-1/actions/org.opensuse.cupspkhelper.mechanism.policy
%changelog %changelog
* Sat Sep 7 2019 guan yanjie <guanyanjie@huawei.com> - 24-5 * Thu Jan 9 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.2.6-8
- Type:enhancement
- ID:NA
- SUG:NA
- DESC:delete patches
* Sat Sep 7 2019 guan yanjie <guanyanjie@huawei.com> - 0.2.6-7
- Package init for openEuler - Package init for openEuler

View File

@ -1,11 +0,0 @@
--- cups-pk-helper-0.1.3/src/cups-pk-helper-mechanism.c 2011-09-02 11:30:26.000000000 +0200
+++ cups-pk-helper-0.1.3/src/cups-pk-helper-mechanism.c 2011-09-02 11:31:34.000000000 +0200
@@ -291,7 +291,7 @@ _check_polkit_for_action_internal (CphMe
return FALSE;
}
- if (!polkit_authorization_result_get_is_authorized (pk_result)) {
+ if (pk_result == NULL || !polkit_authorization_result_get_is_authorized (pk_result)) {
g_set_error (error,
CPH_MECHANISM_ERROR,
CPH_MECHANISM_ERROR_NOT_PRIVILEGED,