X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cups.spec;h=94c6f421b523132fe513cb04fc3dce3d51e37494;hb=3dd2bedb3e28d900e0dc100325d7d0a88a347c9f;hp=a552196684a9f231c1dc4b61c3904234ca7a1f0a;hpb=3c0838c849a0ffa27df35bdb0855cb67663affaa;p=packages%2Fcups.git diff --git a/cups.spec b/cups.spec index a552196..94c6f42 100644 --- a/cups.spec +++ b/cups.spec @@ -1,94 +1,90 @@ # # Conditional build: %bcond_with gnutls # use GNU TLS for SSL/TLS support (instead of OpenSSL) -%bcond_without dnssd -%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 java # don't build Java extension/support in web interface +%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 # do not include GSSAPI support %bcond_without python # don't build Python support in web interface %bcond_without static_libs # don't build static library -# -%include /usr/lib/rpm/macros.perl -%include /usr/lib/rpm/macros.java -%define pdir CUPS - -%ifarch i386 i486 ppc -%undefine with_java -%endif -Summary: Common Unix Printing System Summary(pl.UTF-8): Ogólny system druku dla Uniksa Summary(pt_BR.UTF-8): Sistema Unix de Impressão Name: cups -Version: 1.3.10 -Release: 1 +Version: 1.7.0 +Release: 3 Epoch: 1 License: LGPL v2 (libraries), GPL v2 (the rest) + openssl exception Group: Applications/Printing -Source0: http://ftp.easysw.com/pub/cups/%{version}/%{name}-%{version}-source.tar.bz2 -# Source0-md5: 84fffe96b8537c81a463faccead80026 +Source0: http://www.cups.org/software/%{version}/%{name}-%{version}-source.tar.bz2 +# Source0-md5: 5ab496a2ce27017fcdb3d7ec4818a75a Source1: %{name}.init Source2: %{name}.pamd Source3: %{name}.logrotate Source4: %{name}.mailto.conf Source5: %{name}-lpd.inetd +Source6: %{name}-modprobe.conf +Source7: %{name}.tmpfiles +# 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 Patch0: %{name}-config.patch -Patch1: %{name}-lp-lpr.patch Patch2: %{name}-options.patch Patch3: %{name}-man_pages_linking.patch Patch4: %{name}-nostrip.patch Patch5: %{name}-certs_FHS.patch Patch6: %{name}-direct_usb.patch Patch7: %{name}-no-polluted-krb5config.patch -Patch8: %{name}-java-fix.patch Patch9: %{name}-verbose-compilation.patch Patch10: %{name}-peercred.patch -Patch11: %{name}-translate.patch +Patch11: %{name}-usb.patch +Patch12: %{name}-desktop.patch +Patch13: %{name}-systemd-socket.patch +Patch14: add-ipp-backend-of-cups-1.4.patch +Patch15: reactivate_recommended_driver.patch +Patch16: read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch +Patch17: %{name}-use-ipp1.1.patch +Patch18: %{name}-final-content-type.patch +Patch19: %{name}-jobhistory.patch +Patch20: %{name}-stringpool-rdar15382819.patch +# avahi patches from fedora +Patch100: %{name}-avahi-address.patch +Patch101: %{name}-avahi-no-threaded.patch URL: http://www.cups.org/ -# http://www.cups.org/str.php?L2974 -# Upgrade to 1.3.10 or patch: http://www.cups.org/strfiles/2974/str2974.patch -BuildRequires: security(CVE-2008-5183) BuildRequires: acl-devel -BuildRequires: autoconf +BuildRequires: autoconf >= 2.60 BuildRequires: automake -%{?with_dnssd:BuildRequires: avahi-compat-libdns_sd-devel} +%{?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_java:BuildRequires: jar} -%{?with_java:BuildRequires: jdk} -%{?with_java:BuildRequires: jpackage-utils} -BuildRequires: krb5-devel +%{?with_gssapi:BuildRequires: heimdal-devel} BuildRequires: libjpeg-devel +BuildRequires: libpaper-devel BuildRequires: libpng-devel BuildRequires: libstdc++-devel BuildRequires: libtiff-devel -BuildRequires: openldap-devel -BuildRequires: openslp-devel +BuildRequires: libusb-devel >= 1.0 %{!?with_gnutls:BuildRequires: openssl-devel} BuildRequires: pam-devel -%{?with_php:BuildRequires: php-devel >= 4:5.0.0} BuildRequires: pkgconfig -%{?with_java:BuildRequires: rpm-javaprov} -BuildRequires: rpm-perlprov -BuildRequires: rpmbuild(macros) >= 1.344 +BuildRequires: rpmbuild(macros) >= 1.641 +BuildRequires: systemd-devel +BuildRequires: zlib-devel Requires(post,preun): /sbin/chkconfig +Requires(post,preun,postun): systemd-units >= 38 Requires: %{name}-libs = %{epoch}:%{version}-%{release} +Requires: cups-filters Requires: openssl-tools Requires: pam >= 0.77.3 Requires: rc-scripts +Requires: systemd-units >= 38 +Suggests: ImageMagick-coder-pdf +Suggests: poppler-progs Provides: printingdaemon Obsoletes: printingdaemon Conflicts: ghostscript < 7.05.4 +Conflicts: hplip < 3.13.11 Conflicts: logrotate < 3.7-4 -# pstoraster: -Suggests: cups-filter-pstoraster -# Contains imagetops...: -Suggests: kdelibs -# pdftops: -Suggests: poppler-progs -# pstops: -Suggests: psutils BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _ulibdir %{_prefix}/lib @@ -181,7 +177,7 @@ Requires: %{name}-image-lib = %{epoch}:%{version}-%{release} Requires: %{name}-lib = %{epoch}:%{version}-%{release} # for libcups %{?with_gnutls:Requires: gnutls-devel} -Requires: krb5-devel +%{?with_gssapi:Requires: heimdal-devel} %{!?with_gnutls:Requires: openssl-devel} Requires: zlib-devel # for libcupsimage @@ -219,64 +215,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 -n java-cups -Summary: CUPS java classes -Summary(pl.UTF-8): Klasy javy CUPS -License: GPL v2 + openssl exception -Group: Libraries/Java -Requires: jpackage-utils - -%description -n java-cups -Common Unix Printing System Java classes. - -%description -n java-cups -l pl.UTF-8 -Klasy javy do ogólnego systemu druku dla Uniksa. - -%package -n java-cups-javadoc -Summary: Online manual for %{name} -Summary(pl.UTF-8): Dokumentacja online do %{name} -License: GPL v2 + openssl exception -Group: Documentation -Requires: jpackage-utils - -%description -n java-cups-javadoc -Documentation for %{name}. - -%description -n java-cups-javadoc -l pl.UTF-8 -Dokumentacja do %{name}. - -%description -n java-cups-javadoc -l fr.UTF-8 -Javadoc pour %{name}. - %package backend-usb Summary: USB backend for CUPS Summary(pl.UTF-8): Backend USB dla CUPS-a @@ -290,36 +228,6 @@ 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 @@ -337,80 +245,73 @@ Wsparcie dla LPD w serwerze wydruków CUPS. %prep %setup -q %patch0 -p1 -%patch1 -p1 %patch2 -p1 %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 -%patch8 -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 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 + +%if %{with avahi} +%patch100 -p1 +%patch101 -p1 +%endif %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-openssl%{?with_gnutls:=no} \ --enable-shared \ --enable-ssl \ - %{?debug:--enable-debug} \ - --%{!?with_dnssd:dis}%{?with_dnssd:en}able-dnssd \ - --%{!?with_gnutls:dis}%{?with_gnutls:en}able-gnutls \ - --%{?with_gnutls:dis}%{!?with_gnutls:en}able-openssl \ %{?with_static_libs:--enable-static} \ - --with-cups-user=lp \ --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-printcap=/etc/printcap \ %{?with_dnssd:--with-dnssd-libs=x} \ %{?with_dnssd:--with-dnssd-includes=x} \ - %{?with_java:--with-java} \ - %{?with_perl:--with-perl} \ - %{?with_php:--with-php} \ - %{?with_python:--with-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_python:--with-python=%{_bindir}/python} \ + --with-systemdsystemunitdir=%{systemdunitdir} -%if %{with java} -cd scripting/java -rm -rf classes/* cups.jar -%javac -d classes src/com/easysw/cups/*.java -cd classes -%jar cvf ../cups.jar com/easysw/cups -cd ../../.. -%endif +%{__make} %{?debug:OPTIONS="-DDEBUG"} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,logrotate.d,security,sysconfig/rc-inetd} \ +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 \ @@ -420,44 +321,22 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,logrotate.d,security,sysconfig 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} -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 %endif +fi -%if %{with java} -install -d $RPM_BUILD_ROOT{%{_datadir}/java,%{_examplesdir}/java-cups-%{version}} -# jars -cp -a scripting/java/cups.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -# examples -cp -a scripting/java/{CUPSPrinter.java,example} $RPM_BUILD_ROOT%{_examplesdir}/java-cups-%{version} -# javadoc -install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -a scripting/java/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink +%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 %{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 sed -e 's|__ULIBDIR__|%{_ulibdir}|g' %{SOURCE5} > $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/cups-lpd - -gzip -9nf $RPM_BUILD_ROOT%{_datadir}/%{name}/model/*.ppd +install %{SOURCE6} $RPM_BUILD_ROOT/etc/modprobe.d/cups.conf +install %{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 @@ -478,45 +357,53 @@ 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 +%{__rm} -r $RPM_BUILD_ROOT/etc/{init.d,rc?.d} + +# shipped in cups-filters +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/cups/banners +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/cups/data/testprint %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\)" +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 -n java-cups-javadoc -ln -nfs %{name}-%{version} %{_javadocdir}/%{name} - %post lpd %service -q rc-inetd reload @@ -527,18 +414,22 @@ fi %files %defattr(644,root,root,755) -#%doc *.gz doc/*.html doc/*.css doc/images %doc *.txt -%attr(640,root,root) %config %verify(not md5 mtime size) /etc/pam.d/* +%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 +%{systemdunitdir}/cups.service +%{systemdunitdir}/cups.socket +%{systemdunitdir}/cups.path +%{systemdtmpfilesdir}/%{name}.conf %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) %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) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.convs -%attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.types %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 @@ -547,49 +438,72 @@ fi %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) %{_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/ipp14 +%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/*.ico %{_ulibdir}/cups/cgi-bin/*.txt -%lang(de) %{_ulibdir}/cups/cgi-bin/de +%lang(ca) %{_ulibdir}/cups/cgi-bin/ca +%lang(cs) %{_ulibdir}/cups/cgi-bin/cs %lang(es) %{_ulibdir}/cups/cgi-bin/es -%lang(et) %{_ulibdir}/cups/cgi-bin/et %lang(fr) %{_ulibdir}/cups/cgi-bin/fr -%lang(he) %{_ulibdir}/cups/cgi-bin/he -%lang(id) %{_ulibdir}/cups/cgi-bin/id %lang(it) %{_ulibdir}/cups/cgi-bin/it %lang(ja) %{_ulibdir}/cups/cgi-bin/ja -%lang(pl) %{_ulibdir}/cups/cgi-bin/pl -%lang(sv) %{_ulibdir}/cups/cgi-bin/sv -%lang(zh_TW) %{_ulibdir}/cups/cgi-bin/zh_TW - -%exclude %{_ulibdir}/cups/backend/usb -%exclude %{_ulibdir}/cups/backend/serial -%exclude %{_ulibdir}/cups/backend/parallel -%attr(755,root,root) %{_ulibdir}/cups/backend/* +%lang(ru) %{_ulibdir}/cups/cgi-bin/ru + +%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/fonts +%attr(755,root,root) %{_ulibdir}/cups/daemon/cups-exec +%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/rastertodymo +%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/data +%dir %{_datadir}/cups/drivers +%dir %{_datadir}/cups/drv +%{_datadir}/cups/drv/sample.drv +%dir %{_datadir}/cups/examples +%{_datadir}/cups/examples/*.drv +%dir %{_datadir}/cups/mime +%{_datadir}/cups/mime/mime.convs +%{_datadir}/cups/mime/mime.types %dir %{_datadir}/cups/model -%{_datadir}/cups/model/*.ppd.gz # dirs for gimp-print-cups-4.2.7-1 %dir %{_datadir}/cups/model/C %lang(da) %dir %{_datadir}/cups/model/da @@ -599,35 +513,55 @@ fi %lang(pl) %dir %{_datadir}/cups/model/pl %lang(sv) %dir %{_datadir}/cups/model/sv +%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 + %dir %{_datadir}/cups/templates %{_datadir}/cups/templates/*.tmpl -%lang(de) %{_datadir}/cups/templates/de +%lang(ca) %{_datadir}/cups/templates/ca +%lang(cs) %{_datadir}/cups/templates/cs %lang(es) %{_datadir}/cups/templates/es -%lang(et) %{_datadir}/cups/templates/et %lang(fr) %{_datadir}/cups/templates/fr -%lang(he) %{_datadir}/cups/templates/he -%lang(id) %{_datadir}/cups/templates/id %lang(it) %{_datadir}/cups/templates/it %lang(ja) %{_datadir}/cups/templates/ja -%lang(pl) %{_datadir}/cups/templates/pl -%lang(sv) %{_datadir}/cups/templates/sv -%lang(zh_TW) %{_datadir}/cups/templates/zh_TW +%lang(ru) %{_datadir}/cups/templates/ru %{_mandir}/man1/cupstestppd.1* %{_mandir}/man1/cupstestdsc.1* %{_mandir}/man1/lppasswd.1* +%{_mandir}/man1/ppd*.1* %{_mandir}/man7/backend.7* %{_mandir}/man7/filter.7* -%{_mandir}/man5/* +%{_mandir}/man7/notifier.7* +%{_mandir}/man5/classes.conf.5* +%{_mandir}/man5/client.conf.5* +%{_mandir}/man5/cups-files.conf.5* +%{_mandir}/man5/cups-snmp.conf.5* +%{_mandir}/man5/cupsd.conf.5* +%{_mandir}/man5/ipptoolfile.5* +%{_mandir}/man5/mailto.conf.5* +%{_mandir}/man5/mime.convs.5* +%{_mandir}/man5/mime.types.5* +%{_mandir}/man5/ppdcfile.5* +%{_mandir}/man5/printers.conf.5* +%{_mandir}/man5/subscriptions.conf.5* %{_mandir}/man8/accept.8* %{_mandir}/man8/cups-deviced.8* %{_mandir}/man8/cups-driverd.8* -%{_mandir}/man8/cups-polld.8* +%{_mandir}/man8/cups-snmp.8* %{_mandir}/man8/cupsaddsmb.8* %{_mandir}/man8/cupsctl.8* %{_mandir}/man8/cupsd.8* %{_mandir}/man8/cupsenable.8* %{_mandir}/man8/cupsfilter.8* -%{_mandir}/man8/lp* +%{_mandir}/man8/lpadmin.8* +%{_mandir}/man8/lpc.8* +%{_mandir}/man8/lpinfo.8* +%{_mandir}/man8/lpmove.8* %dir %attr(775,root,lp) /var/cache/cups %dir %attr(755,root,lp) /var/lib/cups @@ -649,33 +583,24 @@ fi %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}/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(ca) %{_datadir}/locale/ca/cups_ca.po +%lang(cs) %{_datadir}/locale/cs/cups_cs.po %lang(es) %{_datadir}/locale/es/cups_es.po -%lang(et) %{_datadir}/locale/et/cups_et.po -%lang(fi) %{_datadir}/locale/fi/cups_fi.po %lang(fr) %{_datadir}/locale/fr/cups_fr.po -%lang(he) %{_datadir}/locale/he/cups_he.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 %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 +%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 @@ -683,9 +608,11 @@ fi %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 %attr(755,root,root) %{_sbindir}/disable %attr(755,root,root) %{_sbindir}/enable %attr(755,root,root) %{_sbindir}/lpadmin @@ -693,28 +620,22 @@ fi %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* +%{_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* -#%lang(fr) %{_mandir}/fr/man1/cancel.1* -#%lang(fr) %{_mandir}/fr/man1/lp.1* -#%lang(fr) %{_mandir}/fr/man1/lpoptions.1* -#%lang(fr) %{_mandir}/fr/man1/lpq.1* -#%lang(fr) %{_mandir}/fr/man1/lpr.1* -#%lang(fr) %{_mandir}/fr/man1/lprm.1* -#%lang(fr) %{_mandir}/fr/man1/lpstat.1* -#%lang(es) %{_mandir}/es/man1/lp.1* -#%lang(es) %{_mandir}/es/man1/lpoptions.1* -#%lang(es) %{_mandir}/es/man1/lpq.1* -#%lang(es) %{_mandir}/es/man1/lpr.1* -#%lang(es) %{_mandir}/es/man1/lprm.1* -#%lang(es) %{_mandir}/es/man1/lpstat.1* +%{_mandir}/man8/cupsaccept.8* +%{_mandir}/man8/cupsdisable.8* +%{_mandir}/man8/cupsreject.8* +%{_mandir}/man8/reject.8* %files image-lib %defattr(644,root,root,755) @@ -724,64 +645,31 @@ fi %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}/libcupsimage.so +%attr(755,root,root) %{_libdir}/libcupsmime.so +%attr(755,root,root) %{_libdir}/libcupsppdc.so %{_includedir}/cups %{_mandir}/man1/cups-config.1* -#%lang(fr) %{_mandir}/fr/man1/cups-config.1* -#%lang(es) %{_mandir}/es/man1/cups-config.1* %if %{with static_libs} %files static %defattr(644,root,root,755) %{_libdir}/libcups.a +%{_libdir}/libcupscgi.a %{_libdir}/libcupsimage.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 - -%if %{with java} -%files -n java-cups -%defattr(644,root,root,755) -%{_javadir}/*.jar -%{_examplesdir}/java-cups-%{version} - -%files -n java-cups-javadoc -%defattr(644,root,root,755) -%{_javadocdir}/%{name}-%{version} -%ghost %{_javadocdir}/%{name} +%{_libdir}/libcupsmime.a +%{_libdir}/libcupsppdc.a %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 +%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/* +%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 %{_mandir}/man8/cups-lpd.8*