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

Merge branch 'f21'

Browse Source 
Conflicts:
	cups-systemd-socket.patch
	cups.spec
This commit is contained in:
Tim Waugh 2014-10-16 14:40:39 +01:00
commit 72a35e5a7f
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cups-systemd-socket.patch
View File

@ -1,6 +1,6 @@
diff -up cups-2.0rc1/cups/usersys.c.systemd-socket cups-2.0rc1/cups/usersys.c diff -up cups-2.0.0/cups/usersys.c.systemd-socket cups-2.0.0/cups/usersys.c
--- cups-2.0rc1/cups/usersys.c.systemd-socket 2014-08-28 17:37:22.000000000 +0200 --- cups-2.0.0/cups/usersys.c.systemd-socket 2014-08-28 16:37:22.000000000 +0100
+++ cups-2.0rc1/cups/usersys.c 2014-09-12 14:35:37.462374923 +0200 +++ cups-2.0.0/cups/usersys.c 2014-10-16 14:39:05.839530224 +0100
@@ -1028,7 +1028,7 @@ cups_read_client_conf( @@ -1028,7 +1028,7 @@ cups_read_client_conf(
struct stat sockinfo; /* Domain socket information */ struct stat sockinfo; /* Domain socket information */
@ -10,9 +10,9 @@ diff -up cups-2.0rc1/cups/usersys.c.systemd-socket cups-2.0rc1/cups/usersys.c
cups_server = CUPS_DEFAULT_DOMAINSOCKET; cups_server = CUPS_DEFAULT_DOMAINSOCKET;
else else
#endif /* CUPS_DEFAULT_DOMAINSOCKET */ #endif /* CUPS_DEFAULT_DOMAINSOCKET */
diff -up cups-2.0rc1/scheduler/main.c.systemd-socket cups-2.0rc1/scheduler/main.c diff -up cups-2.0.0/scheduler/main.c.systemd-socket cups-2.0.0/scheduler/main.c
--- cups-2.0rc1/scheduler/main.c.systemd-socket 2014-09-12 14:59:08.000000000 +0200 --- cups-2.0.0/scheduler/main.c.systemd-socket 2014-10-16 14:39:05.811530076 +0100
+++ cups-2.0rc1/scheduler/main.c 2014-09-12 14:59:23.229299751 +0200 +++ cups-2.0.0/scheduler/main.c 2014-10-16 14:39:05.839530224 +0100
@@ -653,6 +653,12 @@ main(int argc, /* I - Number of comm @@ -653,6 +653,12 @@ main(int argc, /* I - Number of comm
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand."); cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
else else
@ -26,9 +26,9 @@ diff -up cups-2.0rc1/scheduler/main.c.systemd-socket cups-2.0rc1/scheduler/main.
if (fg) if (fg)
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground."); cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
else else
diff -up cups-2.0rc1/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.0rc1/scheduler/org.cups.cupsd.path.in diff -up cups-2.0.0/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.0.0/scheduler/org.cups.cupsd.path.in
--- cups-2.0rc1/scheduler/org.cups.cupsd.path.in.systemd-socket 2014-09-12 14:42:57.942162725 +0200 --- cups-2.0.0/scheduler/org.cups.cupsd.path.in.systemd-socket 2014-03-21 14:50:24.000000000 +0000
+++ cups-2.0rc1/scheduler/org.cups.cupsd.path.in 2014-09-12 14:42:54.254214614 +0200 +++ cups-2.0.0/scheduler/org.cups.cupsd.path.in 2014-10-16 14:39:05.839530224 +0100
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
Description=CUPS Scheduler Description=CUPS Scheduler
@ -38,10 +38,10 @@ diff -up cups-2.0rc1/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.0rc1
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
diff -up cups-2.0rc1/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0rc1/scheduler/org.cups.cupsd.service.in diff -up cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0.0/scheduler/org.cups.cupsd.service.in
--- cups-2.0rc1/scheduler/org.cups.cupsd.service.in.systemd-socket 2014-09-12 14:40:13.000000000 +0200 --- cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket 2014-03-21 14:50:24.000000000 +0000
+++ cups-2.0rc1/scheduler/org.cups.cupsd.service.in 2014-09-12 14:43:17.534887056 +0200 +++ cups-2.0.0/scheduler/org.cups.cupsd.service.in 2014-10-16 14:39:28.636650224 +0100
@@ -2,8 +2,8 @@ @@ -2,9 +2,10 @@
Description=CUPS Scheduler Description=CUPS Scheduler
[Service] [Service]
@ -52,3 +52,5 @@ diff -up cups-2.0rc1/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
+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: 5%{?dist} Release: 6%{?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
* Thu Oct 16 2014 Tim Waugh <twaugh@redhat.com> - 1:2.0.0-6
- Start cupsd systemd service after network.target (bug #1153660).
* Wed Oct 15 2014 Tim Waugh <twaugh@redhat.com> - 1:2.0.0-5 * Wed Oct 15 2014 Tim Waugh <twaugh@redhat.com> - 1:2.0.0-5
- Fix cupsGetPPD3() so it doesn't give the caller an unreadable file - Fix cupsGetPPD3() so it doesn't give the caller an unreadable file
(bug #1150917, STR #4500). (bug #1150917, STR #4500).