- release 3 (by relup.sh)

[packages/cups.git] / cups.spec

diff --git a/cups.spec b/cups.spec
index 82dd7c71648af810f75cdc90d4617625e16ca6d7..215f86f8268960d3b905e3792bf5f2859a157038 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -16,13 +16,13 @@
 Summary(pl.UTF-8):     Ogólny system druku dla Uniksa
 Summary(pt_BR.UTF-8):  Sistema Unix de Impressão
 Name:          cups
-Version:       1.5.2
-Release:       0.1
+Version:       1.5.4
+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: 9471d2a7c920cfbb17133c32d2e6866f
+# Source0-md5: de3006e5cf1ee78a9c6145ce62c4e982
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.logrotate
@@ -44,6 +44,9 @@ Patch10:      %{name}-peercred.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
 # avahi patches from fedora
 Patch100:      %{name}-avahi-1-config.patch
 Patch101:      %{name}-avahi-2-backend.patch
@@ -65,8 +68,7 @@ BuildRequires:        libpaper-devel
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
-BuildRequires: libusb-compat-devel
-BuildRequires: libusb-devel
+BuildRequires: libusb-devel >= 1.0
 %{?with_ldap:BuildRequires:    openldap-devel}
 %{?with_slp:BuildRequires:     openslp-devel}
 %{!?with_gnutls:BuildRequires: openssl-devel}
@@ -75,13 +77,15 @@ BuildRequires:      pam-devel
 BuildRequires: pkgconfig
 BuildRequires: rpm-perlprov
 BuildRequires: rpmbuild(macros) >= 1.641
+BuildRequires: systemd-devel
 Requires(post,preun):  /sbin/chkconfig
+Requires(post,preun,postun):   systemd-units >= 38
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      openssl-tools
 Requires:      pam >= 0.77.3
 Requires:      perl-modules
 Requires:      rc-scripts
-Requires:      systemd-units
+Requires:      systemd-units >= 38
 Suggests:      ImageMagick-coder-pdf
 Suggests:      cups-filter-pstoraster
 Suggests:      ghostscript-cups
@@ -241,7 +245,7 @@ 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
+Requires:      php(core) >= 5.0.0
 
 %description -n php-cups
 PHP module for Common Unix Printing System.
@@ -322,6 +326,9 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 #%patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 %if %{with avahi}
 %patch100 -p1
@@ -368,7 +375,8 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
        %{?with_dnssd:--with-dnssd-includes=x} \
        %{?with_perl:--with-perl=%{_bindir}/perl} \
        %{?with_php:--with-php=%{_bindir}/php} \
-       %{?with_python:--with-python=%{_bindir}/python}
+       %{?with_python:--with-python=%{_bindir}/python} \
+       --with-systemdsystemunitdir=%{systemdunitdir}
 
 %{__make} %{?debug:OPTIONS="-DDEBUG"}
 
@@ -408,6 +416,10 @@ if [ "%{_lib}" != "lib" ] ; then
 %endif
 fi
 
+%if %{with avahi}
+ln -s %{_ulibdir}/cups/backend/dnssd $RPM_BUILD_ROOT%{_ulibdir}/cups/backend/mdns
+%endif
+
 %if %{with php}
 %{__make} -C scripting/php install \
        PHPDIR=$RPM_BUILD_ROOT%{php_extensiondir}
@@ -511,6 +523,8 @@ fi
 /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}/cupsd.conf
@@ -549,13 +563,16 @@ fi
 %lang(pl) %{_ulibdir}/cups/cgi-bin/pl
 %lang(ru) %{_ulibdir}/cups/cgi-bin/ru
 
+%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/mdns
 %attr(755,root,root) %{_ulibdir}/cups/backend/snmp
 %attr(755,root,root) %{_ulibdir}/cups/backend/socket
 %attr(755,root,root) %{_ulibdir}/cups/daemon/cups-deviced