remove old patches, already in upstream
This commit is contained in:
parent
4beeaa0a25
commit
2eb3b16a19
@ -1,21 +0,0 @@
|
||||
diff -up system-config-printer-1.5.9/Makefile.am.bz1419175 system-config-printer-1.5.9/Makefile.am
|
||||
--- system-config-printer-1.5.9/Makefile.am.bz1419175 2017-03-08 15:00:02.434967635 +0100
|
||||
+++ system-config-printer-1.5.9/Makefile.am 2017-03-08 15:01:06.992438164 +0100
|
||||
@@ -52,7 +52,7 @@ cupshelpers/config.py: cupshelpers/confi
|
||||
-e "s|\@cupsserverbindir\@|$(cupsserverbindir)|" \
|
||||
$< > $@
|
||||
|
||||
-dbus/org.fedoraproject.Config.Printing.service: dbus/org.fedoraproject.Config.Printing.service.in
|
||||
+dbus/org.fedoraproject.Config.Printing.service: dbus/org.fedoraproject.Config.Printing.service.in $(top_builddir)/config.status Makefile
|
||||
sed \
|
||||
-e "s|\@bindir\@|$(bindir)|" \
|
||||
$< >$@
|
||||
@@ -222,7 +222,7 @@ dbusinterfaces_DATA = \
|
||||
dbus/org.fedoraproject.Config.Printing.xml
|
||||
dbusinterfacesdir = $(datadir)/dbus-1/interfaces/
|
||||
|
||||
-dbusservices_DATA = \
|
||||
+nodist_dbusservices_DATA = \
|
||||
dbus/org.fedoraproject.Config.Printing.service
|
||||
dbusservicesdir = $(datadir)/dbus-1/services/
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -up system-config-printer-1.5.9/jobviewer.py.keyring-workaround system-config-printer-1.5.9/jobviewer.py
|
||||
--- system-config-printer-1.5.9/jobviewer.py.keyring-workaround 2017-06-19 16:40:42.072825363 +0200
|
||||
+++ system-config-printer-1.5.9/jobviewer.py 2017-06-19 16:42:18.250024332 +0200
|
||||
@@ -57,7 +57,7 @@ try:
|
||||
gi.require_version('GnomeKeyring', '1.0')
|
||||
from gi.repository import GnomeKeyring
|
||||
USE_KEYRING=True
|
||||
-except ImportError:
|
||||
+except (ImportError, ValueError):
|
||||
USE_KEYRING=False
|
||||
|
||||
import gettext
|
@ -9,7 +9,7 @@
|
||||
Summary: A printer administration tool
|
||||
Name: system-config-printer
|
||||
Version: 1.5.11
|
||||
Release: 6%{?dist}
|
||||
Release: 7%{?dist}
|
||||
License: GPLv2+
|
||||
URL: https://github.com/%{username}/%{name}
|
||||
Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
||||
@ -188,6 +188,9 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
|
||||
exit 0
|
||||
|
||||
%changelog
|
||||
* Thu Feb 15 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.11-7
|
||||
- remove old patches, already in upstream
|
||||
|
||||
* Thu Feb 15 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.11-6
|
||||
- upstream merge request #93 - fix constructing file dialog
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user