Sort stuff alphabetically

This commit is contained in:
Zdenek Dohnal 2020-11-25 12:30:19 +01:00
parent 66f882d58a
commit a5ebccbfb5

209
cups.spec
View File

@ -124,47 +124,55 @@ Patch33: 0001-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
##### but still I'll leave them in git in case their removal ##### but still I'll leave them in git in case their removal
##### breaks something. ##### breaks something.
Requires: %{name}-filesystem = %{epoch}:%{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-client%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-ipptool%{?_isa} = %{epoch}:%{version}-%{release}
Provides: cupsddk cupsddk-drivers
BuildRequires: pam-devel pkgconf-pkg-config
BuildRequires: pkgconfig(gnutls)
BuildRequires: libacl-devel
BuildRequires: openldap-devel
BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: krb5-devel
BuildRequires: pkgconfig(avahi-client)
BuildRequires: systemd
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: automake BuildRequires: automake
# needed for decompressing functions when reading from gzipped ppds
BuildRequires: zlib-devel
# gcc and gcc-c++ is no longer in buildroot by default # gcc and gcc-c++ is no longer in buildroot by default
# gcc for most of files # gcc for most of files
BuildRequires: gcc BuildRequires: gcc
# gcc-c++ for ppdc and cups-driverd # gcc-c++ for ppdc and cups-driverd
Buildrequires: gcc-c++ Buildrequires: gcc-c++
BuildRequires: krb5-devel
BuildRequires: libacl-devel
# make is used for compilation # make is used for compilation
BuildRequires: make BuildRequires: make
BuildRequires: openldap-devel
BuildRequires: pam-devel
BuildRequires: pkgconf-pkg-config
BuildRequires: pkgconfig(avahi-client)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(gnutls)
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(libusb-1.0)
# Make sure we get postscriptdriver tags. # Make sure we get postscriptdriver tags.
BuildRequires: python3-cups BuildRequires: python3-cups
BuildRequires: systemd
# needed for systemd rpm macros according FPG # needed for systemd rpm macros according FPG
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
# needed for decompressing functions when reading from gzipped ppds
BuildRequires: zlib-devel
%if %{lspp} %if %{lspp}
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
BuildRequires: audit-libs-devel BuildRequires: audit-libs-devel
%endif %endif
# getaddrinfo from glibc needs nss-mdns for resolving mdns .local addresses
# it is needed only for new devices (2012+), so make it only recommended for
# users with older devices
Recommends: nss-mdns
# avahi is needed for mDNS discovery
Recommends: avahi
# We ship udev rules which use setfacl.
Requires: acl
Requires: %{name}-client%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-filesystem = %{epoch}:%{version}-%{release}
# Make sure we have some filters for converting to raster format.
Requires: cups-filters
Requires: %{name}-ipptool%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: dbus Requires: dbus
Requires: systemd
# Requires working PrivateTmp (bug #807672) # Requires working PrivateTmp (bug #807672)
Requires(pre): systemd Requires(pre): systemd
@ -173,19 +181,6 @@ Requires(post): grep, sed
Requires(preun): systemd Requires(preun): systemd
Requires(postun): systemd Requires(postun): systemd
# We ship udev rules which use setfacl.
Requires: systemd
Requires: acl
# Make sure we have some filters for converting to raster format.
Requires: cups-filters
# getaddrinfo from glibc needs nss-mdns for resolving mdns .local addresses
# it is needed only for new devices (2012+), so make it only recommended for
# users with older devices
Recommends: nss-mdns
# avahi is needed for mDNS discovery
Recommends: avahi
%package client %package client
Summary: CUPS printing system - client programs Summary: CUPS printing system - client programs
@ -571,31 +566,43 @@ rm -f %{cups_serverbin}/backend/smb
%files -f %{name}.lang %files -f %{name}.lang
%doc README.md CREDITS.md CHANGES.md %doc README.md CREDITS.md CHANGES.md
%dir %attr(0755,root,lp) %{_sysconfdir}/cups %{_bindir}/cupstestppd
%dir %attr(0755,root,lp) %{_rundir}/cups %{_bindir}/ppd*
%dir %attr(0511,lp,sys) %{_rundir}/cups/certs %{_sbindir}/*
%{_tmpfilesdir}/cups.conf # client subpackage
%{_tmpfilesdir}/cups-lp.conf %exclude %{_sbindir}/lpc.cups
%verify(not md5 size mtime) %config(noreplace) %attr(0640,root,lp) %{_sysconfdir}/cups/cupsd.conf %dir %{cups_serverbin}/daemon
%attr(0640,root,lp) %{_sysconfdir}/cups/cupsd.conf.default %{cups_serverbin}/daemon/cups-deviced
%verify(not md5 size mtime) %config(noreplace) %attr(0640,root,lp) %{_sysconfdir}/cups/cups-files.conf %{cups_serverbin}/daemon/cups-driverd
%attr(0640,root,lp) %{_sysconfdir}/cups/cups-files.conf.default %{cups_serverbin}/daemon/cups-exec
%verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/client.conf %{cups_serverbin}/backend/*
%verify(not md5 size mtime) %config(noreplace) %attr(0600,root,lp) %{_sysconfdir}/cups/classes.conf %{cups_serverbin}/cgi-bin
%verify(not md5 size mtime) %config(noreplace) %attr(0600,root,lp) %{_sysconfdir}/cups/printers.conf %{cups_serverbin}/filter/*
%verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/snmp.conf %{cups_serverbin}/monitor
%attr(0640,root,lp) %{_sysconfdir}/cups/snmp.conf.default %{cups_serverbin}/notifier
%verify(not md5 size mtime) %config(noreplace) %attr(0640,root,lp) %{_sysconfdir}/cups/subscriptions.conf %{_datadir}/cups/drv/sample.drv
%verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/lpoptions %{_datadir}/cups/examples
%dir %attr(0755,root,lp) %{_sysconfdir}/cups/ppd %{_datadir}/cups/mime/mime.types
%dir %attr(0700,root,lp) %{_sysconfdir}/cups/ssl %{_datadir}/cups/mime/mime.convs
%config(noreplace) %{_sysconfdir}/pam.d/cups %{_datadir}/cups/ppdc/*.defs
%{_datadir}/cups/ppdc/*.h
%dir %{_datadir}/cups/templates
%{_datadir}/cups/templates/*.tmpl
%dir %{_datadir}/cups/templates/de
%{_datadir}/cups/templates/de/*.tmpl
%dir %{_datadir}/cups/templates/es
%{_datadir}/cups/templates/es/*.tmpl
%dir %{_datadir}/cups/templates/fr
%{_datadir}/cups/templates/fr/*.tmpl
%dir %{_datadir}/cups/templates/ja
%{_datadir}/cups/templates/ja/*.tmpl
%dir %{_datadir}/cups/templates/pt_BR
%{_datadir}/cups/templates/pt_BR/*.tmpl
%dir %{_datadir}/cups/templates/ru
%{_datadir}/cups/templates/ru/*.tmpl
%dir %{_datadir}/%{name}/usb
%{_datadir}/%{name}/usb/org.cups.usb-quirks
%dir %{_datadir}/%{name}/www %dir %{_datadir}/%{name}/www
%dir %{_datadir}/%{name}/www/de
%dir %{_datadir}/%{name}/www/es
%dir %{_datadir}/%{name}/www/ja
%dir %{_datadir}/%{name}/www/pt_BR
%dir %{_datadir}/%{name}/www/ru
%{_datadir}/%{name}/www/images %{_datadir}/%{name}/www/images
%{_datadir}/%{name}/www/*.css %{_datadir}/%{name}/www/*.css
# 1658673 - html files cannot be docs, because CUPS web ui will not have # 1658673 - html files cannot be docs, because CUPS web ui will not have
@ -610,22 +617,15 @@ rm -f %{cups_serverbin}/backend/smb
%{_datadir}/%{name}/www/ru/index.html %{_datadir}/%{name}/www/ru/index.html
%{_datadir}/%{name}/www/pt_BR/index.html %{_datadir}/%{name}/www/pt_BR/index.html
%{_datadir}/%{name}/www/apple-touch-icon.png %{_datadir}/%{name}/www/apple-touch-icon.png
%dir %{_datadir}/%{name}/usb %dir %{_datadir}/%{name}/www/de
%{_datadir}/%{name}/usb/org.cups.usb-quirks %dir %{_datadir}/%{name}/www/es
%{_unitdir}/%{name}.service %dir %{_datadir}/%{name}/www/ja
%{_unitdir}/%{name}.socket %dir %{_datadir}/%{name}/www/pt_BR
%{_unitdir}/%{name}.path %dir %{_datadir}/%{name}/www/ru
%{_bindir}/cupstestppd %{_datadir}/pixmaps/cupsprinter.png
%{_bindir}/ppd* %dir %attr(1770,root,lp) %{_localstatedir}/spool/cups/tmp
%{cups_serverbin}/backend/* %dir %attr(0710,root,lp) %{_localstatedir}/spool/cups
%{cups_serverbin}/cgi-bin %dir %attr(0755,lp,sys) %{_localstatedir}/log/cups
%dir %{cups_serverbin}/daemon
%{cups_serverbin}/daemon/cups-deviced
%{cups_serverbin}/daemon/cups-driverd
%{cups_serverbin}/daemon/cups-exec
%{cups_serverbin}/notifier
%{cups_serverbin}/filter/*
%{cups_serverbin}/monitor
%{_mandir}/man[1578]/* %{_mandir}/man[1578]/*
# client subpackage # client subpackage
%exclude %{_mandir}/man1/lp*.1.gz %exclude %{_mandir}/man1/lp*.1.gz
@ -642,41 +642,36 @@ rm -f %{cups_serverbin}/backend/smb
%exclude %{_mandir}/man1/ippeveprinter.1.gz %exclude %{_mandir}/man1/ippeveprinter.1.gz
%exclude %{_mandir}/man7/ippevepcl.7.gz %exclude %{_mandir}/man7/ippevepcl.7.gz
%exclude %{_mandir}/man7/ippeveps.7.gz %exclude %{_mandir}/man7/ippeveps.7.gz
%{_sbindir}/* %dir %attr(0755,root,lp) %{_rundir}/cups
# client subpackage %dir %attr(0511,lp,sys) %{_rundir}/cups/certs
%exclude %{_sbindir}/lpc.cups %dir %attr(0755,root,lp) %{_sysconfdir}/cups
%dir %{_datadir}/cups/templates %attr(0640,root,lp) %{_sysconfdir}/cups/cupsd.conf.default
%dir %{_datadir}/cups/templates/de %verify(not md5 size mtime) %config(noreplace) %attr(0640,root,lp) %{_sysconfdir}/cups/cupsd.conf
%dir %{_datadir}/cups/templates/es %verify(not md5 size mtime) %config(noreplace) %attr(0640,root,lp) %{_sysconfdir}/cups/cups-files.conf
%dir %{_datadir}/cups/templates/fr %attr(0640,root,lp) %{_sysconfdir}/cups/cups-files.conf.default
%dir %{_datadir}/cups/templates/ja %verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/client.conf
%dir %{_datadir}/cups/templates/ru %verify(not md5 size mtime) %config(noreplace) %attr(0600,root,lp) %{_sysconfdir}/cups/classes.conf
%dir %{_datadir}/cups/templates/pt_BR %verify(not md5 size mtime) %config(noreplace) %attr(0600,root,lp) %{_sysconfdir}/cups/printers.conf
%{_datadir}/cups/templates/*.tmpl %verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/snmp.conf
%{_datadir}/cups/templates/de/*.tmpl %attr(0640,root,lp) %{_sysconfdir}/cups/snmp.conf.default
%{_datadir}/cups/templates/fr/*.tmpl %verify(not md5 size mtime) %config(noreplace) %attr(0640,root,lp) %{_sysconfdir}/cups/subscriptions.conf
%{_datadir}/cups/templates/es/*.tmpl %verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/lpoptions
%{_datadir}/cups/templates/ja/*.tmpl %dir %attr(0755,root,lp) %{_sysconfdir}/cups/ppd
%{_datadir}/cups/templates/ru/*.tmpl %dir %attr(0700,root,lp) %{_sysconfdir}/cups/ssl
%{_datadir}/cups/templates/pt_BR/*.tmpl
%dir %attr(1770,root,lp) %{_localstatedir}/spool/cups/tmp
%dir %attr(0710,root,lp) %{_localstatedir}/spool/cups
%dir %attr(0755,lp,sys) %{_localstatedir}/log/cups
%{_datadir}/pixmaps/cupsprinter.png
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/cups.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/cups.conf
%{_datadir}/cups/drv/sample.drv %config(noreplace) %{_sysconfdir}/pam.d/cups
%{_datadir}/cups/examples %{_tmpfilesdir}/cups.conf
%{_datadir}/cups/mime/mime.types %{_tmpfilesdir}/cups-lp.conf
%{_datadir}/cups/mime/mime.convs %{_unitdir}/%{name}.service
%{_datadir}/cups/ppdc/*.defs %{_unitdir}/%{name}.socket
%{_datadir}/cups/ppdc/*.h %{_unitdir}/%{name}.path
%files client %files client
%{_sbindir}/lpc.cups
%{_bindir}/cancel* %{_bindir}/cancel*
%{_bindir}/lp* %{_bindir}/lp*
%{_mandir}/man1/lp*.1.gz %{_sbindir}/lpc.cups
%{_mandir}/man1/cancel-cups.1.gz %{_mandir}/man1/cancel-cups.1.gz
%{_mandir}/man1/lp*.1.gz
%{_mandir}/man8/lpc-cups.8.gz %{_mandir}/man8/lpc-cups.8.gz
%files libs %files libs
@ -700,20 +695,20 @@ rm -f %{cups_serverbin}/backend/smb
%files devel %files devel
%{_bindir}/cups-config %{_bindir}/cups-config
%{_libdir}/*.so
%{_includedir}/cups %{_includedir}/cups
%{_libdir}/*.so
%{_mandir}/man1/cups-config.1.gz %{_mandir}/man1/cups-config.1.gz
%{_rpmconfigdir}/macros.d/macros.cups %{_rpmconfigdir}/macros.d/macros.cups
%files lpd %files lpd
%{_unitdir}/cups-lpd.socket
%{_unitdir}/cups-lpd@.service
%{cups_serverbin}/daemon/cups-lpd %{cups_serverbin}/daemon/cups-lpd
%{_mandir}/man8/cups-lpd.8.gz %{_mandir}/man8/cups-lpd.8.gz
%{_unitdir}/cups-lpd.socket
%{_unitdir}/cups-lpd@.service
%files ipptool %files ipptool
%{_bindir}/ipptool
%{_bindir}/ippfind %{_bindir}/ippfind
%{_bindir}/ipptool
%dir %{_datadir}/cups/ipptool %dir %{_datadir}/cups/ipptool
%{_datadir}/cups/ipptool/* %{_datadir}/cups/ipptool/*
%{_mandir}/man1/ipptool.1.gz %{_mandir}/man1/ipptool.1.gz