Hello community, here is the log from the commit of package pam_dbus for openSUSE:Factory checked in at 2020-01-30 09:41:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pam_dbus (Old) and /work/SRC/openSUSE:Factory/.pam_dbus.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pam_dbus" Thu Jan 30 09:41:43 2020 rev:3 rq:768321 version:0.2.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/pam_dbus/pam_dbus.changes 2017-07-30 11:27:32.803983357 +0200 +++ /work/SRC/openSUSE:Factory/.pam_dbus.new.26092/pam_dbus.changes 2020-01-30 09:42:24.677522551 +0100 @@ -1,0 +2,6 @@ +Wed Jan 29 12:52:19 UTC 2020 - Dr. Werner Fink <[email protected]> + +- Add patch py3port.patch + * First try to port pam_dbus to python3 + +------------------------------------------------------------------- New: ---- py3port.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam_dbus.spec ++++++ --- /var/tmp/diff_new_pack.Nsa89i/_old 2020-01-30 09:42:25.437522958 +0100 +++ /var/tmp/diff_new_pack.Nsa89i/_new 2020-01-30 09:42:25.437522958 +0100 @@ -27,6 +27,7 @@ Source1: pam_dbus.8 Source2: pam_dbus-rpmlintrc Patch0: pam_dbus-0.2.1.3.dif +Patch1: py3port.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: dbus-1-devel @@ -34,12 +35,12 @@ BuildRequires: dbus-1-python BuildRequires: gcc-c++ BuildRequires: glib2-devel +BuildRequires: gobject-introspection BuildRequires: libtool BuildRequires: pam-devel -Requires: python -Requires: python-base -Requires: python-gtk -Requires: python-notify +Requires: python3 +Requires: python3-base +Requires: python3-notify2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -51,6 +52,7 @@ test -h %{name}-%{version} || ln -sf darcs-mirror-pam-dbus.debian-%{commit} %{name}-%{version} %setup -q -D %patch0 +%patch1 sed -ri '/^PAM_MODDIR/{ s@/lib/@/%{_lib}/@p }' configure.ac autoreconf -fis ++++++ py3port.patch ++++++ --- handlers/pam-dbus-notify | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) --- handlers/pam-dbus-notify 2014-01-15 00:36:52.000000000 +0100 +++ handlers/pam-dbus-notify 2020-01-29 12:53:20.116433175 +0100 @@ -1,14 +1,16 @@ -#!/usr/bin/python +#!/usr/bin/python3 -import pygtk -import gtk -import gobject +import gi +gi.require_version('Gtk', '3.0') +from gi.repository import Gtk import dbus import dbus.service -import dbus.glib -import pynotify +from dbus.mainloop.glib import DBusGMainLoop +DBusGMainLoop(set_as_default=True) + +import notify2 # list of Notifications around, kept to prevent the garbage collector to handle them. ns = [] @@ -23,7 +25,7 @@ def notify_cb(n, action, pam_cb): ns.remove(n) # Initializite pynotify -if not pynotify.init("pam-dbus"): +if not notify2.init("pam-dbus"): sys.exit(1) # dbus object to answer the request @@ -36,7 +38,7 @@ class PamDbusAnswer(dbus.service.Object) async_callbacks=('ret_cb', 'error_cb')) def MayLogin(self, service, user, rhost, ruser, ret_cb, error_cb): - n = pynotify.Notification("Login request","Someone " + + n = notify2.Notification("Login request","Someone " + ("named %s " % ruser if ruser else "") + "tries to log in via %s " % service + ("from %s " % rhost if rhost else "") + @@ -49,7 +51,7 @@ class PamDbusAnswer(dbus.service.Object) n.connect("closed",lambda n: notify_cb(n,"closed", ret_cb)) if not n.show(): - print "Failed to send notification" + print("Failed to send notification") sys.exit(1) ns.append(n) @@ -58,5 +60,5 @@ system_bus = dbus.SystemBus() name = dbus.service.BusName("de.nomeata.pam_dbus", bus=system_bus) object = PamDbusAnswer(name) -gtk.main() +Gtk.main()
