- upstream patch to fix STR #1740

[packages/cups.git] / cups.spec

diff --git a/cups.spec b/cups.spec
index e03dab125c25ae5a680b8ae1e86a2713a13ba2bf..7ec35aa34d41e3d1021a20b42cb8fc4374cb638e 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -4,22 +4,24 @@
 # - remove obsolete /etc/cups/certs (trigger?)
 #
 # Conditional build:
-%bcond_without php     # don't build PHP extension
-%bcond_without perl    # don't build Perl extension
+%bcond_with    gnutls          # use GNU TLS for SSL/TLS support (instead of OpenSSL)
+%bcond_without php             # don't build PHP extension
+%bcond_without perl            # don't build Perl extension
+%bcond_without static_libs     # don't build static library
 #
 %include       /usr/lib/rpm/macros.perl
 %define                pdir CUPS
 Summary:       Common Unix Printing System
-Summary(pl):   Popularny system druku dla Uniksa
+Summary(pl):   Ogólny system druku dla Uniksa
 Summary(pt_BR):        Sistema Unix de Impressão
 Name:          cups
-Version:       1.2.0
-Release:       0.92
+Version:       1.2.1
+Release:       3
 Epoch:         1
 License:       GPL/LGPL
 Group:         Applications/Printing
 Source0:       http://ftp.easysw.com/pub/cups/%{version}/%{name}-%{version}-source.tar.bz2
-# Source0-md5: a168b0b1c8bb946060e659e1df2927c5
+# Source0-md5: f804995e3f469bdefedc033510f6e6a5
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.logrotate
@@ -28,21 +30,20 @@ Patch1:             %{name}-lp-lpr.patch
 Patch2:                %{name}-options.patch
 Patch3:                %{name}-man_pages_linking.patch
 Patch4:                %{name}-nostrip.patch
-Patch5:                %{name}-rpath.patch
-Patch6:                %{name}-str1670.patch
-Patch7:                %{name}-str1705.patch
+Patch5:                %{name}-jobs-header_tmpl_pl.patch
 URL:           http://www.cups.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: dbus-devel
+%{?with_gnutls:BuildRequires:  gnutls-devel}
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
 BuildRequires: openldap-devel
 BuildRequires: openslp-devel
-BuildRequires: openssl-devel
+%{!?with_gnutls:BuildRequires: openssl-devel}
 BuildRequires: pam-devel
 %{?with_php:BuildRequires:     php-devel >= 4:5.0.0}
 BuildRequires: pkgconfig
@@ -79,7 +80,12 @@ support real-world printing under UNIX.
 %description -l pl
 CUPS dostarcza standardowy poziom drukowania dla systemów uniksowych.
 CUPS u¿ywa protoko³u IPP - Internet Printint Protocol jako podstawy do
-zarz±dzania zadaniami i kolejkami druku.
+zarz±dzania zadaniami i kolejkami druku. W ograniczonym zakresie
+obs³ugiwane s± tak¿e protoko³y LPD (Line Printer Daemon), SMB (Server
+Message Block) i AppSocket (znany tak¿e jako JetDirect). CUPS
+udostêpnia przegl±danie drukarek sieciowych i opcje drukowania oparte
+na PPD (PostScript Printer Description) do obs³ugi rzeczywistych
+drukarek.
 
 %description -l pt_BR
 O sistema Unix de impressão (CUPS) fornece uma camada de impressão
@@ -135,7 +141,7 @@ Bibliotecas CUPS requeridas pelos clientes CUPS.
 
 %package devel
 Summary:       Common Unix Printing System development files
-Summary(pl):   Popularny System Druku dla Uniksa, pliki nag³ówkowe
+Summary(pl):   Ogólny system druku dla Uniksa - pliki nag³ówkowe
 Summary(pt_BR):        Sistema Unix de Impressão - ambiente de desenvolvimento
 Group:         Development/Libraries
 Requires:      %{name}-image-lib = %{epoch}:%{version}-%{release}
@@ -146,7 +152,7 @@ Obsoletes:  libcups1-devel
 Common Unix Printing System development files.
 
 %description devel -l pl
-Popularny System Druku dla Uniksa, pliki nag³ówkowe.
+Ogólny system druku dla Uniksa - pliki nag³ówkowe.
 
 %description devel -l pt_BR
 Este pacote é um adicional que contem um ambiente de desenvolvimento
@@ -155,7 +161,7 @@ CUPS.
 
 %package static
 Summary:       Common Unix Printing System static libraries
-Summary(pl):   Popularny System Druku dla Uniksa, biblioteki statyczne
+Summary(pl):   Ogólny system druku dla Uniksa - biblioteki statyczne
 Summary(pt_BR):        Common Unix Printing System - bibliotecas estáticas
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
@@ -164,7 +170,7 @@ Requires:   %{name}-devel = %{epoch}:%{version}-%{release}
 Common Unix Printing System static libraries.
 
 %description static -l pl
-Popularny System Druku dla Uniksa, biblioteki statyczne.
+Ogólny system druku dla Uniksa - biblioteki statyczne.
 
 %description static -l pt_BR
 Bibliotecas estáticas para desenvolvimento de programas que usam as
@@ -180,7 +186,7 @@ Requires:   %{name}-lib = %{epoch}:%{version}-%{release}
 Perl module for Common Unix Printing System.
 
 %description -n perl-cups -l pl
-Modu³ Perla do Popularnego Systemu Druku dla Uniksa.
+Modu³ Perla do ogólnego systemu druku dla Uniksa.
 
 %package -n php-cups
 Summary:       PHP module for CUPS
@@ -193,7 +199,7 @@ Requires:   php-common >= 4:5.0.0
 PHP module for Common Unix Printing System.
 
 %description -n php-cups -l pl
-Modu³ PHP do Popularnego Systemu Druku dla Uniksa.
+Modu³ PHP do ogólnego systemu druku dla Uniksa.
 
 %package backend-usb
 Summary:       USB backend for CUPS
@@ -243,8 +249,6 @@ pod
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
 %{__aclocal} -I config-scripts
@@ -252,14 +256,16 @@ pod
 %configure \
        --libdir=%{_ulibdir} \
        --enable-shared \
-       --enable-static \
+       %{?with_static_libs:--enable-static} \
        --enable-ssl \
-       --enable-openssl \
-       --disable-gnutls \
+       --%{?with_gnutls:dis}%{!?with_gnutls:en}able-openssl \
+       --%{!?with_gnutls:dis}%{?with_gnutls:en}able-gnutls \
        --disable-cdsassl \
        --enable-dbus \
        %{?debug:--enable-debug} \
-       --with-docdir=%{_ulibdir}/%{name}/cgi-bin
+       --with-docdir=%{_ulibdir}/%{name}/cgi-bin \
+       %{?with_php:--with-php}
+
 %{__make}
 
 %{__perl} -pi -e 's#-I\.\.\/\.\.#-I../.. -I../../cups#g' scripting/php/Makefile
@@ -291,7 +297,7 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,logrotate.d,security} \
 if [ "%{_lib}" != "lib" ] ; then
        install -d $RPM_BUILD_ROOT%{_libdir}
        mv $RPM_BUILD_ROOT%{_ulibdir}/*.so* $RPM_BUILD_ROOT%{_libdir}
-       #mv $RPM_BUILD_ROOT%{_ulibdir}/*.a $RPM_BUILD_ROOT%{_libdir}
+       mv $RPM_BUILD_ROOT%{_ulibdir}/*.a $RPM_BUILD_ROOT%{_libdir}
 fi
 
 %if %{with php}
@@ -326,6 +332,7 @@ install -d $RPM_BUILD_ROOT%{_datadir}/cups/drivers
 
 touch $RPM_BUILD_ROOT/var/cache/cups/help.index
 touch $RPM_BUILD_ROOT/var/cache/cups/{job,remote}.cache
+touch $RPM_BUILD_ROOT/var/cache/cups/ppds.dat
 install -d $RPM_BUILD_ROOT/etc/cups/ssl
 
 # post-strip can't work on readonly files
@@ -432,6 +439,7 @@ fi
 %{_mandir}/man[58]/*
 %lang(es) %{_datadir}/locale/es/cups_es.po
 %lang(ja) %{_datadir}/locale/ja/cups_ja.po
+%lang(pl) %{_datadir}/locale/pl/cups_pl.po
 %lang(sv) %{_datadir}/locale/sv/cups_sv.po
 
 %dir %attr(775,root,lp) /var/cache/cups
@@ -439,8 +447,9 @@ fi
 %dir %attr(511,lp,sys) /var/run/cups/certs
 %dir %attr(710,root,lp) /var/spool/cups
 %dir %attr(1770,root,lp) /var/spool/cups/tmp
-%attr(640,root,lp) %ghost /var/cache/cups/help.index
+%attr(600,lp,lp) %ghost /var/cache/cups/help.index
 %attr(640,root,lp) %ghost /var/cache/cups/job.cache
+%attr(600,lp,lp) %ghost /var/cache/cups/ppds.dat
 %attr(640,root,lp) %ghost /var/cache/cups/remote.cache
 %attr(750,root,logs) %dir /var/log/archiv/cups
 %attr(750,root,logs) %dir /var/log/cups
@@ -504,9 +513,11 @@ fi
 #%lang(fr) %{_mandir}/fr/man1/cups-config*
 #%lang(es) %{_mandir}/es/man1/cups-config*
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/*.a
+%endif
 
 %if %{with perl}
 %files -n perl-cups