- S: poppler-progs

[packages/cups.git] / cups.spec

diff --git a/cups.spec b/cups.spec
index 580cc7bf6a30d1eda2ad21020cb8acdcb3cef4c3..5559ce75a458ac66e8470acdce55b020308ef0d9 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -2,9 +2,12 @@
 # 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
@@ -13,22 +16,21 @@
 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.1
-Release:       5
+Version:       1.4.4
+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: 587a58039c112ecb3c932e048c8a7b01
+# Source0-md5: 8776403ad60fea9e85eab9c04d88560d
 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.1/ http://svn.easysw.com/public/cups/branches/branch-1.4/ > cups-branch.diff
+# 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
-Patch100:      %{name}-branch.diff
 Patch0:                %{name}-config.patch
 Patch2:                %{name}-options.patch
 Patch3:                %{name}-man_pages_linking.patch
@@ -38,7 +40,8 @@ Patch6:               %{name}-direct_usb.patch
 Patch7:                %{name}-no-polluted-krb5config.patch
 Patch9:                %{name}-verbose-compilation.patch
 Patch10:       %{name}-peercred.patch
-Patch11:       %{name}-side_cb.patch
+Patch11:       %{name}-usb.patch
+Patch12:       %{name}-desktop.patch
 URL:           http://www.cups.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -47,18 +50,19 @@ BuildRequires:      automake
 BuildRequires: dbus-devel
 BuildRequires: glibc-headers
 %{?with_gnutls:BuildRequires:  gnutls-devel}
+%{?with_gssapi:BuildRequires:  heimdal-devel}
 %{?with_java:BuildRequires:    jar}
 %{?with_java:BuildRequires:    jdk}
 %{?with_java:BuildRequires:    jpackage-utils}
-BuildRequires: heimdal-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpaper-devel
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
+BuildRequires: libusb-compat-devel
 BuildRequires: libusb-devel
-BuildRequires: openldap-devel
-BuildRequires: openslp-devel
+%{?with_ldap:BuildRequires:    openldap-devel}
+%{?with_slp:BuildRequires:     openslp-devel}
 %{!?with_gnutls:BuildRequires: openssl-devel}
 BuildRequires: pam-devel
 %{?with_php:BuildRequires:     php-devel >= 4:5.0.0}
@@ -70,19 +74,15 @@ Requires(post,preun):       /sbin/chkconfig
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      openssl-tools
 Requires:      pam >= 0.77.3
+Requires:      perl-modules
 Requires:      rc-scripts
+Suggests:      ImageMagick-coder-pdf
+Suggests:      cups-filter-pstoraster
+Suggests:      poppler-progs
 Provides:      printingdaemon
 Obsoletes:     printingdaemon
 Conflicts:     ghostscript < 7.05.4
 Conflicts:     logrotate < 3.7-4
-# pstoraster:
-Suggests:      cups-filter-pstoraster
-# Contains imagetops...:
-Suggests:      kde4-kde3support
-# pdftops:
-Suggests:      poppler-progs
-# pstops:
-Suggests:      psutils
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _ulibdir        %{_prefix}/lib
@@ -175,7 +175,7 @@ Requires:   %{name}-image-lib = %{epoch}:%{version}-%{release}
 Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 # for libcups
 %{?with_gnutls:Requires:       gnutls-devel}
-Requires:      heimdal-devel
+%{?with_gssapi:Requires:       heimdal-devel}
 %{!?with_gnutls:Requires:      openssl-devel}
 Requires:      zlib-devel
 # for libcupsimage
@@ -330,7 +330,6 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 
 %prep
 %setup -q
-%patch100 -p0
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
@@ -341,6 +340,7 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 %{__aclocal} -I config-scripts
@@ -359,8 +359,11 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
        --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-cups-group=lp \
@@ -537,6 +540,8 @@ fi
 %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(ja) %{_ulibdir}/cups/cgi-bin/ja
 %lang(pl) %{_ulibdir}/cups/cgi-bin/pl
 %lang(ru) %{_ulibdir}/cups/cgi-bin/ru
@@ -577,6 +582,8 @@ fi
 %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(ja) %{_datadir}/cups/templates/ja
 %lang(pl) %{_datadir}/cups/templates/pl
 %lang(ru) %{_datadir}/cups/templates/ru
@@ -632,6 +639,7 @@ fi
 %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