]> git.pld-linux.org Git - packages/cups.git/blobdiff - cups.spec
back to protocol version 2, RHBZ#978387 has been already fixed for a while...
[packages/cups.git] / cups.spec
index e0697622c319511e278f898f2e44970fa04b2d74..84c7d3459b20401a4908b09066add8d8dd47800e 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_with    gnutls          # use GNU TLS for SSL/TLS support (instead of OpenSSL)
+%bcond_without gnutls          # use GNU TLS for SSL/TLS support
 %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
 Summary(pl.UTF-8):     Ogólny system druku dla Uniksa
 Summary(pt_BR.UTF-8):  Sistema Unix de Impressão
 Name:          cups
-Version:       1.7.1
-Release:       1
+Version:       2.0.2
+Release:       2
 Epoch:         1
-License:       LGPL v2 (libraries), GPL v2 (the rest) + openssl exception
+License:       LGPL v2 (libraries), GPL v2 (the rest)
 Group:         Applications/Printing
 Source0:       http://www.cups.org/software/%{version}/%{name}-%{version}-source.tar.bz2
-# Source0-md5: 55277c40fd4b7183dc3671d39c5c42b7
+# Source0-md5: 6e0ea72dbafcf5baaa1cf4178e71096d
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.logrotate
@@ -24,8 +24,6 @@ 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
 Patch2:                %{name}-options.patch
 Patch3:                %{name}-man_pages_linking.patch
@@ -41,7 +39,6 @@ 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
 # avahi patches from fedora
 Patch100:      %{name}-avahi-address.patch
@@ -50,8 +47,8 @@ URL:          http://www.cups.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
-%{?with_dnssd:BuildRequires:    avahi-compat-libdns_sd-devel}
-%{?with_avahi:BuildRequires: avahi-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}
@@ -62,7 +59,6 @@ BuildRequires:        libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
 BuildRequires: libusb-devel >= 1.0
-%{!?with_gnutls:BuildRequires: openssl-devel}
 BuildRequires: pam-devel
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.641
@@ -72,7 +68,6 @@ 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
@@ -117,7 +112,7 @@ portável para os sistemas operacionais baseados no UNIX®.
 Summary:       Common Unix Printing System Libraries
 Summary(pl.UTF-8):     Biblioteki dla CUPS
 Summary(pt_BR.UTF-8):  Sistema Unix de Impressão - bibliotecas para uso em clientes cups
-License:       LGPL v2 + openssl exception
+License:       LGPL v2
 Group:         Libraries
 Provides:      %{name}-libs = %{epoch}:%{version}-%{release}
 Obsoletes:     cups-libs
@@ -135,7 +130,7 @@ Bibliotecas CUPS requeridas pelos clientes CUPS.
 %package clients
 Summary:       Common Unix Printing System Clients
 Summary(pl.UTF-8):     Aplikacje klienckie dla CUPS
-License:       GPL v2 + openssl exception
+License:       GPL v2
 Group:         Applications/Printing
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Provides:      printingclient
@@ -151,7 +146,7 @@ Aplikacje klienckie dla CUPS.
 Summary:       Common Unix Printing System Libraries - images manipulation
 Summary(pl.UTF-8):     Biblioteki dla CUPS - obsługa formatów graficznych
 Summary(pt_BR.UTF-8):  Sistema Unix de Impressão - bibliotecas para uso em clientes cups
-License:       LGPL v2 + openssl exception
+License:       LGPL v2
 Group:         Libraries
 Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 Obsoletes:     libcups1
@@ -169,14 +164,13 @@ Bibliotecas CUPS requeridas pelos clientes CUPS.
 Summary:       Common Unix Printing System development files
 Summary(pl.UTF-8):     Ogólny system druku dla Uniksa - pliki nagłówkowe
 Summary(pt_BR.UTF-8):  Sistema Unix de Impressão - ambiente de desenvolvimento
-License:       LGPL v2 + openssl exception
+License:       LGPL v2
 Group:         Development/Libraries
 Requires:      %{name}-image-lib = %{epoch}:%{version}-%{release}
 Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 # for libcups
 %{?with_gnutls:Requires:       gnutls-devel}
 %{?with_gssapi:Requires:       heimdal-devel}
-%{!?with_gnutls:Requires:      openssl-devel}
 Requires:      zlib-devel
 # for libcupsimage
 Requires:      libjpeg-devel
@@ -199,7 +193,7 @@ CUPS.
 Summary:       Common Unix Printing System static libraries
 Summary(pl.UTF-8):     Ogólny system druku dla Uniksa - biblioteki statyczne
 Summary(pt_BR.UTF-8):  Common Unix Printing System - bibliotecas estáticas
-License:       LGPL v2 + openssl exception
+License:       LGPL v2
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
@@ -216,7 +210,7 @@ bibliotecas do CUPS.
 %package backend-usb
 Summary:       USB backend for CUPS
 Summary(pl.UTF-8):     Backend USB dla CUPS-a
-License:       GPL v2 + openssl exception
+License:       GPL v2
 Group:         Applications/Printing
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
@@ -229,7 +223,7 @@ Ten pakiet umożliwia drukowanie z poziomu CUPS-a na drukarkach USB.
 %package lpd
 Summary:       LPD compatibility support for CUPS print server
 Summary(pl.UTF-8):     Wsparcie dla LPD w serwerze wydruków CUPS
-License:       GPL v2 + openssl exception
+License:       GPL v2
 Group:         Applications/Printing
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      rc-inetd
@@ -259,7 +253,6 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch17 -p1
 %patch18 -p1
 
 %if %{with avahi}
@@ -282,7 +275,6 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
        --enable-gssapi%{!?with_gssapi:=no} \
        --enable-libpaper \
        --enable-libusb \
-       --enable-openssl%{?with_gnutls:=no} \
        --enable-shared \
        --enable-ssl \
        %{?with_static_libs:--enable-static} \
@@ -340,7 +332,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{classes,printers}.conf
 
 cat >$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/client.conf <<'EOF'
 # Encryption Always
-# ServerName print.server.ip.or.name
+# ServerName enter.server.IP.or.name
 EOF
 
 # windows drivers can be put there.
@@ -358,9 +350,6 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/cups/ssl
 ln -s accept $RPM_BUILD_ROOT%{_sbindir}/enable
 ln -s accept $RPM_BUILD_ROOT%{_sbindir}/disable
 
-# check-files cleanup
-%{__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
@@ -376,7 +365,7 @@ FileDevice\|FontPath\|Group\|LogFilePerm\|\
 LPDConfigFile\|PageLog\|Printcap\|PrintcapFormat\|\
 RemoteRoot\|RequestRoot\|ServerBin\|ServerCertificate\|\
 ServerKey\|ServerRoot\|SMBConfigFile\|StateDir\|\
-SystemGroup\|SystemGroupAuthKey\|TempDir\|User\)"
+SystemGroup\|SystemGroupAuthKey\|TempDir\|User\)\b"
 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 || :
@@ -385,20 +374,20 @@ 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
+%systemd_post org.cups.cupsd.service org.cups.cupd.socket org.cups.cupsd.path
 
 %preun
 if [ "$1" = "0" ]; then
        %service cups stop
        /sbin/chkconfig --del cups
 fi
-%systemd_preun cups.service cups.socket cups.path
+%systemd_preun org.cups.cupsd.service org.cups.cupsd.socket org.cups.cupsd.path
 
 %postun
 %systemd_reload
 
 %triggerpostun -- cups < 1:1.5.2-1
-%systemd_trigger cups.service cups.socket cups.path
+%systemd_trigger org.cups.cupsd.service org.cups.cupsd.socket org.cups.cupsd.path
 
 %post  lib -p /sbin/ldconfig
 %postun        lib -p /sbin/ldconfig
@@ -409,7 +398,7 @@ fi
 %service -q rc-inetd reload
 
 %postun lpd
-if [ "$1" = 0 ]; then
+if [ "$1" = "0" ]; then
        %service -q rc-inetd reload
 fi
 
@@ -420,9 +409,9 @@ fi
 %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
+%{systemdunitdir}/org.cups.cupsd.service
+%{systemdunitdir}/org.cups.cupsd.socket
+%{systemdunitdir}/org.cups.cupsd.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
@@ -436,7 +425,6 @@ fi
 %dir %{_sysconfdir}/%{name}/interfaces
 %dir %attr(755,root,lp) %{_sysconfdir}/%{name}/ppd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
-%attr(4755,lp,root) %{_bindir}/lppasswd
 %attr(755,root,root) %{_bindir}/cupstestppd
 %attr(755,root,root) %{_bindir}/cupstestdsc
 %attr(755,root,root) %{_bindir}/ppd*
@@ -465,14 +453,10 @@ fi
 %attr(755,root,root) %{_ulibdir}/cups/cgi-bin/*.cgi
 %{_ulibdir}/cups/cgi-bin/*.css
 %{_ulibdir}/cups/cgi-bin/*.html
+%{_ulibdir}/cups/cgi-bin/*.png
 %{_ulibdir}/cups/cgi-bin/*.txt
-%lang(ca) %{_ulibdir}/cups/cgi-bin/ca
-%lang(cs) %{_ulibdir}/cups/cgi-bin/cs
 %lang(es) %{_ulibdir}/cups/cgi-bin/es
-%lang(fr) %{_ulibdir}/cups/cgi-bin/fr
-%lang(it) %{_ulibdir}/cups/cgi-bin/it
 %lang(ja) %{_ulibdir}/cups/cgi-bin/ja
-%lang(ru) %{_ulibdir}/cups/cgi-bin/ru
 
 %dir %{_ulibdir}/cups/daemon
 %attr(755,root,root) %{_ulibdir}/cups/daemon/cups-deviced
@@ -525,16 +509,11 @@ fi
 
 %dir %{_datadir}/cups/templates
 %{_datadir}/cups/templates/*.tmpl
-%lang(ca) %{_datadir}/cups/templates/ca
-%lang(cs) %{_datadir}/cups/templates/cs
 %lang(es) %{_datadir}/cups/templates/es
-%lang(fr) %{_datadir}/cups/templates/fr
-%lang(it) %{_datadir}/cups/templates/it
 %lang(ja) %{_datadir}/cups/templates/ja
-%lang(ru) %{_datadir}/cups/templates/ru
+%{_mandir}/man1/cups.1*
 %{_mandir}/man1/cupstestppd.1*
 %{_mandir}/man1/cupstestdsc.1*
-%{_mandir}/man1/lppasswd.1*
 %{_mandir}/man1/ppd*.1*
 %{_mandir}/man7/backend.7*
 %{_mandir}/man7/filter.7*
@@ -552,9 +531,12 @@ fi
 %{_mandir}/man5/subscriptions.conf.5*
 %{_mandir}/man8/cups-deviced.8*
 %{_mandir}/man8/cups-driverd.8*
+%{_mandir}/man8/cups-exec.8*
 %{_mandir}/man8/cups-snmp.8*
 %{_mandir}/man8/cupsctl.8*
 %{_mandir}/man8/cupsd.8*
+%{_mandir}/man8/cupsd-helper.8*
+%{_mandir}/man8/cupsd-logs.8*
 %{_mandir}/man8/cupsfilter.8*
 
 %dir %attr(775,root,lp) /var/cache/cups
@@ -674,4 +656,6 @@ fi
 %defattr(644,root,root,755)
 %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
+%{systemdunitdir}/org.cups.cups-lpd.socket
+%{systemdunitdir}/org.cups.cups-lpd@.service
 %{_mandir}/man8/cups-lpd.8*
This page took 0.119124 seconds and 4 git commands to generate.