system-config-printer-1.5.11-1

s/system-config-printer/system-config-printer-vl.spec

@@ -7,49 +7,50 @@
 Summary: A printer administration tool
 Summary(ja): プリンタ管理ツール
 Name: system-config-printer
-Version: 1.4.8
-Release: 2%{?_dist_release}
+Version: 1.5.11
+Release: 1%{?_dist_release}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 
-Source0: http://cyberelk.net/tim/data/system-config-printer/1.4/system-config-printer-%{version}.tar.xz
-Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
-Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
+Source0: https://github.com/zdohnal/system-config-printer/releases/download/%{version}/system-config-printer-%{version}.tar.xz
 
-Source10: %{name}-1.3.2-ja.po
-
-Patch0: pycups-1.9.66-cups-server-remote-printers.patch
-Patch21: %{name}-1.3.2-ppd-translation.patch
+Patch01: system-config-printer-authdialog.patch
+Patch02: 0001-Use-ValueError-instead-of-ImportError-to-catch-excep.patch
+Patch03: 0001-Require-proper-version-of-GDK-and-GTK-in-scp-dbus-se.patch
+Patch04: 0001-Set-programe-name-for-scp-dbus-service-as-well.patch
+Patch05: 0001-require-Gtk-and-Gdk-version-3.0-in-asyncpk1.py.patch
+Patch06: 0001-encoding-Modified-to-use-utf-8-in-fdopen.patch
+Patch07: 0001-Fallback-to-using-LC_CTYPE-if-LC_MESSAGES-is-empty-a.patch
+Patch08: 0001-define-classes-for-Secret-only-when-libsecret-is-ins.patch
+Patch09: 0001-Fix-typo-in-debugprint-call-https-github.com-zdohnal.patch
+Patch10: 0001-Fix-TypeError-raised-by-debugprint-call.patch
+Patch11: 0001-dbus-remove-deprecated-at_console-statement.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: cups-devel >= 1.2
-BuildRequires: glib2-devel
-BuildRequires: python-devel >= 2.5
-BuildRequires: gnutls-devel
-BuildRequires: libsmbclient-devel >= 3.2
 BuildRequires: desktop-file-utils >= 0.2.92
-BuildRequires: gettext
+BuildRequires: gettext-devel
 BuildRequires: intltool
-BuildRequires: xmlto
-BuildRequires: python-tools
 BuildRequires: libusb1-devel
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: xmlto
+BuildRequires: python3-devel
+BuildRequires: python3-rpm-macros
 BuildRequires: eudev-libudev-devel
-BuildRequires: eudev
-BuildRequires: epydoc
 
-Requires: pygtk2
-Requires: pygobject
-Requires: python-pycurl
-Requires: desktop-file-utils
+Requires: python3-pygobject
+Requires: gtk3
+Requires: desktop-file-utils >= 0.2.92
 Requires: dbus-x11
+Requires: dbus-python3
 Requires: system-config-printer-libs = %{version}-%{release}
-Requires: gnome-icon-theme
 Requires: notification-daemon
-Requires: notify-python
-Requires: libxml2-python
-Requires: libgnome-keyring
+Requires: libnotify
+Requires: python3-pycairo
+#Requires: python3-firewall
+Requires: libcanberra-gtk3
 
 Obsoletes: system-config-printer-gui <= 0.6.152
 Provides: system-config-printer-gui = 0.6.152
@@ -65,9 +66,16 @@ the user to configure a CUPS print server.
 Summary: Libraries and shared code for printer administration tool
 Summary(ja): Libraries and shared code for printer administration tool
 Group: System Environment/Base
-Requires: python
-Provides: pycups = %{pycups_version}
-Provides: pysmbc = %{pysmbc_version}
+Requires: python3-cups >= 1.9.60
+Requires: python3-pycurl
+Requires: gobject-introspection
+Requires: python3-pygobject
+Requires: gtk3
+Requires: dbus-python3
+Requires: python3-requests
+Suggests: python3-smbc
+BuildArch: noarch
+Obsoletes: %{name}-libs < 1.3.12-10
 
 %description libs
 The common code used by both the graphical and non-graphical parts of
@@ -85,28 +93,24 @@ The udev rules and helper programs for automatically configuring USB
 printers.
 
 %prep
-%setup -q -a 1 -a 2
-
-pushd pycups-%{pycups_version}
-%patch0 -p1 -b .pycups
-popd
-%patch21 -p1 -b .ppd-translation
-
-cp -f %{SOURCE10} po/ja.po
+%setup -q
+
+# all backported from upstream
+%patch01 -p1 -b .authdialog
+%patch02 -p1 -b .upstream0
+%patch03 -p1 -b .upstream1
+%patch04 -p1 -b .upstream2
+%patch05 -p1 -b .upstream3
+%patch06 -p1 -b .upstream4
+%patch07 -p1 -b .upstream5
+%patch08 -p1 -b .upstream6
+%patch09 -p1 -b .upstream7
+%patch10 -p1 -b .upstream8
+%patch11 -p1 -b .deprecate-at-console
 
 %build
-export CFLAGS="$CFLAGS -Wno-implicit-function-declaration"
 %configure --with-udev-rules
-
-pushd pycups-%{pycups_version}
-make
-make doc
-popd
-
-pushd pysmbc-%{pysmbc_version}
-make
-make doc
-popd
+make %{?_smp_mflags}
 
 %install
 rm -rf %buildroot
@@ -114,14 +118,6 @@ make DESTDIR=%buildroot install \
      udevrulesdir=/lib/udev/rules.d \
      udevhelperdir=/lib/udev
 
-pushd pycups-%{pycups_version}
-make DESTDIR=%buildroot install
-popd
-
-pushd pysmbc-%{pysmbc_version}
-make DESTDIR=%buildroot install
-popd
-
 %{__mkdir_p} %buildroot%{_localstatedir}/run/udev-configure-printer
 touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 
@@ -130,41 +126,28 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 %clean
 rm -rf %buildroot
 
-%post
-/bin/rm -f /var/cache/foomatic/foomatic.pickle
-exit 0
 
 %files libs -f system-config-printer.lang
 %defattr(-,root,root,-)
-%doc --parents pycups-%{pycups_version}/{ChangeLog,README,NEWS,TODO,examples,html}
-%doc --parents pysmbc-%{pysmbc_version}/{ChangeLog,README,NEWS,TODO,test.py,html}
+%license COPYING
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.redhat.NewPrinterNotification.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf
 %dir %{_sysconfdir}/cupshelpers
 %config(noreplace) %{_sysconfdir}/cupshelpers/preferreddrivers.xml
-%{python_sitearch}/cups.so
-%{python_sitearch}/_smbc.so
-%dir %{python_sitearch}/smbc
-%{python_sitearch}/smbc/*.py*
-%ifarch x86_64
-%{python_sitearch}/*.egg-info
-%endif
-%dir %{python_sitelib}/cupshelpers
-%{python_sitelib}/cupshelpers/*.py*
-%{python_sitelib}/*.egg-info
-%{_rpmconfigdir}/fileattrs/psdriver.attr
-%{_rpmconfigdir}/postscriptdriver.prov
+%{python3_sitelib}/cupshelpers
+%{python3_sitelib}/cupshelpers-*.egg-info
 
 %files udev
 %defattr(-,root,root,-)
 /lib/udev/rules.d/*.rules
 /lib/udev/udev-*-printer
 %dir %{_localstatedir}/run/udev-configure-printer
-%verify(not md5 size mtime) %config(noreplace,missingok) %attr(0644,root,root) %{_localstatedir}/run/udev-configure-printer/usb-uris
+%ghost %verify(not md5 size mtime) %config(noreplace,missingok) %attr(0644,root,root) %{_localstatedir}/run/udev-configure-printer/usb-uris
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog README
+%license COPYING
+%doc ChangeLog NEWS ABOUT-NLS AUTHORS ChangeLog-OLD
 %{_bindir}/%{name}
 %{_bindir}/%{name}-applet
 %{_bindir}/install-printerdriver
@@ -180,12 +163,16 @@ exit 0
 %{_datadir}/%{name}/xml/*.py*
 %dir %{_datadir}/%{name}/ui
 %{_datadir}/%{name}/ui/*.ui
-%{_datadir}/appdata/system-config-printer.appdata.xml
+%{_datadir}/metainfo/system-config-printer.appdata.xml
 %{_datadir}/applications/system-config-printer.desktop
 %{_sysconfdir}/xdg/autostart/print-applet.desktop
 %{_mandir}/man1/*
 
 %changelog
+* Thu Apr 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.11-1
+- new upstream release.
+- made to run with python3.
+
 * Sun Nov  1 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.8-2
 - removed R:foomatic.