Rename systemd service files to match what the Linux distros use (Issue #30)

11 files changed, 185 insertions, 180 deletions

diff --git a/.gitignore b/.gitignore
index a5e32e600..4bc39c379 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,155 +2,155 @@
 *.bck
 *.cgi
 *.o
-autom4te.cache
-config.h
-config.log
-config.status
-cups-config
-Makedefs
-backend/dnssd
-backend/http
-backend/https
-backend/ipp
-backend/ipps
-backend/lpd
-backend/mdns
-backend/snmp
-backend/socket
-backend/test1284
-backend/testbackend
-backend/testsupplies
-backend/usb
-berkeley/lpc
-berkeley/lpq
-berkeley/lpr
-berkeley/lprm
-cgi-bin/testcgi
-cgi-bin/testhi
-cgi-bin/testhi.index
-cgi-bin/testtemplate
-conf/cups-files.conf
-conf/cupsd.conf
-conf/mime.convs
-conf/pam.std
-conf/snmp.conf
-cups/libcups.dylib
-cups/libcups.2.dylib
-cups/libcups.so
-cups/libcups.so.2
-cups/libcupsimage.dylib
-cups/libcupsimage.2.dylib
-cups/libcupsimage.so
-cups/libcupsimage.so.2
-cups/locale/
-cups/rasterbench
-cups/test.pwg
-cups/test.raster
-cups/testadmin
-cups/testarray
-cups/testcache
-cups/testclient
-cups/testconflicts
-cups/testcreds
-cups/testcups
-cups/testdest
-cups/testfile
-cups/testgetdests
-cups/testhttp
-cups/testi18n
-cups/testipp
-cups/testlang
-cups/testoptions
-cups/testppd
-cups/testpwg
-cups/testraster
-cups/testsnmp
-cups/testthreads
-cups/tlscheck
-desktop/cups.desktop
-doc/index.html
-doc/*/index.html
-filter/commandtops
-filter/gziptoany
-filter/pstops
-filter/rastertoepson
-filter/rastertohp
-filter/rastertolabel
-filter/rastertopwg
-locale/checkpo
-locale/po2strings
-locale/strings2po
-man/mantohtml
-monitor/bcp
-monitor/tbcp
-notifier/dbus
-notifier/mailto
-notifier/rss
-notifier/testnotify
-packaging/cups.list
-ppdc/genstrings
-ppdc/ppd/
-ppdc/ppd2/
-ppdc/ppdc
-ppdc/ppdc-static
-ppdc/ppdhtml
-ppdc/ppdi
-ppdc/ppdi-static
-ppdc/ppdmerge
-ppdc/ppdpo
-ppdc/sample-import.drv
-ppdc/sample.c
-ppdc/testcatalog
-scheduler/convert
-scheduler/cups-deviced
-scheduler/cups-driverd
-scheduler/cups-exec
-scheduler/cups-lpd
-scheduler/cups-lpd.xinetd
-scheduler/cups.sh
-scheduler/cups.xml
-scheduler/cupsd
-scheduler/cupsfilter
-scheduler/org.cups.cups-lpd.plist
-scheduler/org.cups.cups-lpdAT.service
-scheduler/org.cups.cupsd.path
-scheduler/org.cups.cupsd.service
-scheduler/org.cups.cupsd.socket
-scheduler/testlpd
-scheduler/testmime
-scheduler/testspeed
-scheduler/testsub
-systemv/cancel
-systemv/cupsaccept
-systemv/cupsaddsmb
-systemv/cupsctl
-systemv/cupsdisable
-systemv/cupsenable
-systemv/cupsreject
-systemv/cupstestdsc
-systemv/cupstestppd
-systemv/lp
-systemv/lpadmin
-systemv/lpinfo
-systemv/lpmove
-systemv/lpoptions
-systemv/lpstat
-templates/header.tmpl
-templates/*/header.tmpl
-test/cups-str-*.html
-test/*_log-*
-tools/ippevepcl
-tools/ippeveprinter
-tools/ippeveprinter-static
-tools/ippeveps
-tools/ippfind
-tools/ippfind-static
-tools/ipptool
-tools/ipptool-static
-vcnet/.vs
-vcnet/packages
-vcnet/Win32
-vcnet/x64
-xcode/CUPS.xcodeproj/project.xcworkspace/
-xcode/CUPS.xcodeproj/xcuserdata/
+/autom4te.cache
+/config.h
+/config.log
+/config.status
+/cups-config
+/Makedefs
+/backend/dnssd
+/backend/http
+/backend/https
+/backend/ipp
+/backend/ipps
+/backend/lpd
+/backend/mdns
+/backend/snmp
+/backend/socket
+/backend/test1284
+/backend/testbackend
+/backend/testsupplies
+/backend/usb
+/berkeley/lpc
+/berkeley/lpq
+/berkeley/lpr
+/berkeley/lprm
+/cgi-bin/testcgi
+/cgi-bin/testhi
+/cgi-bin/testhi.index
+/cgi-bin/testtemplate
+/conf/cups-files.conf
+/conf/cupsd.conf
+/conf/mime.convs
+/conf/pam.std
+/conf/snmp.conf
+/cups/libcups.dylib
+/cups/libcups.2.dylib
+/cups/libcups.so
+/cups/libcups.so.2
+/cups/libcupsimage.dylib
+/cups/libcupsimage.2.dylib
+/cups/libcupsimage.so
+/cups/libcupsimage.so.2
+/cups/locale/
+/cups/rasterbench
+/cups/test.pwg
+/cups/test.raster
+/cups/testadmin
+/cups/testarray
+/cups/testcache
+/cups/testclient
+/cups/testconflicts
+/cups/testcreds
+/cups/testcups
+/cups/testdest
+/cups/testfile
+/cups/testgetdests
+/cups/testhttp
+/cups/testi18n
+/cups/testipp
+/cups/testlang
+/cups/testoptions
+/cups/testppd
+/cups/testpwg
+/cups/testraster
+/cups/testsnmp
+/cups/testthreads
+/cups/tlscheck
+/desktop/cups.desktop
+/doc/index.html
+/doc/*/index.html
+/filter/commandtops
+/filter/gziptoany
+/filter/pstops
+/filter/rastertoepson
+/filter/rastertohp
+/filter/rastertolabel
+/filter/rastertopwg
+/locale/checkpo
+/locale/po2strings
+/locale/strings2po
+/man/mantohtml
+/monitor/bcp
+/monitor/tbcp
+/notifier/dbus
+/notifier/mailto
+/notifier/rss
+/notifier/testnotify
+/packaging/cups.list
+/ppdc/genstrings
+/ppdc/ppd/
+/ppdc/ppd2/
+/ppdc/ppdc
+/ppdc/ppdc-static
+/ppdc/ppdhtml
+/ppdc/ppdi
+/ppdc/ppdi-static
+/ppdc/ppdmerge
+/ppdc/ppdpo
+/ppdc/sample-import.drv
+/ppdc/sample.c
+/ppdc/testcatalog
+/scheduler/convert
+/scheduler/cups-deviced
+/scheduler/cups-driverd
+/scheduler/cups-exec
+/scheduler/cups-lpd
+/scheduler/cups-lpd.xinetd
+/scheduler/cups-lpdAT.service
+/scheduler/cups.path
+/scheduler/cups.service
+/scheduler/cups.sh
+/scheduler/cups.socket
+/scheduler/cups.xml
+/scheduler/cupsd
+/scheduler/cupsfilter
+/scheduler/org.cups.cups-lpd.plist
+/scheduler/testlpd
+/scheduler/testmime
+/scheduler/testspeed
+/scheduler/testsub
+/systemv/cancel
+/systemv/cupsaccept
+/systemv/cupsaddsmb
+/systemv/cupsctl
+/systemv/cupsdisable
+/systemv/cupsenable
+/systemv/cupsreject
+/systemv/cupstestdsc
+/systemv/cupstestppd
+/systemv/lp
+/systemv/lpadmin
+/systemv/lpinfo
+/systemv/lpmove
+/systemv/lpoptions
+/systemv/lpstat
+/templates/header.tmpl
+/templates/*/header.tmpl
+/test/cups-str-*.html
+/test/*_log-*
+/tools/ippevepcl
+/tools/ippeveprinter
+/tools/ippeveprinter-static
+/tools/ippeveps
+/tools/ippfind
+/tools/ippfind-static
+/tools/ipptool
+/tools/ipptool-static
+/vcnet/.vs
+/vcnet/packages
+/vcnet/Win32
+/vcnet/x64
+/xcode/CUPS.xcodeproj/project.xcworkspace/
+/xcode/CUPS.xcodeproj/xcuserdata/
 
diff --git a/configure b/configure
index 40028aa64..a621b6ae6 100755
--- a/configure
+++ b/configure
@@ -9928,7 +9928,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups-config desktop/cups.desktop doc/index.html scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/org.cups.cups-lpdAT.service scheduler/org.cups.cupsd.path scheduler/org.cups.cupsd.service scheduler/org.cups.cupsd.socket templates/header.tmpl packaging/cups.list $LANGFILES"
+ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups-config desktop/cups.desktop doc/index.html scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/cups-lpdAT.service scheduler/cups.path scheduler/cups.service scheduler/cups.socket templates/header.tmpl packaging/cups.list $LANGFILES"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -10635,10 +10635,10 @@ do
     "scheduler/cups.sh") CONFIG_FILES="$CONFIG_FILES scheduler/cups.sh" ;;
     "scheduler/cups.xml") CONFIG_FILES="$CONFIG_FILES scheduler/cups.xml" ;;
     "scheduler/org.cups.cups-lpd.plist") CONFIG_FILES="$CONFIG_FILES scheduler/org.cups.cups-lpd.plist" ;;
-    "scheduler/org.cups.cups-lpdAT.service") CONFIG_FILES="$CONFIG_FILES scheduler/org.cups.cups-lpdAT.service" ;;
-    "scheduler/org.cups.cupsd.path") CONFIG_FILES="$CONFIG_FILES scheduler/org.cups.cupsd.path" ;;
-    "scheduler/org.cups.cupsd.service") CONFIG_FILES="$CONFIG_FILES scheduler/org.cups.cupsd.service" ;;
-    "scheduler/org.cups.cupsd.socket") CONFIG_FILES="$CONFIG_FILES scheduler/org.cups.cupsd.socket" ;;
+    "scheduler/cups-lpdAT.service") CONFIG_FILES="$CONFIG_FILES scheduler/cups-lpdAT.service" ;;
+    "scheduler/cups.path") CONFIG_FILES="$CONFIG_FILES scheduler/cups.path" ;;
+    "scheduler/cups.service") CONFIG_FILES="$CONFIG_FILES scheduler/cups.service" ;;
+    "scheduler/cups.socket") CONFIG_FILES="$CONFIG_FILES scheduler/cups.socket" ;;
     "templates/header.tmpl") CONFIG_FILES="$CONFIG_FILES templates/header.tmpl" ;;
     "packaging/cups.list") CONFIG_FILES="$CONFIG_FILES packaging/cups.list" ;;
     "$LANGFILES") CONFIG_FILES="$CONFIG_FILES $LANGFILES" ;;
diff --git a/configure.ac b/configure.ac
index 1f75f72f6..f9eb35b83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,10 +70,10 @@ AC_OUTPUT(Makedefs
 	  scheduler/cups.sh
 	  scheduler/cups.xml
 	  scheduler/org.cups.cups-lpd.plist
-	  scheduler/org.cups.cups-lpdAT.service
-	  scheduler/org.cups.cupsd.path
-	  scheduler/org.cups.cupsd.service
-	  scheduler/org.cups.cupsd.socket
+	  scheduler/cups-lpdAT.service
+	  scheduler/cups.path
+	  scheduler/cups.service
+	  scheduler/cups.socket
  	  templates/header.tmpl
           packaging/cups.list
 	  $LANGFILES)
diff --git a/packaging/cups.list.in b/packaging/cups.list.in
index 537c19450..a167a9917 100644
--- a/packaging/cups.list.in
+++ b/packaging/cups.list.in
@@ -1,6 +1,7 @@
 #
 # ESP Package Manager (EPM) file list for CUPS.
 #
+# Copyright © 2020 by Michael R Sweet
 # Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2007 by Easy Software Products, all rights reserved.
 #
@@ -10,8 +11,8 @@
 
 # Product information
 %product CUPS
-%copyright 2007-2019 by Apple Inc.
-%vendor Apple Inc.
+%copyright 2020 by Michael R Sweet, 2007-2019 by Apple Inc.
+%vendor OpenPrinting
 #%license LICENSE
 %readme LICENSE
 %format rpm
@@ -20,8 +21,9 @@
 %format !rpm
 %version @CUPS_VERSION@
 %format all
-%description CUPS is the standards-based, open source printing system developed by
-%description Apple Inc. for macOS® and other UNIX®-like operating systems.
+%description CUPS is the standards-based, open source printing system developed
+%description by Apple Inc. and maintained by OpenPrinting for macOS® and other
+%description UNIX®-like operating systems.
 
 %format rpm
 %provides lpd
diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index d37103c4f..59caee08a 100644
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -3,6 +3,7 @@
 #
 # Original version by Jason McMullan <jmcc@ontv.com>.
 #
+# Copyright © 2020 by Michael R Sweet
 # Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1999-2007 by Easy Software Products, all rights reserved.
 #
@@ -48,7 +49,7 @@ Group: System Environment/Daemons
 Source: https://github.com/apple/cups/releases/download/v%{version}/cups-%{version}-source.tar.gz
 Url: http://www.cups.org
 Packager: Anonymous <anonymous@example.com>
-Vendor: Example Corp
+Vendor: OpenPrinting
 
 # Package names are as defined for Red Hat (and clone) distributions
 BuildRequires: gnutls-devel, pam-devel
@@ -97,7 +98,8 @@ Requires: %{name} = %{epoch}:%{version} xinetd
 
 %description
 CUPS is the standards-based, open source printing system developed by
-Apple Inc. for macOS® and other UNIX®-like operating systems.
+Apple Inc. and maintained by OpenPrinting for macOS® and other UNIX®-like
+operating systems.
 
 %description devel
 This package provides the CUPS headers and development environment.
@@ -126,11 +128,11 @@ rm -rf $RPM_BUILD_ROOT/usr/share/cups/banners $RPM_BUILD_ROOT/usr/share/cups/dat
 
 %post
 %if %{?_with_systemd:1}%{!?_with_systemd:0}
-/bin/systemctl enable org.cups.cupsd.service
+/bin/systemctl enable cups.service
 
 if test $1 -ge 1; then
-	/bin/systemctl stop org.cups.cupsd.service
-	/bin/systemctl start org.cups.cupsd.service
+	/bin/systemctl stop cups.service
+	/bin/systemctl start cups.service
 fi
 
 %else
@@ -150,8 +152,8 @@ fi
 %preun
 %if %{?_with_systemd:1}%{!?_with_systemd:0}
 if test $1 -ge 1; then
-	/bin/systemctl stop org.cups.cupsd.service
-	/bin/systemctl disable org.cups.cupsd.service
+	/bin/systemctl stop cups.service
+	/bin/systemctl disable cups.service
 fi
 
 %else
@@ -164,8 +166,8 @@ fi
 %postun
 %if %{?_with_systemd:1}%{!?_with_systemd:0}
 if test $1 -ge 1; then
-	/bin/systemctl stop org.cups.cupsd.service
-	/bin/systemctl start org.cups.cupsd.service
+	/bin/systemctl stop cups.service
+	/bin/systemctl start cups.service
 fi
 
 %else
@@ -203,7 +205,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{?_with_systemd:1}%{!?_with_systemd:0}
 # SystemD
-/usr/lib/systemd/system/org.cups.cupsd.*
+/usr/lib/systemd/system/cups.*
 
 %else
 # Legacy init support on Linux
@@ -425,7 +427,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %if %{?_with_systemd:1}%{!?_with_systemd:0}
 # SystemD
-/usr/lib/systemd/system/org.cups.cups-lpd*
+/usr/lib/systemd/system/cups-lpd*
 %else
 # Legacy xinetd
 /etc/xinetd.d/cups-lpd
diff --git a/scheduler/Makefile b/scheduler/Makefile
index 442eed620..e56206d9f 100644
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -1,6 +1,7 @@
 #
 # Scheduler Makefile for CUPS.
 #
+# Copyright © 2020 by Michael R Sweet
 # Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2007 by Easy Software Products, all rights reserved.
 #
@@ -194,11 +195,11 @@ 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) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cups-lpd@.service; \
-		$(INSTALL_DATA) org.cups.cups-lpd.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); \
+		$(INSTALL_DATA) cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd@.service; \
+		$(INSTALL_DATA) cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
 	fi
 	if test "x$(XINETD)" != x; then \
 		echo Installing xinetd configuration file for cups-lpd...; \
diff --git a/scheduler/org.cups.cups-lpd.socket b/scheduler/cups-lpd.socket
index eb8445905..eb8445905 100644
--- a/scheduler/org.cups.cups-lpd.socket
+++ b/scheduler/cups-lpd.socket
diff --git a/scheduler/org.cups.cups-lpdAT.service.in b/scheduler/cups-lpdAT.service.in
index 5c7827340..5c7827340 100644
--- a/scheduler/org.cups.cups-lpdAT.service.in
+++ b/scheduler/cups-lpdAT.service.in
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/cups.path.in
index 7c8509fa6..7c8509fa6 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/cups.path.in
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/cups.service.in
index 79d2c403e..79d2c403e 100644
--- a/scheduler/org.cups.cupsd.service.in
+++ b/scheduler/cups.service.in
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/cups.socket.in
index 3c37d7213..3c37d7213 100644
--- a/scheduler/org.cups.cupsd.socket.in
+++ b/scheduler/cups.socket.in