rpms/cups
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f21'

Browse Source
This commit is contained in:
Tim Waugh 2014-10-18 15:04:51 +01:00
commit 6865fdab0b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cups-systemd-socket.patch
View File

@ -43,6 +43,7 @@ diff -up cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0.
+++ cups-2.0.0/scheduler/org.cups.cupsd.service.in 2014-10-16 14:39:28.636650224 +0100 +++ cups-2.0.0/scheduler/org.cups.cupsd.service.in 2014-10-16 14:39:28.636650224 +0100
@@ -2,9 +2,10 @@ @@ -2,9 +2,10 @@
Description=CUPS Scheduler Description=CUPS Scheduler
+After=network.target
[Service] [Service]
-ExecStart=@sbindir@/cupsd -l -ExecStart=@sbindir@/cupsd -l
@ -53,4 +54,3 @@ diff -up cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0.
[Install] [Install]
Also=org.cups.cupsd.socket org.cups.cupsd.path Also=org.cups.cupsd.socket org.cups.cupsd.path
WantedBy=printer.target WantedBy=printer.target
+After=network.target

5
cups.spec
View File

@ -11,7 +11,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 2.0.0 Version: 2.0.0
Release: 6%{?dist} Release: 7%{?dist}
License: GPLv2 License: GPLv2
Url: http://www.cups.org/ Url: http://www.cups.org/
Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2 Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
@ -610,6 +610,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Sat Oct 18 2014 Tim Waugh <twaugh@redhat.com> - 1:2.0.0-7
- Fix for last fix (bug #1153660, bug #1154284).
* Thu Oct 16 2014 Tim Waugh <twaugh@redhat.com> - 1:2.0.0-6 * Thu Oct 16 2014 Tim Waugh <twaugh@redhat.com> - 1:2.0.0-6
- Start cupsd systemd service after network.target (bug #1153660). - Start cupsd systemd service after network.target (bug #1153660).