X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cups.spec;h=eefd92ffd4f6f5d7e0fea5949af13adf7215dd2e;hb=HEAD;hp=a70b25b18eae8455192f70e82dd34cf55a90e3fa;hpb=4f7fe86036a899da54c639db4950e6282f696dd4;p=packages%2Fcups.git diff --git a/cups.spec b/cups.spec index a70b25b..eb31b5c 100644 --- a/cups.spec +++ b/cups.spec @@ -1,36 +1,31 @@ # # Conditional build: -%bcond_with gnutls # use GNU TLS for SSL/TLS support (instead of OpenSSL) -%bcond_without dnssd -%bcond_without ldap # do not include LDAP support -%bcond_without gssapi # do not include GSSAPI support -%bcond_without php # don't build PHP extension/support in web interface -%bcond_without perl # don't build Perl extension/support in web interface -%bcond_without python # don't build Python support in web interface -%bcond_without slp # do not include SLP support -%bcond_without static_libs # don't build static library -# -%include /usr/lib/rpm/macros.perl -%define pdir CUPS +%bcond_without gnutls # use GNU TLS for SSL/TLS support +%bcond_with dnssd # DNS Service Discovery support via dns_sd API (obsoleted by Avahi patch) +%bcond_without avahi # DNS Service Discovery support via Avahi +%bcond_without gssapi # GSSAPI support +%bcond_with lspp # audit and SELinux label support (lspp patch) +%bcond_with tcp_wrappers # tcp_wrappers/libwrap support +%bcond_without static_libs # static library +%bcond_without systemd # systemd Summary(pl.UTF-8): Ogólny system druku dla Uniksa Summary(pt_BR.UTF-8): Sistema Unix de Impressão Name: cups -Version: 1.4.6 +Version: 2.4.8 Release: 1 Epoch: 1 -License: LGPL v2 (libraries), GPL v2 (the rest) + openssl exception +License: LGPL v2 (libraries), GPL v2 (the rest) Group: Applications/Printing -Source0: http://ftp.easysw.com/pub/cups/%{version}/%{name}-%{version}-source.tar.bz2 -# Source0-md5: de8fb5a29c36554925c0c6a6e2c0dae1 +Source0: https://github.com/OpenPrinting/cups/releases/download/v%{version}/cups-%{version}-source.tar.gz +# Source0-md5: 3fdd9a5249f090cd35e324246ef0e3e4 Source1: %{name}.init Source2: %{name}.pamd Source3: %{name}.logrotate Source4: %{name}.mailto.conf Source5: %{name}-lpd.inetd Source6: %{name}-modprobe.conf -# svn diff http://svn.easysw.com/public/cups/tags/release-1.4.3/ http://svn.easysw.com/public/cups/branches/branch-1.4/ > cups-branch.diff -# + drop config-scripts/cups-common.m4 change +Source7: %{name}.tmpfiles Patch0: %{name}-config.patch Patch2: %{name}-options.patch Patch3: %{name}-man_pages_linking.patch @@ -42,43 +37,57 @@ Patch9: %{name}-verbose-compilation.patch Patch10: %{name}-peercred.patch Patch11: %{name}-usb.patch Patch12: %{name}-desktop.patch -URL: http://www.cups.org/ +Patch15: reactivate_recommended_driver.patch +Patch16: read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch +Patch18: %{name}-final-content-type.patch +Patch102: cups-banners.patch +Patch103: cups-pid.patch +Patch104: cups-eggcups.patch +Patch105: cups-driverd-timeout.patch +Patch107: cups-res_init.patch +Patch108: cups-filter-debug.patch +Patch110: cups-dnssd-deviceid.patch + +Patch113: cups-dymo-deviceid.patch +Patch114: cups-freebind.patch +Patch115: cups-ipp-multifile.patch +Patch116: cups-web-devices-timeout.patch +Patch117: cups-lspp.patch +URL: https://openprinting.github.io/cups/ BuildRequires: acl-devel -BuildRequires: autoconf +%{?with_lspp:BuildRequires: audit-libs-devel} +BuildRequires: autoconf >= 2.60 BuildRequires: automake %{?with_dnssd:BuildRequires: avahi-compat-libdns_sd-devel} +%{?with_avahi:BuildRequires: avahi-devel} BuildRequires: dbus-devel BuildRequires: glibc-headers %{?with_gnutls:BuildRequires: gnutls-devel} %{?with_gssapi:BuildRequires: heimdal-devel} -BuildRequires: libjpeg-devel BuildRequires: libpaper-devel -BuildRequires: libpng-devel +%{?with_lspp:BuildRequires: libselinux-devel} BuildRequires: libstdc++-devel -BuildRequires: libtiff-devel -BuildRequires: libusb-compat-devel -BuildRequires: libusb-devel -%{?with_ldap:BuildRequires: openldap-devel} -%{?with_slp:BuildRequires: openslp-devel} -%{!?with_gnutls:BuildRequires: openssl-devel} +BuildRequires: libusb-devel >= 1.0 +%{?with_tcp_wrappers:BuildRequires: libwrap-devel} BuildRequires: pam-devel -%{?with_php:BuildRequires: php-devel >= 4:5.0.0} BuildRequires: pkgconfig -BuildRequires: rpm-perlprov -BuildRequires: rpmbuild(macros) >= 1.344 +BuildRequires: rpmbuild(macros) >= 1.641 +%{?with_systemd:BuildRequires: systemd-devel} +BuildRequires: zlib-devel Requires(post,preun): /sbin/chkconfig -Requires: %{name}-libs = %{epoch}:%{version}-%{release} -Requires: openssl-tools +Requires(post,preun,postun): systemd-units >= 38 +Requires: %{name}-lib = %{epoch}:%{version}-%{release} +Requires: %{name}-ppdc = %{epoch}:%{version}-%{release} Requires: pam >= 0.77.3 -Requires: perl-modules Requires: rc-scripts +Requires: systemd-units >= 38 Suggests: ImageMagick-coder-pdf -Suggests: cups-filter-pstoraster -Suggests: ghostscript-cups +Suggests: cups-filters Suggests: poppler-progs Provides: printingdaemon Obsoletes: printingdaemon Conflicts: ghostscript < 7.05.4 +Conflicts: hplip < 3.13.11 Conflicts: logrotate < 3.7-4 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -110,31 +119,53 @@ drukarek. O sistema Unix de impressão (CUPS) fornece uma camada de impressão portável para os sistemas operacionais baseados no UNIX®. -%package lib -Summary: Common Unix Printing System Libraries -Summary(pl.UTF-8): Biblioteki dla CUPS -Summary(pt_BR.UTF-8): Sistema Unix de Impressão - bibliotecas para uso em clientes cups -License: LGPL v2 + openssl exception -Group: Libraries -Provides: %{name}-libs = %{epoch}:%{version}-%{release} -Obsoletes: cups-libs -Obsoletes: libcups1 +%package backend-usb +Summary: USB backend for CUPS +Summary(pl.UTF-8): Backend USB dla CUPS-a +License: GPL v2 +Group: Applications/Printing +Requires: %{name} = %{epoch}:%{version}-%{release} -%description lib -Common Unix Printing System Libraries. +%description backend-usb +This package allow CUPS printing on USB printers. -%description lib -l pl.UTF-8 -Biblioteki dla CUPS. +%description backend-usb -l pl.UTF-8 +Ten pakiet umożliwia drukowanie z poziomu CUPS-a na drukarkach USB. -%description lib -l pt_BR.UTF-8 -Bibliotecas CUPS requeridas pelos clientes CUPS. +%package lpd +Summary: LPD compatibility support for CUPS print server +Summary(pl.UTF-8): Wsparcie dla LPD w serwerze wydruków CUPS +License: GPL v2 +Group: Applications/Printing +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: rc-inetd + +%description lpd +LPD compatibility support for CUPS print server. + +%description lpd -l pl.UTF-8 +Wsparcie dla LPD w serwerze wydruków CUPS. + +%package ppdc +Summary: Common Unix Printing System - PPD manipulation utilities +Summary(pl.UTF-8): Narzędzia CUPS do operacji na plikach PPD +License: GPL v2 +Group: Applications/Printing +Requires: %{name}-lib = %{epoch}:%{version}-%{release} + +%description ppdc +This package provides utilities to generate and manipulate PPD files. + +%description ppdc -l pl.UTF-8 +Ten pakiet zawiera narzędzia do generowania i operowania na plikach +PPD. %package clients Summary: Common Unix Printing System Clients Summary(pl.UTF-8): Aplikacje klienckie dla CUPS -License: GPL v2 + openssl exception +License: GPL v2 Group: Applications/Printing -Requires: %{name}-libs = %{epoch}:%{version}-%{release} +Requires: %{name}-lib = %{epoch}:%{version}-%{release} Provides: printingclient Obsoletes: printingclient @@ -144,14 +175,33 @@ Common Unix Printing System Clients. %description clients -l pl.UTF-8 Aplikacje klienckie dla CUPS. +%package lib +Summary: Common Unix Printing System Libraries +Summary(pl.UTF-8): Biblioteki dla CUPS +Summary(pt_BR.UTF-8): Sistema Unix de Impressão - bibliotecas para uso em clientes cups +License: LGPL v2 +Group: Libraries +Provides: %{name}-libs = %{epoch}:%{version}-%{release} +Obsoletes: cups-libs < 1:1.1.14-2 +Obsoletes: libcups1 < 1:2 + +%description lib +Common Unix Printing System Libraries. + +%description lib -l pl.UTF-8 +Biblioteki dla CUPS. + +%description lib -l pt_BR.UTF-8 +Bibliotecas CUPS requeridas pelos clientes CUPS. + %package image-lib Summary: Common Unix Printing System Libraries - images manipulation Summary(pl.UTF-8): Biblioteki dla CUPS - obsługa formatów graficznych Summary(pt_BR.UTF-8): Sistema Unix de Impressão - bibliotecas para uso em clientes cups -License: LGPL v2 + openssl exception +License: LGPL v2 Group: Libraries Requires: %{name}-lib = %{epoch}:%{version}-%{release} -Obsoletes: libcups1 +Obsoletes: libcups1 < 1:2 %description image-lib Common Unix Printing System Libraries - images manipalation. @@ -166,20 +216,19 @@ Bibliotecas CUPS requeridas pelos clientes CUPS. Summary: Common Unix Printing System development files Summary(pl.UTF-8): Ogólny system druku dla Uniksa - pliki nagłówkowe Summary(pt_BR.UTF-8): Sistema Unix de Impressão - ambiente de desenvolvimento -License: LGPL v2 + openssl exception +License: LGPL v2 Group: Development/Libraries Requires: %{name}-image-lib = %{epoch}:%{version}-%{release} Requires: %{name}-lib = %{epoch}:%{version}-%{release} # for libcups -%{?with_gnutls:Requires: gnutls-devel} -%{?with_gssapi:Requires: heimdal-devel} -%{!?with_gnutls:Requires: openssl-devel} +%{?with_gnutls:Requires: gnutls-devel} +%{?with_gssapi:Requires: heimdal-devel} Requires: zlib-devel # for libcupsimage Requires: libjpeg-devel Requires: libpng-devel Requires: libtiff-devel -Obsoletes: libcups1-devel +Obsoletes: libcups1-devel < 1:2 %description devel Common Unix Printing System development files. @@ -196,7 +245,7 @@ CUPS. Summary: Common Unix Printing System static libraries Summary(pl.UTF-8): Ogólny system druku dla Uniksa - biblioteki statyczne Summary(pt_BR.UTF-8): Common Unix Printing System - bibliotecas estáticas -License: LGPL v2 + openssl exception +License: LGPL v2 Group: Development/Libraries Requires: %{name}-devel = %{epoch}:%{version}-%{release} @@ -210,92 +259,6 @@ Ogólny system druku dla Uniksa - biblioteki statyczne. Bibliotecas estáticas para desenvolvimento de programas que usam as bibliotecas do CUPS. -%package -n perl-cups -Summary: Perl module for CUPS -Summary(pl.UTF-8): Moduł Perla CUPS -License: GPL v2 + openssl exception -Group: Development/Languages/Perl -Requires: %{name}-lib = %{epoch}:%{version}-%{release} - -%description -n perl-cups -Perl module for Common Unix Printing System. - -%description -n perl-cups -l pl.UTF-8 -Moduł Perla do ogólnego systemu druku dla Uniksa. - -%package -n php-cups -Summary: PHP module for CUPS -Summary(pl.UTF-8): Moduł PHP CUPS -License: GPL v2 + openssl exception -Group: Development/Languages/PHP -Requires: %{name}-lib = %{epoch}:%{version}-%{release} -%{?requires_php_extension} -Requires: /etc/php/conf.d -Requires: php-common >= 4:5.0.0 - -%description -n php-cups -PHP module for Common Unix Printing System. - -%description -n php-cups -l pl.UTF-8 -Moduł PHP do ogólnego systemu druku dla Uniksa. - -%package backend-usb -Summary: USB backend for CUPS -Summary(pl.UTF-8): Backend USB dla CUPS-a -License: GPL v2 + openssl exception -Group: Applications/Printing -Requires: %{name} = %{epoch}:%{version}-%{release} - -%description backend-usb -This package allow CUPS printing on USB printers. - -%description backend-usb -l pl.UTF-8 -Ten pakiet umożliwia drukowanie z poziomu CUPS-a na drukarkach USB. - -%package backend-serial -Summary: Serial port backend for CUPS -Summary(pl.UTF-8): Backend obsługujący porty szeregowe dla CUPS-a -License: GPL v2 + openssl exception -Group: Applications/Printing -Requires: %{name} = %{epoch}:%{version}-%{release} - -%description backend-serial -This package allow CUPS printing on printers connected by serial -ports. - -%description backend-serial -l pl.UTF-8 -Ten pakiet umożliwia drukowanie z poziomu CUPS-a na drukarkach -podłączonych do portów szeregowych. - -%package backend-parallel -Summary: Parallel port backend for CUPS -Summary(pl.UTF-8): Backend obsługujący porty równoległe dla CUPS-a -License: GPL v2 + openssl exception -Group: Applications/Printing -Requires: %{name} = %{epoch}:%{version}-%{release} - -%description backend-parallel -This package allow CUPS printing on printers connected by parallel -ports. - -%description backend-parallel -l pl.UTF-8 -Ten pakiet umożliwia drukowanie z poziomu CUPS-a na drukarkach -podłączonych do portów równoległych. - -%package lpd -Summary: LPD compatibility support for CUPS print server -Summary(pl.UTF-8): Wsparcie dla LPD w serwerze wydruków CUPS -License: GPL v2 + openssl exception -Group: Applications/Printing -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: rc-inetd - -%description lpd -LPD compatibility support for CUPS print server. - -%description lpd -l pl.UTF-8 -Wsparcie dla LPD w serwerze wydruków CUPS. - %prep %setup -q %patch0 -p1 @@ -303,113 +266,100 @@ Wsparcie dla LPD w serwerze wydruków CUPS. %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 +# why it hasn't been merged for so long (and why no other distro uses it) +#%patch6 -p1 %patch7 -p1 %patch9 -p1 %patch10 -p1 -%patch11 -p1 +# why it hasn't been merged for so long (and why no other distro uses it) +#%patch11 -p1 %patch12 -p1 +%patch15 -p1 +%patch16 -p1 +%patch18 -p1 + +%patch102 -p1 +%patch103 -p1 +%patch104 -p1 +%patch105 -p1 +%patch107 -p1 +%patch108 -p1 +%patch110 -p1 + +%patch113 -p1 +%patch114 -p1 +%patch115 -p1 +%patch116 -p1 +%patch117 -p1 %build %{__aclocal} -I config-scripts %{__autoconf} %configure \ - --libdir=%{_ulibdir} \ + --enable-acl \ + --enable-avahi%{!?with_avahi:=no} \ --disable-cdsassl \ + --enable-dbus \ + %{?debug:--enable-debug} \ + --enable-dnssd%{!?with_dnssd:=no} \ + --enable-gnutls%{!?with_gnutls:=no} \ + --enable-gssapi%{!?with_gssapi:=no} \ --enable-libpaper \ --enable-libusb \ - --enable-acl \ - --enable-dbus \ - --enable-image \ - --enable-bannertops \ - --enable-texttops \ + %{?with_lspp:--enable-lspp} \ --enable-shared \ --enable-ssl \ - %{?debug:--enable-debug} \ - --%{!?with_dnssd:dis}%{?with_dnssd:en}able-dnssd \ - --%{!?with_ldap:dis}%{?with_ldap:en}able-ldap \ - --%{!?with_gssapi:dis}%{?with_gssapi:en}able-gssapi \ - --%{!?with_gnutls:dis}%{?with_gnutls:en}able-gnutls \ - --%{?with_gnutls:dis}%{!?with_gnutls:en}able-openssl \ - --%{!?with_slp:dis}%{?with_slp:en}able-slp \ %{?with_static_libs:--enable-static} \ - --with-cups-user=lp \ + %{?with_tcp_wrappers:--enable-tcp-wrappers} \ --with-cups-group=lp \ + --with-cups-user=lp \ --with-system-groups=sys \ - --with-printcap=/etc/printcap \ - --with-dbusdir=/etc/dbus-1 \ - --with-docdir=%{_ulibdir}/%{name}/cgi-bin \ --with-config-file-perm=0640 \ --with-log-file-perm=0640 \ - --with-optim=-Wno-format-y2k \ + --with-dbusdir=/etc/dbus-1 \ + --with-docdir=%{_ulibdir}/%{name}/cgi-bin \ + --with-pkgconfpath=%{_pkgconfigdir} \ + --with-printcap=/etc/printcap \ %{?with_dnssd:--with-dnssd-libs=x} \ %{?with_dnssd:--with-dnssd-includes=x} \ - %{?with_perl:--with-perl=%{_bindir}/perl} \ - %{?with_php:--with-php=%{_bindir}/php} \ - %{?with_python:--with-python=%{_bindir}/python} - -%{__make} - -%{__perl} -pi -e 's#-I\.\.\/\.\.#-I../.. -I../../cups#g' scripting/php/Makefile -%{?with_php:%{__make} -C scripting/php PHPCONFIG=%{_bindir}/php-config} - -%if %{with perl} -cd scripting/perl -%{__perl} -pi -e 's@-lcups@-L../../cups $1@' Makefile.PL -%{__perl} Makefile.PL \ - INSTALLDIRS=vendor \ - OPTIMIZE="%{rpmcflags} -I../.." -# avoid rpaths generated by MakeMaker -%{__perl} -pi -e 's@LD_RUN_PATH="\$\(LD_RUN_PATH\)" @@' Makefile - -%{__make} -cd ../.. -%endif + --with-optim=-Wno-format-y2k \ + %{?with_systemd:--with-systemd=%{systemdunitdir}} \ + %{!?with_systemd:--disable-systemd} + +%{__make} %{?debug:OPTIONS="-DDEBUG"} %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,logrotate.d,modprobe.d,security,sysconfig/rc-inetd} \ $RPM_BUILD_ROOT/var/run/cups \ - $RPM_BUILD_ROOT/var/log/{,archive/}cups + $RPM_BUILD_ROOT/var/log/{,archive/}cups \ + $RPM_BUILD_ROOT{%{systemdunitdir},%{systemdtmpfilesdir}} %{__make} install \ BUILDROOT=$RPM_BUILD_ROOT \ CUPS_USER=$(id -u) \ CUPS_GROUP=$(id -g) -if [ "%{_lib}" != "lib" ] ; then - install -d $RPM_BUILD_ROOT%{_libdir} - mv $RPM_BUILD_ROOT%{_ulibdir}/*.so* $RPM_BUILD_ROOT%{_libdir} -%if %{with static_libs} - mv $RPM_BUILD_ROOT%{_ulibdir}/*.a $RPM_BUILD_ROOT%{_libdir} -%endif -fi - -%if %{with php} -%{__make} -C scripting/php install \ - PHPDIR=$RPM_BUILD_ROOT%{php_extensiondir} -install -d $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d -cat > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/phpcups.ini << 'EOF' -; Enable phpcups extension module -extension=phpcups.so -EOF -%endif - -%if %{with perl} -%{__make} -C scripting/perl install \ - DESTDIR=$RPM_BUILD_ROOT +%if %{with avahi} +ln -s %{_ulibdir}/cups/backend/dnssd $RPM_BUILD_ROOT%{_ulibdir}/cups/backend/mdns %endif -install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} -install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/%{name} -install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/%{name} -install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/cups/mailto.conf +cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} +cp -pf %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/%{name} +cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/%{name} +cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/cups/mailto.conf sed -e 's|__ULIBDIR__|%{_ulibdir}|g' %{SOURCE5} > $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/cups-lpd -install %{SOURCE6} $RPM_BUILD_ROOT/etc/modprobe.d/cups.conf +cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/modprobe.d/cups.conf +cp -p %{SOURCE7} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf touch $RPM_BUILD_ROOT/var/log/cups/{access_log,error_log,page_log} touch $RPM_BUILD_ROOT/etc/security/blacklist.cups -touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{classes,printers,client}.conf +touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{classes,printers}.conf + +cat >$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/client.conf <<'EOF' +# Encryption Always +# ServerName enter.server.IP.or.name +EOF # windows drivers can be put there. install -d $RPM_BUILD_ROOT%{_datadir}/cups/drivers @@ -426,112 +376,146 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/cups/ssl ln -s accept $RPM_BUILD_ROOT%{_sbindir}/enable ln -s accept $RPM_BUILD_ROOT%{_sbindir}/disable -# fix/update locale names -install -d $RPM_BUILD_ROOT%{_datadir}/locale/{nb,zh_CN} -mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{no/cups_no.po,nb/cups_nb.po} -mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{zh/cups_zh.po,zh_CN/cups_zh_CN.po} - -# check-files cleanup -rm -rf $RPM_BUILD_ROOT%{_mandir}/{,es/,fr/}cat? -rm -rf $RPM_BUILD_ROOT/''etc/{init.d,rc?.d}/* -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cupsd.conf.default - %clean rm -rf $RPM_BUILD_ROOT %post +# Deal with config migration due to CVE-2012-5519 (STR #4223) +_keywords="^\(AccessLog\|CacheDir\|ConfigFilePerm\|\ +DataDir\|DocumentRoot\|ErrorLog\|FatalErrors\|\ +FileDevice\|FontPath\|Group\|LogFilePerm\|\ +LPDConfigFile\|PageLog\|Printcap\|PrintcapFormat\|\ +RemoteRoot\|RequestRoot\|ServerBin\|ServerCertificate\|\ +ServerKey\|ServerRoot\|SMBConfigFile\|StateDir\|\ +SystemGroup\|SystemGroupAuthKey\|TempDir\|User\)\b" +if [ -f %{_sysconfdir}/cups/cupsd.conf ] && grep -iq "$_keywords" %{_sysconfdir}/cups/cupsd.conf; then + echo "# Settings automatically moved from cupsd.conf by RPM package:" >> %{_sysconfdir}/cups/cups-files.conf + grep -i "$_keywords" %{_sysconfdir}/cups/cupsd.conf >> %{_sysconfdir}/cups/cups-files.conf || : + %{__sed} -i -e "s,$_keywords,#&,ig" %{_sysconfdir}/cups/cupsd.conf || : +fi /sbin/chkconfig --add cups %service cups restart "cups daemon" /sbin/rmmod usblp > /dev/null 2>&1 || : +%systemd_post cups.service cups.socket cups.path %preun if [ "$1" = "0" ]; then %service cups stop /sbin/chkconfig --del cups fi +%systemd_preun cups.service cups.socket cups.path + +%postun +%systemd_reload + +%triggerpostun -- cups < 1:1.5.2-1 +%systemd_trigger cups.service cups.socket cups.path %post lib -p /sbin/ldconfig %postun lib -p /sbin/ldconfig %post image-lib -p /sbin/ldconfig %postun image-lib -p /sbin/ldconfig -%post -n php-cups -%php_webserver_restart - -%postun -n php-cups -if [ "$1" = 0 ]; then - %php_webserver_restart -fi - %post lpd %service -q rc-inetd reload %postun lpd -if [ "$1" = 0 ]; then +if [ "$1" = "0" ]; then %service -q rc-inetd reload fi %files %defattr(644,root,root,755) -%doc *.txt -%attr(640,root,root) %config %verify(not md5 mtime size) /etc/pam.d/* +%doc *.md +%attr(640,root,root) %config %verify(not md5 mtime size) /etc/pam.d/cups %attr(754,root,root) /etc/rc.d/init.d/cups /etc/dbus-1/system.d/cups.conf /etc/modprobe.d/cups.conf +%if %{with systemd} +%{systemdunitdir}/cups.service +%{systemdunitdir}/cups.socket +%{systemdunitdir}/cups.path +%{systemdtmpfilesdir}/%{name}.conf +%endif %attr(600,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/classes.conf +%attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/cups-files.conf +%attr(640,root,lp) %{_sysconfdir}/%{name}/cups-files.conf.default %attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/cupsd.conf +%attr(640,root,lp) %{_sysconfdir}/%{name}/cupsd.conf.default %attr(600,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/printers.conf %attr(600,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/mailto.conf %attr(600,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/snmp.conf +%attr(640,root,lp) %{_sysconfdir}/%{name}/snmp.conf.default %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.cups %dir %attr(700,root,lp) %{_sysconfdir}/%{name}/ssl -%dir %{_sysconfdir}/%{name}/interfaces %dir %attr(755,root,lp) %{_sysconfdir}/%{name}/ppd %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name} -%attr(4755,lp,root) %{_bindir}/lppasswd %attr(755,root,root) %{_bindir}/cupstestppd -%attr(755,root,root) %{_bindir}/cupstestdsc -%attr(755,root,root) %{_bindir}/ppd* +%attr(755,root,root) %{_bindir}/ippeveprinter %attr(755,root,root) %{_sbindir}/cupsctl %attr(755,root,root) %{_sbindir}/cupsd %attr(755,root,root) %{_sbindir}/cupsfilter %dir %{_ulibdir}/cups -%dir %{_ulibdir}/cups/* +%dir %{_ulibdir}/cups/backend +%if %{with avahi} +%attr(755,root,root) %{_ulibdir}/cups/backend/dnssd +%attr(755,root,root) %{_ulibdir}/cups/backend/mdns +%endif +%attr(755,root,root) %{_ulibdir}/cups/backend/http +%attr(755,root,root) %{_ulibdir}/cups/backend/https +%attr(755,root,root) %{_ulibdir}/cups/backend/ipp +%attr(755,root,root) %{_ulibdir}/cups/backend/ipps +%attr(755,root,root) %{_ulibdir}/cups/backend/lpd +%attr(755,root,root) %{_ulibdir}/cups/backend/snmp +%attr(755,root,root) %{_ulibdir}/cups/backend/socket + +%dir %{_ulibdir}/cups/cgi-bin %{_ulibdir}/cups/cgi-bin/help %{_ulibdir}/cups/cgi-bin/images %attr(755,root,root) %{_ulibdir}/cups/cgi-bin/*.cgi %{_ulibdir}/cups/cgi-bin/*.css %{_ulibdir}/cups/cgi-bin/*.html +%{_ulibdir}/cups/cgi-bin/*.png %{_ulibdir}/cups/cgi-bin/*.txt +%lang(da) %{_ulibdir}/cups/cgi-bin/da %lang(de) %{_ulibdir}/cups/cgi-bin/de %lang(es) %{_ulibdir}/cups/cgi-bin/es -%lang(eu) %{_ulibdir}/cups/cgi-bin/eu -%lang(id) %{_ulibdir}/cups/cgi-bin/id -%lang(it) %{_ulibdir}/cups/cgi-bin/it +%lang(fr) %{_ulibdir}/cups/cgi-bin/fr %lang(ja) %{_ulibdir}/cups/cgi-bin/ja -%lang(pl) %{_ulibdir}/cups/cgi-bin/pl +%lang(pt_BR) %{_ulibdir}/cups/cgi-bin/pt_BR %lang(ru) %{_ulibdir}/cups/cgi-bin/ru -%exclude %{_ulibdir}/cups/backend/usb -%exclude %{_ulibdir}/cups/backend/serial -%exclude %{_ulibdir}/cups/backend/parallel -%attr(755,root,root) %{_ulibdir}/cups/backend/* +%dir %{_ulibdir}/cups/command +%attr(755,root,root) %{_ulibdir}/cups/command/ippevepcl +%attr(755,root,root) %{_ulibdir}/cups/command/ippeveps +%dir %{_ulibdir}/cups/daemon %attr(755,root,root) %{_ulibdir}/cups/daemon/cups-deviced %attr(755,root,root) %{_ulibdir}/cups/daemon/cups-driverd -%attr(755,root,root) %{_ulibdir}/cups/daemon/cups-polld -%attr(755,root,root) %{_ulibdir}/cups/filter/* -%attr(755,root,root) %{_ulibdir}/cups/monitor/* -%attr(755,root,root) %{_ulibdir}/cups/notifier/* - -%{_datadir}/cups/banners -%{_datadir}/cups/charsets -%{_datadir}/cups/data -%{_datadir}/cups/drivers -%{_datadir}/cups/drv -%{_datadir}/cups/examples -%{_datadir}/cups/fonts -%{_datadir}/cups/mime +%attr(755,root,root) %{_ulibdir}/cups/daemon/cups-exec +%dir %{_ulibdir}/cups/driver +%dir %{_ulibdir}/cups/filter +%attr(755,root,root) %{_ulibdir}/cups/filter/commandtops +%attr(755,root,root) %{_ulibdir}/cups/filter/gziptoany +%attr(755,root,root) %{_ulibdir}/cups/filter/pstops +%attr(755,root,root) %{_ulibdir}/cups/filter/rastertoepson +%attr(755,root,root) %{_ulibdir}/cups/filter/rastertohp +%attr(755,root,root) %{_ulibdir}/cups/filter/rastertolabel +%attr(755,root,root) %{_ulibdir}/cups/filter/rastertopwg +%dir %{_ulibdir}/cups/monitor +%attr(755,root,root) %{_ulibdir}/cups/monitor/bcp +%attr(755,root,root) %{_ulibdir}/cups/monitor/tbcp +%dir %{_ulibdir}/cups/notifier +%attr(755,root,root) %{_ulibdir}/cups/notifier/dbus +%attr(755,root,root) %{_ulibdir}/cups/notifier/mailto +%attr(755,root,root) %{_ulibdir}/cups/notifier/rss + +%dir %{_datadir}/cups/banners +%dir %{_datadir}/cups/data +%dir %{_datadir}/cups/drivers +%dir %{_datadir}/cups/mime +%{_datadir}/cups/mime/mime.convs +%{_datadir}/cups/mime/mime.types %dir %{_datadir}/cups/model # dirs for gimp-print-cups-4.2.7-1 %dir %{_datadir}/cups/model/C @@ -542,36 +526,42 @@ fi %lang(pl) %dir %{_datadir}/cups/model/pl %lang(sv) %dir %{_datadir}/cups/model/sv -%{_datadir}/cups/ppdc - %dir %{_datadir}/cups/templates %{_datadir}/cups/templates/*.tmpl +%lang(da) %{_datadir}/cups/templates/da %lang(de) %{_datadir}/cups/templates/de %lang(es) %{_datadir}/cups/templates/es -%lang(eu) %{_datadir}/cups/templates/eu -%lang(id) %{_datadir}/cups/templates/id -%lang(it) %{_datadir}/cups/templates/it +%lang(fr) %{_datadir}/cups/templates/fr %lang(ja) %{_datadir}/cups/templates/ja -%lang(pl) %{_datadir}/cups/templates/pl +%lang(pt_BR) %{_datadir}/cups/templates/pt_BR %lang(ru) %{_datadir}/cups/templates/ru +%{_mandir}/man1/cups.1* %{_mandir}/man1/cupstestppd.1* -%{_mandir}/man1/cupstestdsc.1* -%{_mandir}/man1/lppasswd.1* -%{_mandir}/man1/ppd*.1* +%{_mandir}/man1/ippeveprinter.1* +%{_mandir}/man5/classes.conf.5* +%{_mandir}/man5/cups-files.conf.5* +%{_mandir}/man5/cups-snmp.conf.5* +%{_mandir}/man5/cupsd.conf.5* +%{_mandir}/man5/cupsd-logs.5* +%{_mandir}/man5/ipptoolfile.5* +%{_mandir}/man5/mailto.conf.5* +%{_mandir}/man5/mime.convs.5* +%{_mandir}/man5/mime.types.5* +%{_mandir}/man5/printers.conf.5* +%{_mandir}/man5/subscriptions.conf.5* %{_mandir}/man7/backend.7* %{_mandir}/man7/filter.7* +%{_mandir}/man7/ippevepcl.7* +%{_mandir}/man7/ippeveps.7* %{_mandir}/man7/notifier.7* -%{_mandir}/man5/* -%{_mandir}/man8/accept.8* %{_mandir}/man8/cups-deviced.8* %{_mandir}/man8/cups-driverd.8* -%{_mandir}/man8/cups-polld.8* -%{_mandir}/man8/cupsaddsmb.8* +%{_mandir}/man8/cups-exec.8* +%{_mandir}/man8/cups-snmp.8* %{_mandir}/man8/cupsctl.8* %{_mandir}/man8/cupsd.8* -%{_mandir}/man8/cupsenable.8* +%{_mandir}/man8/cupsd-helper.8* %{_mandir}/man8/cupsfilter.8* -%{_mandir}/man8/lp* %dir %attr(775,root,lp) /var/cache/cups %dir %attr(755,root,lp) /var/lib/cups @@ -589,49 +579,52 @@ fi %attr(640,root,logs) %ghost /var/log/cups/error_log %attr(640,root,logs) %ghost /var/log/cups/page_log -%files lib +%files backend-usb %defattr(644,root,root,755) -%dir %attr(755,root,lp) %{_sysconfdir}/%{name} -%attr(755,root,root) %{_libdir}/libcups.so.* -%attr(755,root,root) %{_libdir}/libcupscgi.so.* -%attr(755,root,root) %{_libdir}/libcupsdriver.so.* -%attr(755,root,root) %{_libdir}/libcupsmime.so.* -%attr(755,root,root) %{_libdir}/libcupsppdc.so.* -%dir %{_datadir}/cups -%{_datadir}/cups/charmaps -%lang(da) %{_datadir}/locale/da/cups_da.po -%lang(de) %{_datadir}/locale/de/cups_de.po -%lang(es) %{_datadir}/locale/es/cups_es.po -%lang(eu) %{_datadir}/locale/eu/cups_eu.po -%lang(fi) %{_datadir}/locale/fi/cups_fi.po -%lang(fr) %{_datadir}/locale/fr/cups_fr.po -%lang(id) %{_datadir}/locale/id/cups_id.po -%lang(it) %{_datadir}/locale/it/cups_it.po -%lang(ko) %{_datadir}/locale/ko/cups_ko.po -%lang(ja) %{_datadir}/locale/ja/cups_ja.po -%lang(nl) %{_datadir}/locale/nl/cups_nl.po -%lang(nb) %{_datadir}/locale/nb/cups_nb.po -%lang(pl) %{_datadir}/locale/pl/cups_pl.po -%lang(pt) %{_datadir}/locale/pt/cups_pt.po -%lang(pt_BR) %{_datadir}/locale/pt_BR/cups_pt_BR.po -%lang(ru) %{_datadir}/locale/ru/cups_ru.po -%lang(sv) %{_datadir}/locale/sv/cups_sv.po -%lang(zh_CN) %{_datadir}/locale/zh_CN/cups_zh_CN.po -%lang(zh_TW) %{_datadir}/locale/zh_TW/cups_zh_TW.po +%attr(755,root,root) %{_ulibdir}/cups/backend/usb +%dir %{_datadir}/cups/usb +%{_datadir}/cups/usb/org.cups.usb-quirks + +%files lpd +%defattr(644,root,root,755) +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/cups-lpd +%attr(755,root,root) %{_ulibdir}/cups/daemon/cups-lpd +%if %{with systemd} +%{systemdunitdir}/cups-lpd.socket +%{systemdunitdir}/cups-lpd@.service +%endif +%{_mandir}/man8/cups-lpd.8* + +%files ppdc +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/ppd* +%dir %{_datadir}/cups/drv +%{_datadir}/cups/drv/sample.drv +%dir %{_datadir}/cups/examples +%{_datadir}/cups/examples/*.drv +%dir %{_datadir}/cups/ppdc +%{_datadir}/cups/ppdc/epson.h +%{_datadir}/cups/ppdc/hp.h +%{_datadir}/cups/ppdc/label.h +%{_datadir}/cups/ppdc/font.defs +%{_datadir}/cups/ppdc/media.defs +%{_datadir}/cups/ppdc/raster.defs +%{_mandir}/man1/ppd*.1* +%{_mandir}/man5/ppdcfile.5* %files clients %defattr(644,root,root,755) %attr(644,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/client.conf %attr(755,root,root) %{_bindir}/cancel +%{?with_avahi:%attr(755,root,root) %{_bindir}/ippfind} +%attr(755,root,root) %{_bindir}/ipptool %attr(755,root,root) %{_bindir}/lp %attr(755,root,root) %{_bindir}/lpoptions %attr(755,root,root) %{_bindir}/lpq %attr(755,root,root) %{_bindir}/lpr %attr(755,root,root) %{_bindir}/lprm %attr(755,root,root) %{_bindir}/lpstat -%attr(755,root,root) %{_sbindir}/accept %attr(755,root,root) %{_sbindir}/cupsaccept -%attr(755,root,root) %{_sbindir}/cupsaddsmb %attr(755,root,root) %{_sbindir}/cupsenable %attr(755,root,root) %{_sbindir}/cupsdisable %attr(755,root,root) %{_sbindir}/cupsreject @@ -641,81 +634,62 @@ fi %attr(755,root,root) %{_sbindir}/lpc %attr(755,root,root) %{_sbindir}/lpinfo %attr(755,root,root) %{_sbindir}/lpmove -%attr(755,root,root) %{_sbindir}/reject +%{_datadir}/cups/ipptool %{_desktopdir}/cups.desktop %{_iconsdir}/hicolor/*/apps/cups.png %{_mandir}/man1/cancel.1* +%{?with_avahi:%{_mandir}/man1/ippfind.1*} +%{_mandir}/man1/ipptool.1* %{_mandir}/man1/lp.1* %{_mandir}/man1/lpoptions.1* %{_mandir}/man1/lpq.1* %{_mandir}/man1/lpr.1* %{_mandir}/man1/lprm.1* %{_mandir}/man1/lpstat.1* +%{_mandir}/man5/client.conf.5* %{_mandir}/man8/cupsaccept.8* +%{_mandir}/man8/cupsenable.8* %{_mandir}/man8/cupsdisable.8* %{_mandir}/man8/cupsreject.8* -%{_mandir}/man8/reject.8* +%{_mandir}/man8/lpadmin.8* +%{_mandir}/man8/lpc.8* +%{_mandir}/man8/lpinfo.8* +%{_mandir}/man8/lpmove.8* + +%files lib +%defattr(644,root,root,755) +%dir %attr(755,root,lp) %{_sysconfdir}/%{name} +%attr(755,root,root) %{_libdir}/libcups.so.2 +%dir %{_datadir}/cups +%lang(ca) %{_localedir}/ca/cups_ca.po +%lang(cs) %{_localedir}/cs/cups_cs.po +%lang(da) %{_localedir}/da/cups_da.po +%lang(de) %{_localedir}/de/cups_de.po +%{_localedir}/en/cups_en.po +%lang(es) %{_localedir}/es/cups_es.po +%lang(fr) %{_localedir}/fr/cups_fr.po +%lang(it) %{_localedir}/it/cups_it.po +%lang(ja) %{_localedir}/ja/cups_ja.po +%lang(pt_BR) %{_localedir}/pt_BR/cups_pt_BR.po +%lang(ru) %{_localedir}/ru/cups_ru.po +%lang(zh_CN) %{_localedir}/zh_CN/cups_zh_CN.po %files image-lib %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libcupsimage.so.* +%attr(755,root,root) %{_libdir}/libcupsimage.so.2 %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/cups-config %attr(755,root,root) %{_libdir}/libcups.so -%attr(755,root,root) %{_libdir}/libcupscgi.so -%attr(755,root,root) %{_libdir}/libcupsdriver.so %attr(755,root,root) %{_libdir}/libcupsimage.so -%attr(755,root,root) %{_libdir}/libcupsmime.so -%attr(755,root,root) %{_libdir}/libcupsppdc.so %{_includedir}/cups +%{_pkgconfigdir}/cups.pc %{_mandir}/man1/cups-config.1* %if %{with static_libs} %files static %defattr(644,root,root,755) %{_libdir}/libcups.a -%{_libdir}/libcupscgi.a -%{_libdir}/libcupsdriver.a %{_libdir}/libcupsimage.a -%{_libdir}/libcupsmime.a -%{_libdir}/libcupsppdc.a -%endif - -%if %{with perl} -%files -n perl-cups -%defattr(644,root,root,755) -%{perl_vendorarch}/CUPS.pm -%dir %{perl_vendorarch}/auto/CUPS -%{perl_vendorarch}/auto/CUPS/CUPS.bs -%{perl_vendorarch}/auto/CUPS/autosplit.ix -%attr(755,root,root) %{perl_vendorarch}/auto/CUPS/CUPS.so -%{_mandir}/man3/CUPS.3pm* %endif - -%if %{with php} -%files -n php-cups -%defattr(644,root,root,755) -%doc scripting/php/README -%attr(755,root,root) %{php_extensiondir}/phpcups.so -%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/phpcups.ini -%endif - -%files backend-usb -%defattr(644,root,root,755) -%attr(755,root,root) %{_ulibdir}/cups/backend/usb - -%files backend-serial -%defattr(644,root,root,755) -%attr(755,root,root) %{_ulibdir}/cups/backend/serial - -%files backend-parallel -%defattr(644,root,root,755) -%attr(755,root,root) %{_ulibdir}/cups/backend/parallel - -%files lpd -%defattr(644,root,root,755) -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/* -%attr(755,root,root) %{_ulibdir}/cups/daemon/cups-lpd -%{_mandir}/man8/cups-lpd.8*