From caebb5eb5194b89da1ff08cca8d35ddfe6b293d3 Mon Sep 17 00:00:00 2001
From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Thu, 16 Oct 2014 01:25:23 +0200
Subject: [PATCH] change systemd service files to gentoo naming scheme

---
 configure.ac                        |  6 +++---
 scheduler/Makefile                  | 14 +++++++-------
 scheduler/cups.path.in              |  8 ++++++++
 scheduler/cups.service.in           | 10 ++++++++++
 scheduler/cups.socket.in            | 12 ++++++++++++
 scheduler/org.cups.cupsd.path.in    |  8 --------
 scheduler/org.cups.cupsd.service.in | 10 ----------
 scheduler/org.cups.cupsd.socket.in  | 12 ------------
 8 files changed, 40 insertions(+), 40 deletions(-)
 create mode 100644 scheduler/cups.path.in
 create mode 100644 scheduler/cups.service.in
 create mode 100644 scheduler/cups.socket.in
 delete mode 100644 scheduler/org.cups.cupsd.path.in
 delete mode 100644 scheduler/org.cups.cupsd.service.in
 delete mode 100644 scheduler/org.cups.cupsd.socket.in

diff --git a/configure.ac b/configure.ac
index 21d7f93..cb5db92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,9 +81,9 @@ AC_OUTPUT(Makedefs
 	  scheduler/cups.sh
 	  scheduler/cups.xml
 	  scheduler/org.cups.cups-lpd.plist
-	  scheduler/org.cups.cupsd.path
-	  scheduler/org.cups.cupsd.service
-	  scheduler/org.cups.cupsd.socket
+	  scheduler/cups.path
+	  scheduler/cups.service
+	  scheduler/cups.socket
  	  templates/header.tmpl
           packaging/cups.list
 	  $LANGFILES)
diff --git a/scheduler/Makefile b/scheduler/Makefile
index c0c54a4..bf1ae32 100644
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -192,7 +192,7 @@ install-data:
 	if test "x$(LAUNCHD_DIR)" != x; then \
 		echo Installing launchd configuration files...; \
 		$(INSTALL_DIR) $(BUILDROOT)$(LAUNCHD_DIR); \
-		$(INSTALL_DATA) org.cups.cupsd.plist $(BUILDROOT)$(LAUNCHD_DIR); \
+		$(INSTALL_DATA) cups.plist $(BUILDROOT)$(LAUNCHD_DIR); \
 		$(INSTALL_DATA) org.cups.cups-lpd.plist $(BUILDROOT)$(LAUNCHD_DIR); \
 	fi
 	if test "x$(SMFMANIFESTDIR)" != x; then \
@@ -203,9 +203,9 @@ install-data:
 	if test "x$(SYSTEMD_DIR)" != x; then \
 		echo Installing systemd configuration files...; \
 		$(INSTALL_DIR) $(BUILDROOT)$(SYSTEMD_DIR); \
-		$(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR); \
-		$(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR); \
-		$(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
+		$(INSTALL_DATA) cups.path $(BUILDROOT)$(SYSTEMD_DIR); \
+		$(INSTALL_DATA) cups.service $(BUILDROOT)$(SYSTEMD_DIR); \
+		$(INSTALL_DATA) cups.socket $(BUILDROOT)$(SYSTEMD_DIR); \
 	fi
 	if test "x$(XINETD)" != x; then \
 		echo Installing xinetd configuration file for cups-lpd...; \
@@ -335,9 +335,9 @@ uninstall:
 	fi
 	if test "x$SYSTEMD_DIR" != x; then \
 		echo Uninstalling systemd files...; \
-		$(RM) $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cupsd.path; \
-		$(RM) $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cupsd.service; \
-		$(RM) $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cupsd.socket; \
+		$(RM) $(BUILDROOT)$(SYSTEMD_DIR)/cups.path; \
+		$(RM) $(BUILDROOT)$(SYSTEMD_DIR)/cups.service; \
+		$(RM) $(BUILDROOT)$(SYSTEMD_DIR)/cups.socket; \
 	fi
 	if test "x$(SMFMANIFESTDIR)" != x; then \
 		echo Uninstalling SMF manifest file...;\
diff --git a/scheduler/cups.path.in b/scheduler/cups.path.in
new file mode 100644
index 0000000..4281d6a
--- /dev/null
+++ b/scheduler/cups.path.in
@@ -0,0 +1,8 @@
+[Unit]
+Description=CUPS Scheduler
+
+[Path]
+PathExistsGlob=@CUPS_CACHEDIR@/d*
+
+[Install]
+WantedBy=multi-user.target
diff --git a/scheduler/cups.service.in b/scheduler/cups.service.in
new file mode 100644
index 0000000..f8912eb
--- /dev/null
+++ b/scheduler/cups.service.in
@@ -0,0 +1,10 @@
+[Unit]
+Description=CUPS Scheduler
+
+[Service]
+ExecStart=@sbindir@/cupsd -l
+Type=simple
+
+[Install]
+Also=cups.socket cups.path
+WantedBy=printer.target
diff --git a/scheduler/cups.socket.in b/scheduler/cups.socket.in
new file mode 100644
index 0000000..cd98aa5
--- /dev/null
+++ b/scheduler/cups.socket.in
@@ -0,0 +1,12 @@
+[Unit]
+Description=CUPS Scheduler
+
+[Socket]
+ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
+ListenStream=[::1]:631
+ListenStream=127.0.0.1:631
+BindIPv6Only=ipv6-only
+ReusePort=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
deleted file mode 100644
index 1bccc6f..0000000
--- a/scheduler/org.cups.cupsd.path.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=CUPS Scheduler
-
-[Path]
-PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
deleted file mode 100644
index 4390016..0000000
--- a/scheduler/org.cups.cupsd.service.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=CUPS Scheduler
-
-[Service]
-ExecStart=@sbindir@/cupsd -l
-Type=simple
-
-[Install]
-Also=org.cups.cupsd.socket org.cups.cupsd.path
-WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
deleted file mode 100644
index cd98aa5..0000000
--- a/scheduler/org.cups.cupsd.socket.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=CUPS Scheduler
-
-[Socket]
-ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-ListenStream=[::1]:631
-ListenStream=127.0.0.1:631
-BindIPv6Only=ipv6-only
-ReusePort=true
-
-[Install]
-WantedBy=sockets.target
-- 
2.0.4