- Requires: openssl-tools

[packages/cups.git] / cups.spec

diff --git a/cups.spec b/cups.spec
index 12e84bfe2eb8a6a50bd67686ffb95251ac7e6446..4a2e4ea209320bf77cea355f9804b0d58fee1441 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -20,13 +20,13 @@ 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.6
+Version:       1.3.8
 Release:       1
 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: 642f9f6d879999bff1b51aeee57a3ce1
+# Source0-md5: 84e09577d673b212f605dd09caee456c
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.logrotate
@@ -37,12 +37,13 @@ Patch1:             %{name}-lp-lpr.patch
 Patch2:                %{name}-options.patch
 Patch3:                %{name}-man_pages_linking.patch
 Patch4:                %{name}-nostrip.patch
-Patch5:                %{name}-templates.patch
-Patch6:                %{name}-certs_FHS.patch
-Patch7:                %{name}-direct_usb.patch
-Patch8:                %{name}-satisfy-any.patch
-Patch9:                %{name}-no-polluted-krb5config.patch
-Patch10:       %{name}-java-fix.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
 URL:           http://www.cups.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -59,7 +60,7 @@ BuildRequires:        libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
-BuildRequires: openldap-devel >= 2.4.6
+BuildRequires: openldap-devel
 BuildRequires: openslp-devel
 %{!?with_gnutls:BuildRequires: openssl-devel}
 BuildRequires: pam-devel
@@ -70,12 +71,21 @@ BuildRequires:      rpm-perlprov
 BuildRequires: rpmbuild(macros) >= 1.344
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Requires:      openssl-tools
 Requires:      pam >= 0.77.3
 Requires:      rc-scripts
 Provides:      printingdaemon
 Obsoletes:     printingdaemon
 Conflicts:     ghostscript < 7.05.4
 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
@@ -334,33 +344,36 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 %{__aclocal} -I config-scripts
 %{__autoconf}
 %configure \
        --libdir=%{_ulibdir} \
+       --disable-cdsassl \
+       --enable-dbus \
        --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-system-groups=sys \
        --with-printcap=/etc/printcap \
-       %{?with_static_libs:--enable-static} \
-       --enable-ssl \
-       --%{?with_gnutls:dis}%{!?with_gnutls:en}able-openssl \
-       --%{!?with_gnutls:dis}%{?with_gnutls:en}able-gnutls \
-       --%{!?with_dnssd:dis}%{?with_dnssd:en}able-dnssd \
-       --disable-cdsassl \
-       --enable-dbus \
-       %{?debug:--enable-debug} \
+       --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_dnssd:--with-dnssd-libs=x} \
        %{?with_dnssd:--with-dnssd-includes=x} \
-       %{?with_php:--with-php} \
-       %{?with_perl:--with-perl} \
        %{?with_java:--with-java} \
+       %{?with_perl:--with-perl} \
+       %{?with_php:--with-php} \
        %{?with_python:--with-python}
 
 %{__make}
@@ -549,6 +562,7 @@ fi
 %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
@@ -589,6 +603,7 @@ fi
 %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
@@ -640,6 +655,7 @@ fi
 %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