- fix systemd unit dependencies

- rel 2

diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index 260ac29d7d5568e8c3608adf7d826f064494cca4..2b6b88f8054ce8c2a64faac2133953d568399df7 100644 (file)
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -19,21 +19,10 @@ diff -up cups-2.2.12/scheduler/main.c.systemd-socket cups-2.2.12/scheduler/main.
  #endif /* HAVE_ONDEMAND */
    if (fg)
      cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
-diff -up cups-2.2.12/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.12/scheduler/org.cups.cupsd.path.in
---- cups-2.2.12/scheduler/org.cups.cupsd.path.in.systemd-socket        2019-08-16 00:35:30.000000000 +0200
-+++ cups-2.2.12/scheduler/org.cups.cupsd.path.in       2019-08-19 09:31:09.703370325 +0200
-@@ -1,6 +1,6 @@
- [Unit]
- Description=CUPS Scheduler
--PartOf=org.cups.cupsd.service
-+PartOf=cups.service
- 
- [Path]
- PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
 diff -up cups-2.2.12/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.12/scheduler/org.cups.cupsd.service.in
 --- cups-2.2.12/scheduler/org.cups.cupsd.service.in.systemd-socket     2019-08-19 09:31:09.703370325 +0200
 +++ cups-2.2.12/scheduler/org.cups.cupsd.service.in    2019-08-19 09:54:58.890036404 +0200
-@@ -1,13 +1,13 @@
+@@ -1,10 +1,10 @@
  [Unit]
  Description=CUPS Scheduler
  Documentation=man:cupsd(8)
@@ -47,28 +36,3 @@ diff -up cups-2.2.12/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2
  Restart=on-failure
  
  [Install]
--Also=org.cups.cupsd.socket org.cups.cupsd.path
-+Also=cups.socket cups.path
- WantedBy=printer.target
-diff -up cups-2.2.12/scheduler/org.cups.cupsd.socket.in.systemd-socket cups-2.2.12/scheduler/org.cups.cupsd.socket.in
---- cups-2.2.12/scheduler/org.cups.cupsd.socket.in.systemd-socket      2019-08-16 00:35:30.000000000 +0200
-+++ cups-2.2.12/scheduler/org.cups.cupsd.socket.in     2019-08-19 09:31:09.703370325 +0200
-@@ -1,6 +1,6 @@
- [Unit]
- Description=CUPS Scheduler
--PartOf=org.cups.cupsd.service
-+PartOf=cups.service
- 
- [Socket]
- ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-diff -up cups-2.2.12/scheduler/org.cups.cups-lpd.socket.systemd-socket cups-2.2.12/scheduler/org.cups.cups-lpd.socket
---- cups-2.2.12/scheduler/org.cups.cups-lpd.socket.systemd-socket      2019-08-16 00:35:30.000000000 +0200
-+++ cups-2.2.12/scheduler/org.cups.cups-lpd.socket     2019-08-19 09:31:09.703370325 +0200
-@@ -1,6 +1,6 @@
- [Unit]
- Description=CUPS LPD Server Socket
--PartOf=org.cups.cups-lpd.service
-+PartOf=cups-lpd.service
- 
- [Socket]
- ListenStream=515

diff --git a/cups.spec b/cups.spec
index 7d878c4fd8747e8536e4f5800c4dd1e7767eac8e..d3373639f903432bb541c68446aaaef5e3b31c1f 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -12,7 +12,7 @@ Summary(pl.UTF-8):    Ogólny system druku dla Uniksa
 Summary(pt_BR.UTF-8):  Sistema Unix de Impressão
 Name:          cups
 Version:       2.3.3
-Release:       1
+Release:       2
 Epoch:         1
 License:       LGPL v2 (libraries), GPL v2 (the rest)
 Group:         Applications/Printing